Changeset 2376 for GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA/MoriaHallBase.hlsl

Timestamp:

05/16/07 08:33:51 (17 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA/MoriaHallBase.hlsl (modified) (2 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA/MoriaHallBase.hlsl

@@ -41 +41 @@
 
 uniform float specularity;
+uniform float4 specularColor;
 
 
@@ -96 +97 @@
 //light1                
         //light dir
-        float3 L = wLightPos1.xyz - IN.wPos * wLightPos1.w;
+float3 L;
+float4 col;
+float3 lightCPos;
+float shadow;
+
+if(dot(lightColor1, lightColor1) != 0)
+{
+        L = wLightPos1.xyz - IN.wPos * wLightPos1.w;
         //illumination
-        float4 col;
-        col = Illumination(N, L, V, lightColor1 * lightPower1, lightRange1, diffuseColor, specularity);
+        col = Illumination(N, L, V, lightColor1 * lightPower1, lightRange1, diffuseColor, specularity, specularColor);
         //shadowing     
-        float3 lightCPos = mul(LightView1, float4(IN.wPos, 1)).xyz;
-        float shadow = shadowPoint(ShadowMap1Point, lightCPos, lightFarPlane1);
+        lightCPos = mul(LightView1, float4(IN.wPos, 1)).xyz;
+        shadow = shadowPoint(ShadowMap1Point, lightCPos, lightFarPlane1);
         Color += col * shadow;  
+}
 
 //----------------------------------------------------------------------------------------------------------------
 //light2                        
+/*if(dot(lightColor2, lightColor2) != 0)
+{
         //light dir
         L = wLightPos2.xyz - IN.wPos * wLightPos2.w;
         //illumination
-        col = Illumination(N, L, V, lightColor2 * lightPower2, lightRange2, diffuseColor, specularity);
+        col = Illumination(N, L, V, lightColor2 * lightPower2, lightRange2, diffuseColor, specularity, specularColor);
         //shadowing     
         lightCPos = mul(LightView2, float4(IN.wPos, 1)).xyz;
         shadow = shadowPoint(ShadowMap2Point, lightCPos, lightFarPlane2);
         Color += col * shadow;  
+}*/
         
         //do Path Map to gather indirect illumination
         
-        float4 indirect = PathMapIndirect(PathMap, WeightIndexMap, WeightMap, IN.texCoord2.zw) * 1.2;
-        indirect *= diffuseColor;
-        Color = Color + indirect;
+//      float4 indirect = PathMapIndirect(PathMap, WeightIndexMap, WeightMap, IN.texCoord2.zw) * 1.2;
+//      indirect *= diffuseColor;
+//      Color = Color + indirect;
         
         //gather caustics for all casters