diff --git a/data/colored_vertices.frag b/data/colored_vertices.frag index 98d33f3..363c8ce 100644 --- a/data/colored_vertices.frag +++ b/data/colored_vertices.frag @@ -1,31 +1,9 @@ #version 330 core -in vec3 frag_vertex; -in vec3 frag_normal; -in vec3 frag_uv; in vec3 frag_color; out vec4 color; -layout (std140) uniform matrices -{ - mat4 view_xform; - mat4 proj_xform; - mat4 normal_xform; -}; - -struct light -{ - vec4 positions; - vec4 colors; -}; - -layout (std140) uniform lights -{ - light light_array[256]; -}; - -uniform mat4 node_xform; void main() { diff --git a/data/colored_vertices.vert b/data/colored_vertices.vert index c59c42a..464a63f 100644 --- a/data/colored_vertices.vert +++ b/data/colored_vertices.vert @@ -1,13 +1,8 @@ #version 330 core layout (location = 0) in vec3 position; -layout (location = 1) in vec3 normal; -layout (location = 2) in vec3 uv; -layout (location = 3) in vec3 color; +layout (location = 1) in vec3 color; -out vec3 frag_vertex; -out vec3 frag_normal; -out vec3 frag_uv; out vec3 frag_color; layout (std140) uniform matrices @@ -22,9 +17,6 @@ uniform mat4 node_xform; void main() { - frag_vertex = position; - frag_normal = normal; - frag_uv = uv; frag_color = color; gl_Position = proj_xform * view_xform * node_xform * vec4(position, 1); }