Changeset 321 for trunk/tests/objload_test/obj.frag

Timestamp:

08/25/14 02:43:30 (11 years ago)

Author:

epyon

Message:

• updated all tests to new nova
• cleaned up tests paths
• general cleanup of tests and test data

File:

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

trunk/tests/objload_test/obj.frag

@@ -1 +1 @@
 #version 120
 
-uniform sampler2D diffuse;
-uniform sampler2D specular;
+uniform sampler2D nv_diffuse;
+uniform sampler2D nv_specular;
 uniform vec4 light_diffuse;
 uniform vec4 light_specular;
@@ -23 +23 @@
         float diffuse_value  = max( dot( nlight_vector, nnormal ), 0.0 );
 
-        vec3 diff_texel      = vec3( texture2D( diffuse, v_texcoord ) );        
-        vec4 spec_texel      = texture2D( specular, v_texcoord );
+        vec3 diff_texel      = vec3( texture2D( nv_diffuse, v_texcoord ) );     
+        vec4 spec_texel      = texture2D( nv_specular, v_texcoord );
         
         float specular_amount = spec_texel.x;