Changeset 238 for trunk/tests/render_test/char.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/char.frag (modified) (2 diffs)

trunk/tests/render_test/char.frag

@@ -2 +2 @@
 varying vec3 f_coord;
 varying vec3 f_material;
-uniform sampler2D tex;
+uniform sampler2D nv_t_diffuse;
  
 void main(void) {
@@ -9 +9 @@
         float modulus = w - remmod * 16;
 
-        gl_FragColor = texture2D(tex, vec2((fract(f_coord.x) + modulus ), ( fract(f_coord.z) + remmod) )  / 16.0);
+        gl_FragColor = texture2D(nv_t_diffuse, vec2((fract(f_coord.x) + modulus ), ( fract(f_coord.z) + remmod) )  / 16.0);
 
-//      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);
 }