Skip to content
Snippets Groups Projects
Commit 415380b1 authored by Ptolemy's avatar Ptolemy
Browse files

SL-17274: Add vary_position, cleanup whitespace

parent 849e85df
No related branches found
No related tags found
No related merge requests found
...@@ -31,6 +31,7 @@ out vec4 frag_data[3]; ...@@ -31,6 +31,7 @@ out vec4 frag_data[3];
#define frag_data gl_FragData #define frag_data gl_FragData
#endif #endif
VARYING vec3 vary_position;
VARYING vec3 vary_normal; VARYING vec3 vary_normal;
VARYING vec4 vertex_color; VARYING vec4 vertex_color;
VARYING vec2 vary_texcoord0; VARYING vec2 vary_texcoord0;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
uniform mat3 normal_matrix; uniform mat3 normal_matrix;
uniform mat4 texture_matrix0; uniform mat4 texture_matrix0;
uniform mat4 modelview_matrix;
uniform mat4 modelview_projection_matrix; uniform mat4 modelview_projection_matrix;
ATTRIBUTE vec3 position; ATTRIBUTE vec3 position;
...@@ -32,8 +33,8 @@ ATTRIBUTE vec4 diffuse_color; ...@@ -32,8 +33,8 @@ ATTRIBUTE vec4 diffuse_color;
ATTRIBUTE vec3 normal; ATTRIBUTE vec3 normal;
ATTRIBUTE vec2 texcoord0; ATTRIBUTE vec2 texcoord0;
VARYING vec3 vary_position;
VARYING vec3 vary_normal; VARYING vec3 vary_normal;
VARYING vec4 vertex_color; VARYING vec4 vertex_color;
VARYING vec2 vary_texcoord0; VARYING vec2 vary_texcoord0;
...@@ -41,12 +42,13 @@ void passTextureIndex(); ...@@ -41,12 +42,13 @@ void passTextureIndex();
void main() void main()
{ {
//transform vertex //transform vertex
gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0);
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; vary_position = (modelview_matrix * vec4(position.xyz,1.0)).xyz;
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
passTextureIndex();
vary_normal = normalize(normal_matrix * normal); passTextureIndex();
vary_normal = normalize(normal_matrix * normal);
vertex_color = diffuse_color;
vertex_color = diffuse_color;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment