Changeset 161 for trunk/tests/objload_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

File:

• trunk/tests/objload_test/obj.vert (modified) (2 diffs)

trunk/tests/objload_test/obj.vert

@@ -1 +1 @@
 #version 120
 
-attribute vec3 position;
-attribute vec2 texcoord;
-attribute vec3 normal;
+attribute vec3 nv_position;
+attribute vec2 nv_texcoord;
+attribute vec3 nv_normal;
 
 varying vec3 v_normal;
@@ -17 +17 @@
 
 void main(void) {
-        vec4 vertex     = vec4( position, 1.0 );
+        vec4 vertex     = vec4( nv_position, 1.0 );
         vec3 eye_pos    = vec3( nv_m_modelview * vertex );
-        v_normal        = normalize( nv_m_normal * normal );
+        v_normal        = normalize( nv_m_normal * nv_normal );
         v_light_vector  = vec3( normalize( light_position - eye_pos ) );
         v_view_vector   = vec3( normalize( -eye_pos ) );
 
-        v_texcoord      = texcoord;
+        v_texcoord      = nv_texcoord;
         gl_Position     = matrix_mvp * vertex;
 }