Merge branch 'master' of https://github.com/tcsullivan/gamedev2 into save-load

1 files changed, 6 insertions, 2 deletions

diff --git a/Shaders/world.vert b/Shaders/world.vert
index 795997a..0760183 100644
--- a/Shaders/world.vert
+++ b/Shaders/world.vert
@@ -2,14 +2,18 @@
 
 //layout(location = 0)in vec3 vertex;
 in vec3 vertex;
+in vec2 texc;
 
 uniform mat4 projection;
 uniform mat4 view;
 uniform mat4 model;
 
-//out vec3 texCoord;
+out vec2 texCoord;
+out vec4 fragCoord;
 
 void main()
 {
-    gl_Position = projection * view * model * vec4(vertex, 1.0f);
+    texCoord = texc;
+    fragCoord = vec4(vertex, 1.0f);
+    gl_Position = projection * view * model * fragCoord;
 }