Added Transform.h that holds all the AbsoluteTransformation functions. Camera now working better with scenes. Changed Modeljob Matrix to only hold the model matrix instad of all matrix info
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
#version 430
|
||||
|
||||
uniform mat4 Matrix;
|
||||
uniform vec4 Color;
|
||||
|
||||
uniform sampler2D texture0;
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#version 430
|
||||
|
||||
uniform mat4 Matrix;
|
||||
uniform mat4 M;
|
||||
uniform mat4 V;
|
||||
uniform mat4 P;
|
||||
|
||||
layout(location = 0) in vec3 Position;
|
||||
layout(location = 1) in vec3 Normal;
|
||||
@@ -23,7 +25,7 @@ out VertexData{
|
||||
|
||||
void main()
|
||||
{
|
||||
gl_Position = Matrix * vec4(Position, 1.0);
|
||||
gl_Position = P * V * M * vec4(Position, 1.0);
|
||||
|
||||
Output.Position = Position;
|
||||
Output.TextureCoordinate = TextureCoords;
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
#version 430
|
||||
|
||||
uniform mat4 M;
|
||||
uniform mat4 V;
|
||||
uniform mat4 P;
|
||||
uniform vec2 PickingColor;
|
||||
|
||||
in VertexData{
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
#version 430
|
||||
|
||||
uniform mat4 Matrix;
|
||||
uniform mat4 M;
|
||||
uniform mat4 V;
|
||||
uniform mat4 P;
|
||||
|
||||
layout(location = 0) in vec3 Position;
|
||||
layout(location = 1) in vec3 Normal;
|
||||
@@ -20,7 +22,7 @@ out VertexData{
|
||||
|
||||
void main()
|
||||
{
|
||||
gl_Position = Matrix * vec4(Position, 1.0);
|
||||
gl_Position = P * V* M * vec4(Position, 1.0);
|
||||
|
||||
Output.Position = Position;
|
||||
}
|
||||
Reference in New Issue
Block a user