Changeset 2422 for GTP/trunk/App/Demos/Illum/Ogre/Media/materials

Timestamp:

06/08/07 00:05:53 (17 years ago)

Author:

szirmay

Message:

 

Location:

GTP/trunk/App/Demos/Illum/Ogre/Media/materials

Files:

• GTPBasic/GTPBasicShading.hlsl (modified) (2 diffs)
• GTPBasic/GTPShadowMap_PS.hlsl (modified) (2 diffs)
• GTPPathMap/PathMap.hlsl (modified) (2 diffs)
• GTPPathMap/PathMapWeightCompute.hlsl (modified) (2 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPBasic/GTPBasicShading.hlsl

@@ -59 +59 @@
         float cosb = max(dot(IN.wNormal.xyz, diff), 0);
         
-        //color.rgb += pow(cosa, 9) * cosb / dist2 * lightPower1 * lightColor1;
-        color.rgb += cosb / dist2 * lightPower1 * lightColor1;
+        color.rgb += pow(cosa, 9) * cosb / dist2 * lightPower1 * lightColor1;
+        //color.rgb += cosb / dist2 * lightPower1 * lightColor1;
         
         }
-        
+        /*
         {
         float3  lightDir = normalize(lightDir2);
@@ -75 +75 @@
         float cosb = max(dot(IN.wNormal.xyz, diff), 0);
         
-        //color.rgb += pow(cosa, 9) * cosb / dist2 * lightPower2 * lightColor2;
-        color.rgb += cosb / dist2 * lightPower1 * lightColor1;  
+        color.rgb += pow(cosa, 9) * cosb / dist2 * lightPower2 * lightColor2;
+        //color.rgb += cosb / dist2 * lightPower1 * lightColor1;        
         }       
-        
+        */
         //color.rgb *= lightPower;
         //return 0;
-        return color * tex2D(colorTex, IN.texCoord);
+        return  (color) * tex2D(colorTex, IN.texCoord);
 }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPBasic/GTPShadowMap_PS.hlsl

@@ -19 +19 @@
 #define DIST_EPSILON    0.001
 
-//#define shadowColor float4(0.9,0.9,0.9,1)
+//#define shadowColor float4(0.95,0.95,0.95,1)
 #define shadowColor float4(0.2,0.2,0.2,1)
 
@@ -88 +88 @@
                 pos.y = 1.0 - pos.y;
                 float storedDist = tex2D(shadowMap, pos.xy).r;
-                light = max(dist < storedDist + DIST_BIAS, shadowColor);    
                 light = dist < storedDist + DIST_BIAS;
                 //if(dist < storedDist + DIST_BIAS)
-                //light = 1;
+                //      light = 1;
     }
   }
-        
+  light = max(light, shadowColor);    
+                        
   return light;
 }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPathMap/PathMap.hlsl

@@ -11 +11 @@
 {
     float4 pos                  : POSITION;
-    float2 tex                  : TEXCOORD1;
-    float2 texAtlas             : TEXCOORD2;
+    float2 tex                  : TEXCOORD0;
+    float2 texAtlas             : TEXCOORD1;
 };
 
@@ -28 +28 @@
         output.pos = mul(WorldViewProj, input.pos);
         output.tex = input.tex;
-        output.texAtlas = input.tex;    
+        output.texAtlas = input.texAtlas;       
         return output;
 }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPathMap/PathMapWeightCompute.hlsl

@@ -79 +79 @@
     //visibility = 1.0 - visibility;
     //visibility = 1.0 + 0.00001 * visibility;
-        //float spotFalloff = (dot(-diff, lightDir) - lightAngleCos) / (1.0 - lightAngleCos);
-        float spotFalloff = max( dot(-diff, lightDir), 0) + 0.0000000001 * lightAngleCos;
+        float spotFalloff = (dot(-diff, lightDir) - lightAngleCos) / (1.0 - lightAngleCos);
+        //float spotFalloff = max( dot(-diff, lightDir), 0) + 0.0000000001 * lightAngleCos;
         //spotFalloff = 1.0 + spotFalloff * 0.000000001;
         spotFalloff = pow(saturate(spotFalloff), spotLightFalloff);
@@ -153 +153 @@
                 
                 float3 w = tex2Dlod(allWeightsSampler, float4(coord1, 0, 0)).rgb;
-                float radrad = 1;// tex2Dlod(radionSampler, float4(coord2, 0, 0)).a;            
+                float radrad = tex2Dlod(radionSampler, float4(coord2, 0, 0)).a;         
                 weight += w * radrad;           
                 clusterRad += radrad;