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
@@ -1,8 +1,6 @@
 #version 430

-uniform mat4 M;
-uniform mat4 V;
-uniform mat4 P;
+uniform mat4 Matrix;

 layout(location = 0) in vec3 Position;
 layout(location = 1) in vec3 Normal;
@@ -25,7 +23,7 @@ out VertexData{

 void main()
 {
-	gl_Position = P*V*M * vec4(Position, 1.0);
+	gl_Position = Matrix * vec4(Position, 1.0);

 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;