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

Timestamp:

06/05/07 01:57:13 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GTPBasic/GTPBasic.program (modified) (1 diff)
• GTPBasic/GTPBasicShading.hlsl (modified) (1 diff)
• GTPBasic/GTPShadowMap_PS.hlsl (modified) (3 diffs)
• GTPEnvMap/GTPEnvMap.hlsl (modified) (1 diff)
• scripts/difflab.material (modified) (6 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPBasic/GTPBasic.program

@@ -216 +216 @@
    target ps_2_0
 }
+
+fragment_program GTP/Basic/Shaded/TexturedTwoLights_PS hlsl
+{
+   source GTPBasicShading.hlsl
+   entry_point TexturedShadedTwoLights_PS
+   target ps_2_0
+}
    

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

@@ -27 +27 @@
         float cosb = max(dot(IN.wNormal.xyz, diff), 0);
         
-        color.rgb = pow(cosa, 9) * cosb / dist2 * lightPower;
+        color.rgb = pow(cosa, 9) * cosb / dist2 * lightPower * lightColor;
         //color.rgb *= lightPower;
         //return 0;
         return color * tex2D(colorTex, IN.texCoord);
 }
+
+
+float4 TexturedShadedTwoLights_PS(ShadedTex_OUT IN,
+                                                uniform float3 lightPos1,
+                                                uniform float3 lightDir1,
+                                                uniform float3 lightColor1,                                             
+                                                uniform float  lightPower1,
+                                                uniform float3 lightPos2,
+                                                uniform float3 lightDir2,
+                                                uniform float3 lightColor2,                                             
+                                                uniform float  lightPower2,                                             
+                                                uniform sampler2D colorTex : register(s0)):COLOR0
+{
+        float4 color = 0;
+        IN.wNormal.xyz = normalize(IN.wNormal.xyz);
+        
+        {
+        float3 lightDir = normalize(lightDir1);
+        
+        float3 diff = lightPos1 - IN.wPos;
+        float dist2 = dot(diff, diff);
+        if(dist2 < SAMPLECUTDIST2)
+                dist2 = SAMPLECUTDIST2; 
+        diff = normalize(diff);
+        float cosa = max(dot(lightDir1, -diff), 0);
+        float cosb = max(dot(IN.wNormal.xyz, diff), 0);
+        
+        //color.rgb += pow(cosa, 9) * cosb / dist2 * lightPower1 * lightColor1;
+        color.rgb += cosb / dist2 * lightPower1 * lightColor1;
+        
+        }
+        
+        {
+        float3  lightDir = normalize(lightDir2);
+        
+        float3 diff = lightPos2 - IN.wPos;
+        float dist2 = dot(diff, diff);
+        if(dist2 < SAMPLECUTDIST2)
+                dist2 = SAMPLECUTDIST2; 
+        diff = normalize(diff);
+        float cosa = max(dot(lightDir2, -diff), 0);
+        float cosb = max(dot(IN.wNormal.xyz, diff), 0);
+        
+        color.rgb += pow(cosa, 9) * cosb / dist2 * lightPower2 * lightColor2;   
+        }       
+        
+        //color.rgb *= lightPower;
+        //return 0;
+        return color * tex2D(colorTex, IN.texCoord);
+}

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

@@ -15 +15 @@
 #define DEPTH_BIAS_VSM  0.001
 #define DEPTH_EPSILON   0.05
-#define DIST_BIAS       0.0005
+#define DIST_BIAS       0.005
 #define DIST_BIAS_VSM   0.0005
 #define DIST_EPSILON    0.001
@@ -76 +76 @@
                                          uniform sampler2D shadowMap) : COLOR
 {
-  float4 light = shadowColor;  
+  float4 light = 0;//shadowColor;  
   if( IN.LightVPos.z > 0.0)
   {     
     float4 pos = (IN.LightVPos / IN.LightVPos.w);
         float d = length(pos.xy);
-    light = saturate((1.0 - d)/0.05);           
+    //light = saturate((1.0 - d)/0.05);         
     if(d <= 1.0)
     {
@@ -90 +90 @@
                 light = max(dist < storedDist + DIST_BIAS, shadowColor);    
                 light = dist < storedDist + DIST_BIAS;
+                //if(dist < storedDist + DIST_BIAS)
+                //light = 1;
     }
   }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPEnvMap/GTPEnvMap.hlsl

@@ -128 +128 @@
         RR = R; 
         RR = Hit(cubePos, R, DistanceMap);
-        Color = readCubeMap(CubeMap, RR);
+        Color = readCubeMap(CubeMap, R);
         //Color = readDistanceCubeMap(DistanceMap, cubePos)/300.0;
         //return Color;

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/difflab.material

@@ -130 +130 @@
                                         world_view_proj_param_name WorldViewProj
                                         world_param_name World
+                                        nearest_from_camera false
                          }                                      
                     }   
@@ -167 +168 @@
                                         world_view_proj_param_name WorldViewProj
                                         world_param_name World
+                                        nearest_from_camera false
                         }                                       
                 }       
@@ -210 +212 @@
                                         world_view_proj_param_name WorldViewProj
                                         world_param_name World
+                                        nearest_from_camera false
                          }                                      
                     }   
@@ -267 +270 @@
                                         world_view_proj_param_name WorldViewProj
                                         world_param_name World
+                                        nearest_from_camera false
                         }                                       
                 }       
@@ -310 +314 @@
                                         world_view_proj_param_name WorldViewProj
                                         world_param_name World
+                                        nearest_from_camera false
                         }                                       
                 }       
@@ -371 +376 @@
                                         world_view_proj_param_name WorldViewProj
                                         world_param_name World
+                                        nearest_from_camera false
                         }                                       
                 }