Changeset 238 for trunk/tests/render_test/box.frag

Timestamp:

05/16/14 05:48:01 (11 years ago)

Author:

epyon

Message:

• mesh data interface and usage
• new wavefront importer (old pending removal)
• updates to test projects

File:

• trunk/tests/render_test/box.frag (modified) (2 diffs)

trunk/tests/render_test/box.frag

@@ -4 +4 @@
 varying vec3 f_material;
 varying float f_diffuse_value;
-uniform sampler2D tex;
+uniform sampler2D nv_t_diffuse;
 uniform vec3 light;
  
@@ -16 +16 @@
 
         if (secondary)
-                gl_FragColor = texture2D(tex, vec2((fract(f_coord.z - f_coord.x) + modulus ), ( fract(-f_coord.y) + remmod) )  / 16.0);
+                gl_FragColor = texture2D(nv_t_diffuse, vec2((fract(f_coord.z - f_coord.x) + modulus ), ( fract(-f_coord.y) + remmod) )  / 16.0);
         else
-                gl_FragColor = texture2D(tex, vec2((fract(f_coord.z) + modulus ), ( fract(f_coord.x) + remmod) )  / 16.0);
+                gl_FragColor = texture2D(nv_t_diffuse, vec2((fract(f_coord.z) + modulus ), ( fract(f_coord.x) + remmod) )  / 16.0);
         gl_FragColor = vec4( gl_FragColor.xyz * (f_diffuse_value + 0.4), 1.0 );
 }