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

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.frag (modified) (2 diffs)

trunk/tests/md2_test/obj.frag

@@ -1 +1 @@
 #version 120
 
-uniform sampler2D diffuse;
+uniform sampler2D nv_t_diffuse;
 uniform vec4 light_diffuse;
 uniform vec4 light_specular;
@@ -9 +9 @@
 varying vec3 v_light_vector;
 varying vec3 v_view_vector;
- 
+
 void main(void) {
+        vec3 diff_texel      = vec3( texture2D( nv_t_diffuse, v_texcoord ) );   
+
         vec3 nnormal         = normalize( v_normal );
         vec3 nlight_vector   = normalize( v_light_vector );
-        vec3 nview_vector    = normalize( v_view_vector );
         vec3 nreflect_vector = reflect( -nlight_vector, nnormal );
 
-        float specular_value = clamp( dot( nreflect_vector, nview_vector ), 0.0, 1.0 );
-        specular_value       = pow( specular_value, 6.0 );
-        float diffuse_value  = max( dot( nlight_vector, nnormal ), 0.0 );
+        float specular_amount = 0.2;
+        float diffuse_amount  = 1.0 - specular_amount;
 
-        vec3 diff_texel      = vec3( texture2D( diffuse, v_texcoord ) );        
-        
-        float final_specular = specular_value * 0.2;
-        float final_diffuse  = diffuse_value * 0.5;
-        float final_ambient  = 0.3;
+        float dot_prod_specular = dot( nreflect_vector, normalize( v_view_vector ) );
+        float dot_prod_diffuse  = dot( nlight_vector, nnormal );
 
-        vec3 ambient_color   = final_ambient * diff_texel;
-        vec3 diffuse_color   = light_diffuse.xyz * final_diffuse * diff_texel;
+        float diffuse_factor  = max( dot_prod_diffuse, 0.0 );
+        float specular_factor = pow( max( dot_prod_specular, 0.0 ), 16.0 ); // 100.0
+
+        float final_diffuse  = diffuse_amount * diffuse_factor * 0.5;
+        float final_specular = specular_amount * specular_factor;
+
+        vec3 diffuse_color   = light_diffuse.xyz  * final_diffuse * diff_texel;
         vec3 specular_color  = light_specular.xyz * final_specular;
+        vec3 self_ilum_color = vec3 (0.0, 0.0, 0.0);
+        vec3 ambient_color   = vec3 (0.0, 0.0, 0.0);
 
-        gl_FragColor = vec4( ambient_color + diffuse_color + specular_color, 1.0 );
-//      gl_FragColor = vec4( diff_texel, 1.0 );
+        gl_FragColor = vec4( max( self_ilum_color, diffuse_color + specular_color + ambient_color ), 1.0 );
 }