Changeset 2376 for GTP/trunk

Timestamp:

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

Author:

szirmay

Message:

 

Location:

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

Files:

• MORIA/MoriaDust.hlsl (added)
• MORIA/MoriaDust.material (added)
• MORIA/MoriaDust.particle (added)
• MORIA/MoriaHallBase.hlsl (modified) (2 diffs)
• MORIA/dust.dds (added)
• MORIA/illum.hlsl (modified) (3 diffs)
• MORIA/moria.material (modified) (2 diffs)
• MORIA/troll.material (modified) (2 diffs)
• materials/textures/dust.png (added)
• materials/textures/phasefunction.jpg (added)

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

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

@@ -1 +1 @@
 
-float4 Illumination(float3 N, float3 L, float3 V, float4 lightColor, float4 lightRange, float4 diffuseColor, float specularity)
+float4 Illumination(float3 N, float3 L, float3 V, float4 lightColor, float4 lightRange, float4 diffuseColor, float specularity, float4 specularColor)
 {
         // Blinn lighting
@@ -8 +8 @@
         float4 Lighting = lit(dot(N, L), dot(N, H), specularity);
         
-        return   lightColor * (Lighting.y * diffuseColor + Lighting.z) //color
+        return   lightColor * (Lighting.y * diffuseColor + Lighting.z * specularColor) //color
                          / (lightRange.y + d * lightRange.z + d * d * lightRange.w) //attenuation
                          ;
@@ -64 +64 @@
         
         float3 col = 0;
-        for(int iCluster = 0; iCluster < 32; iCluster++)
+        for(int iCluster = 0; iCluster < 8; iCluster++)
         {
                 float2 prmTexPos = float2(

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

@@ -21 +21 @@
                         IllumTechniques
                         {
-                                RenderTechnique PathMap
-                                {
-                                new_passes false
-                                        start_tex_id 3
-                                }       
+                                //RenderTechnique PathMap
+                                //{
+                            //  new_passes false
+                                //      start_tex_id 3
+                                //}     
                                 RenderTechnique DepthShadowReceiver
                                 {
-                                        max_light_count 2
+                                        max_light_count 1
                                         set_light_viewproj false
                                         set_light_view true
@@ -56 +56 @@
                           param_named_auto lightColor1 light_diffuse_colour 0
                           param_named_auto lightColor2 light_diffuse_colour 1
-                          param_named specularity float 120
+                          param_named specularity float 20
+                          param_named specularColor float4 0.2 0.2 0.2 0.2                        
                         }
                         texture_unit tile_texture

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

@@ -84 +84 @@
 }
 
+material trollCameraDepth
+{
+        technique
+        {
+                pass
+                {
+                        vertex_program_ref TrollSkinningSMGen
+                        {
+                                param_named_auto worldMatrix3x4Array[0] world_matrix_array_3x4
+                                param_named_auto viewProjectionMatrix viewproj_matrix
+                                param_named_auto viewMatrix view_matrix                         
+                        }                   
+                        fragment_program_ref GTP/Basic/CDepth_PS
+                    {
+                        param_named_auto farplane far_clip_distance
+                    }  
+                }
+        }
+}
+
 material trollBase
 {
@@ -95 +115 @@
                                 {
                                         ILLUM_TRIGGER_SM_POINT trollShadowMapGen_POINT
+                                        ILLUM_TRIGGER_CAMERADEPTH trollCameraDepth
                                 }
                         }