Changeset 239 for trunk/tests/md2_test/obj.vert

Timestamp:

05/17/14 02:35:19 (11 years ago)

Author:

epyon

Message:

• massive update of mesh handling
• universal mesh handling routines
• removed a lot of legacy code
• significantly streamlined MD5 loading
• all tests updated to new features

File:

• trunk/tests/md2_test/obj.vert (modified) (1 diff)

trunk/tests/md2_test/obj.vert

@@ -12 +12 @@
 varying vec2 v_texcoord;
 
-uniform mat4 matrix_mvp;
-uniform mat4 nv_m_modelview;
-uniform mat4 nv_m_projection;
-uniform mat3 nv_m_normal;
+uniform mat4 nv_m_mvp;
+uniform mat4 nv_m_model;
+uniform mat4 nv_m_model_inv;
+uniform vec3 nv_v_camera_position;
+uniform vec3 light_position;
 uniform float nv_interpolate;
-uniform vec3 light_position;
 
-void main(void) {
-        vec4 vertex     = vec4( mix( nv_position, nv_next_position, nv_interpolate ), 1.0 );
-        vec3 eye_pos    = vec3( nv_m_modelview * vertex );
-        v_normal        = normalize( nv_m_normal * mix( nv_normal, nv_next_normal, nv_interpolate ) );
-        v_light_vector  = vec3( normalize( light_position - eye_pos ) );
-        v_view_vector   = vec3( normalize( -eye_pos ) );
+void main(void)
+{
+        vec4 position   = vec4( mix( nv_position, nv_next_position, nv_interpolate ), 1.0 );
+        v_normal        = normalize( mix( nv_normal, nv_next_normal, nv_interpolate ) );
+        v_texcoord      = nv_texcoord;
+        gl_Position     = nv_m_mvp * position;
 
-        v_texcoord      = nv_texcoord;
-        gl_Position     = matrix_mvp * vertex;
+        vec3 camera_loc = vec3(nv_m_model_inv * vec4 (nv_v_camera_position, 1.0) );
+        vec3 light_loc  = vec3(nv_m_model_inv * vec4 (light_position, 1.0) );
+
+        v_view_vector  = normalize( nv_position - camera_loc  );
+        v_light_vector = normalize( nv_position - light_loc );
 }