Changeset 161 for trunk/tests/gui_test

Timestamp:

07/15/13 02:48:06 (12 years ago)

Author:

epyon

Message:

• unified naming of attributes in nv
• predefined attribute bindings based on unified names
• unified naming of attributes in all tests

Location:

trunk/tests/gui_test

Files:

• gui.frag (modified) (1 diff)
• gui.vert (modified) (1 diff)

trunk/tests/gui_test/gui.frag

@@ -1 +1 @@
 #version 120
-varying vec4 f_color;
-varying vec2 f_tcoord;
+varying vec4 v_color;
+varying vec2 v_texcoord;
 uniform sampler2D tex;
  
 void main(void) {
-        vec4 texture = texture2D(tex,f_tcoord);
-        gl_FragColor = f_color * texture;
+        vec4 texture = texture2D(tex,v_texcoord);
+        gl_FragColor = v_color * texture;
 }

trunk/tests/gui_test/gui.vert

@@ -1 +1 @@
 #version 120
-attribute vec2 coord;
-attribute vec2 tcoord;
-attribute vec4 color;
-uniform mat4 projection;
-varying vec4 f_color;
-varying vec2 f_tcoord;
+attribute vec2 nv_position;
+attribute vec2 nv_texcoord;
+attribute vec4 nv_color;
+uniform mat4 nv_projection;
+varying vec4 v_color;
+varying vec2 v_texcoord;
 
 void main(void) {
-        f_color  = color;
-        f_tcoord = tcoord;
-        gl_Position = projection * vec4( coord.x, coord.y, 0.0, 1.0 );
+        v_color     = nv_color;
+        v_texcoord  = nv_texcoord;
+        gl_Position = nv_projection * vec4( nv_position.x, nv_position.y, 0.0, 1.0 );
 }