Changeset 2467

Timestamp:

06/25/07 17:50:39 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• FPSArm_PS.hlsl (modified) (1 diff)
• FPSarm.material (modified) (1 diff)
• trollps.hlsl (modified) (1 diff)

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

@@ -46 +46 @@
         float4 diffuseColor = albedo * tex2D(colorTexture, IN.texCoord);
         
-        if(lightPower1 !=0)
+        if( dot(lightRange1, lightRange1) !=0)
         Color = Illumination(N, L1, V, lightColor1 * lightPower1, lightRange1, diffuseColor, specularity, specularColor);
         
-        if(lightPower2 !=0)
+        if( dot(lightRange2, lightRange2) !=0)
         Color = Illumination(N, L2, V, lightColor2 * lightPower2, lightRange2, diffuseColor, specularity, specularColor);
         

GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA/FPSarm.material

@@ -94 +94 @@
                             param_named_auto lightColor2 light_diffuse_colour 1
                             param_named specularity float 100
-                            param_named albedo float 0.1
+                            param_named albedo float 0.4
                             param_named specularColor float4 0 0 0 0                    
                         }

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

@@ -45 +45 @@
         
         float4 diffuseColor = albedo * tex2D(colorTexture, IN.texCoord);
-        if(lightPower1 != 0)
+        if( dot(lightRange1, lightRange1) != 0)
         Color += Illumination(N, L1, V, lightColor1 * lightPower1, lightRange1, diffuseColor, specularity, specularColor);
-        if(lightPower2 != 0)
+        if(dot(lightRange2, lightRange2) != 0)
         Color += Illumination(N, L2, V, lightColor2 * lightPower2, lightRange2, diffuseColor, specularity, specularColor);