Camera Switch event now working, Camera models Rotation still bugged

2015-12-15 15:29:19 +01:00
parent d9ea0192d1
commit fa66e9ff47
16 changed files with 164 additions and 79 deletions
@@ -41,7 +41,7 @@ struct ModelJob : RenderJob
    //TODO: RENDERER: Not sure if the best solution for pickingColor to entity link is this
    EntityID Entity;

-	glm::mat4 ModelMatrix;
+	glm::mat4 Matrix;
 	const Texture* DiffuseTexture;
 	const Texture* NormalTexture;
 	const Texture* SpecularTexture;
@@ -71,7 +71,7 @@ struct TransparentModelJob : RenderJob
    //TODO: RENDERER: Not sure if the best solution for pickingColor to entity link is this
    EntityID Entity;

-    glm::mat4 ModelMatrix;
+    glm::mat4 Matrix;
    const Texture* DiffuseTexture;
    const Texture* NormalTexture;
    const Texture* SpecularTexture;