Lots of things done

This commit is contained in:
Ayumiwii
2016-01-08 16:42:59 +01:00
parent c133223bac
commit 3467315aef
15 changed files with 312 additions and 22 deletions
+6
View File
@@ -31,6 +31,12 @@ private:
ShaderProgram* m_BasicForwardProgram;
ShaderProgram* m_CoolDeathAnimProgram;
glm::vec3 Origin;
GLfloat TimeDeath = 0.f;
GLfloat EndDeath = 0.f;
};
#endif
+11
View File
@@ -63,6 +63,17 @@ struct ModelJob : RenderJob
}
};
// Cool Death Animation
struct CoolDeathAnimationJob : ModelJob
{
glm::vec3 OriginPos;
float TimeSinceDeath = 0.f;
float EndOfDeath = 15.0f;
};
struct SpriteJob : RenderJob
{
unsigned int ShaderID = 0;
@@ -25,6 +25,8 @@ private:
void FillModels(World* world, RenderQueue* renderQueue);
void FillLights(World* world, RenderQueue* renderQueue);
void FillCoolDeathAnim(World* world, RenderQueue* renderQueue);
glm::mat4 ModelMatrix(World* world, EntityID entity);
};
+2
View File
@@ -119,6 +119,8 @@ private:
ShaderProgram* m_CalculateFrustumProgram;
ShaderProgram* m_LightCullProgram;
ShaderProgram* m_CoolDeathAnimProgram;
};
#endif