summaryrefslogtreecommitdiffstats
path: root/cwd/shaders/face.vs
diff options
context:
space:
mode:
Diffstat (limited to 'cwd/shaders/face.vs')
-rw-r--r--cwd/shaders/face.vs22
1 files changed, 7 insertions, 15 deletions
diff --git a/cwd/shaders/face.vs b/cwd/shaders/face.vs
index 96204f1..9bf2639 100644
--- a/cwd/shaders/face.vs
+++ b/cwd/shaders/face.vs
@@ -1,36 +1,28 @@
#version 330 core
layout (location = 0) in vec3 position;
-/*layout (location = 2) in vec2 UvCoordinates;
+layout (location = 2) in vec2 UvCoordinates;
layout (location = 7) in vec4 Texture;
+layout (location = 8) in mat4 model;
layout (location = 12) in vec3 color;
-layout (location = 13) in vec2 light;*/
+layout (location = 13) in vec2 light;
out VS_OUT {
vec2 UvPosition;
- flat vec4 Texture;
- flat vec3 Color;
- flat vec2 Light;
- flat int Face;
+ vec4 Texture;
+ vec3 Color;
+ vec2 Light;
} vs_out;
uniform mat4 view;
uniform mat4 projection;
-uniform mat4 model;
void main()
{
vec4 sourcePosition = vec4(position,1.0f);
gl_Position = projection * view * model * sourcePosition;
-/* vs_out.UvPosition = vec2(UvCoordinates.x,UvCoordinates.y);
+ vs_out.UvPosition = vec2(UvCoordinates.x,UvCoordinates.y);
vs_out.Texture = Texture;
vs_out.Color = color;
vs_out.Light = light;
- vs_out.Face = gl_VertexID / 6;*/
-
- vs_out.UvPosition = vec2(0,0);
- vs_out.Texture = vec4(0,0,1,1);
- vs_out.Color = vec3(0,0.2,1.0);
- vs_out.Light = vec2(16,16);
- vs_out.Face = gl_VertexID / 6;
}