Buttons are now clickable

This commit is contained in:
Tleety
2016-02-16 16:28:19 +01:00
parent 6bc7131290
commit 8f84a5ddd6
7 changed files with 722 additions and 39 deletions
+1 -1
View File
@@ -40,7 +40,7 @@ private:
const IRenderer* m_Renderer;
ShaderProgram* m_PickingProgram;
ShaderProgram* m_PickingSkinnedProgram;
ShaderProgram* m_PickingSkinnedProgram;
Camera* m_Camera;
struct PickingInfo
+3 -1
View File
@@ -40,7 +40,8 @@ struct SpriteJob : RenderJob
Depth = viewpos.z;
}
World = world;
Pickable = world->HasComponent(cSprite.EntityID, "Button");
FillColor = fillColor;
FillPercentage = fillPercentage;
};
@@ -60,6 +61,7 @@ struct SpriteJob : RenderJob
unsigned int StartIndex = 0;
unsigned int EndIndex = 0;
World* World;
bool Pickable;
glm::vec4 FillColor = glm::vec4(0);
float FillPercentage = 0.0;