Rename the thingie

This commit is contained in:
Ayumiwii
2016-01-18 13:51:32 +01:00
parent 8f8b64f99c
commit 35269315cc
17 changed files with 57 additions and 57 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ private:
ShaderProgram* m_BasicForwardProgram;
ShaderProgram* m_CoolDeathAnimProgram;
ShaderProgram* m_ExplosionEffectProgram;
};
#endif
+1 -1
View File
@@ -64,7 +64,7 @@ struct ModelJob : RenderJob
};
// Cool Death Animation
struct CoolDeathAnimationJob : ModelJob
struct ExplosionEffectJob : ModelJob
{
glm::vec3 ExplosionOrigin;
double TimeSinceDeath = 0.f; //Seconds
@@ -25,7 +25,7 @@ private:
void FillModels(World* world, RenderQueue* renderQueue);
void FillLights(World* world, RenderQueue* renderQueue);
void FillCoolDeathAnim(World* world, RenderQueue* renderQueue);
void FillExplosionEffect(World* world, RenderQueue* renderQueue);
glm::mat4 ModelMatrix(World* world, EntityID entity);
};
+1 -1
View File
@@ -119,7 +119,7 @@ private:
ShaderProgram* m_CalculateFrustumProgram;
ShaderProgram* m_LightCullProgram;
ShaderProgram* m_CoolDeathAnimProgram;
ShaderProgram* m_ExplosionEffectProgram;
};
@@ -1,16 +1,16 @@
#include "Common.h"
#include "Core/System.h"
class CoolDeathAnimationSystem : public PureSystem
class ExplosionEffectSystem : public PureSystem
{
public:
CoolDeathAnimationSystem(EventBroker* eventBroker)
: PureSystem(eventBroker, "CoolDeathAnim")
ExplosionEffectSystem(EventBroker* eventBroker)
: PureSystem(eventBroker, "ExplosionEffect")
{ }
virtual void UpdateComponent(World* world, ComponentWrapper& object, double dt) override
{
ComponentWrapper& Component = world->GetComponent(object.EntityID, "CoolDeathAnim");
ComponentWrapper& Component = world->GetComponent(object.EntityID, "ExplosionEffect");
if ((double)Component["TimeSinceDeath"] > (double)Component["ExplosionDuration"]) {
(double)Component["TimeSinceDeath"] = 0.f;
+1 -1
View File
@@ -16,7 +16,7 @@
#include "Core/EntityXMLFile.h"
#include "Core/SystemPipeline.h"
#include "RaptorCopterSystem.h"
#include "CoolDeathAnimationSystem.h"
#include "ExplosionEffectSystem.h"
#include "PlayerSystem.h"
#include "Editor/EditorSystem.h"