BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into CoolDeathAnimation

Browse Source 
# Conflicts:
#	include/Engine/Rendering/DrawScenePass.h
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/RenderQueueFactory.h
#	include/Engine/Rendering/Renderer.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
This commit is contained in:
Ayumiwii
2016-01-18 16:02:43 +01:00
parent 1411964dcf bf3f8aea89
commit 37aa1eaa18
212 changed files with 7177 additions and 2731 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/ExplosionEffectSystem.h
+5 -6
View File
@@ -5,17 +5,16 @@ class ExplosionEffectSystem : public PureSystem
{
public:
ExplosionEffectSystem(EventBroker* eventBroker)
: PureSystem(eventBroker, "ExplosionEffect")
: PureSystem("ExplosionEffect")
{ }
virtual void UpdateComponent(World* world, ComponentWrapper& object, double dt) override
virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& component, double dt) override
{
ComponentWrapper& Component = world->GetComponent(object.EntityID, "ExplosionEffect");
if ((double)Component["TimeSinceDeath"] > (double)Component["ExplosionDuration"]) {
(double)Component["TimeSinceDeath"] = 0.f;
if ((double)component["TimeSinceDeath"] > (double)component["ExplosionDuration"]) {
(double)component["TimeSinceDeath"] = 0.f;
}
(double&)Component["TimeSinceDeath"] += dt;
(double&)component["TimeSinceDeath"] += dt;
//if ((bool)Component["Gravity"] == true) {
// (bool)Component["ExponentialAccelaration"] = false;