bunch of test things
also new camera class
This commit is contained in:
parent
b47c5e27d8
commit
89e47fa56c
10 changed files with 496 additions and 54 deletions
|
|
@ -1,4 +1,4 @@
|
|||
#version 330 core
|
||||
#version 330 core
|
||||
layout (location = 0) in vec3 aPos;
|
||||
layout (location = 1) in vec3 aColor;
|
||||
layout (location = 2) in vec2 aTexCoord;
|
||||
|
|
@ -6,9 +6,14 @@ layout (location = 2) in vec2 aTexCoord;
|
|||
out vec3 ourColor;
|
||||
out vec2 TexCoord;
|
||||
|
||||
uniform mat4 model;
|
||||
uniform mat4 view;
|
||||
uniform mat4 projection;
|
||||
|
||||
void main()
|
||||
{
|
||||
gl_Position = vec4(aPos, 1.0);
|
||||
//gl_Position = vec4(aPos, 1.0);
|
||||
gl_Position = projection * view * model * vec4(aPos, 1.0);
|
||||
|
||||
ourColor = aColor;
|
||||
TexCoord = aTexCoord;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue