Changeset 2422 for GTP/trunk/App/Demos/Illum

Timestamp:

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

Author:

szirmay

Message:

 

Location:

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

Files:

• MORIA/FPSarm.material (modified) (1 diff)
• MORIA/MoriaHallBase.hlsl (modified) (1 diff)
• MORIA/SkinningVS.cg (modified) (1 diff)
• MORIA/moria.material (modified) (1 diff)
• PMDemo/PRMDemo.material (modified) (2 diffs)
• PMDemo/SpacePrmEntryPoints.text (added)
• PMDemo/prmEntryPoints.text (deleted)
• materials/GTPBasic/GTPBasicShading.hlsl (modified) (2 diffs)
• materials/GTPBasic/GTPShadowMap_PS.hlsl (modified) (2 diffs)
• materials/GTPPathMap/PathMap.hlsl (modified) (2 diffs)
• materials/GTPPathMap/PathMapWeightCompute.hlsl (modified) (2 diffs)

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

@@ -192 +192 @@
                         {
                                 update_interval         1
-                                update_all_face false
+                                update_all_face true
                                 distance_calc false                                     
                                 face_angle_calc false

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

@@ -129 +129 @@
         //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 * 1.5;
         
-        Color += lightPower1 * diffuseColor * 0.0005;
+        //Color += lightPower1 * diffuseColor * 0.0005;
         
         //gather caustics for all casters

GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA/SkinningVS.cg

@@ -47 +47 @@
         out float4 oPosition : POSITION,
         out float3 cPos:TEXCOORD0,      
-        uniform float3x4   worldMatrix3x4Array[67],
+        uniform float3x4   worldMatrix3x4Array[69],
         uniform float4x4 viewMatrix,
         uniform float4x4 viewProjectionMatrix)

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

@@ -23 +23 @@
                                 //RenderTechnique PathMap
                                 //{
-                                //      pass_blending one zero
+                                ////    pass_blending one zero
                            //   new_passes false
                                 //      start_tex_id 3

GTP/trunk/App/Demos/Illum/Ogre/Media/PMDemo/PRMDemo.material

@@ -7 +7 @@
         IllumTechniques
         {
-        
-                RenderTechnique PathMap
+                RenderTechnique PathMap
                 {
-                        pass_blending one one
+                pass_blending one one
                 }
-         
-                
+                RenderTechnique DepthShadowReceiver
+                {
+                                pass_blending zero src_colour
+                        max_light_count 1
+                                vertex_program_name GTP/Basic/LightCPos_VS
+                                //fragment_program_name GTP/Basic/SM/Dist_VSM_PS
+                                fragment_program_name GTP/Basic/SM/Dist_PS
+                                set_light_view true
+                                set_light_farplane true
+                                light_viewproj_param_name LightViewProj
+                                light_view_param_name LightView
+                                light_farplane_param_name lightFarPlane
+                                world_view_proj_param_name WorldViewProj
+                                world_param_name World
+                }               
         }
         vertex_program_ref GTP/Basic/ShadedTex_VS
@@ -111 +123 @@
   }
 }
-
-
-
-RenderTechnique DepthShadowReceiver
-         {
-                        pass_blending one zero
-                max_light_count 1
-                        vertex_program_name GTP/Basic/LightCPos_VS
-                        //fragment_program_name GTP/Basic/SM/Dist_VSM_PS
-                        fragment_program_name GTP/Basic/SM/Dist_PS
-                        set_light_view true
-                        set_light_farplane true
-                        light_viewproj_param_name LightViewProj
-                        light_view_param_name LightView
-                        light_farplane_param_name lightFarPlane
-                        world_view_proj_param_name WorldViewProj
-                        world_param_name World
-         }
-         
-         
-                RenderTechnique DepthShadowReceiver
-         {
-                        pass_blending zero src_colour
-                max_light_count 1
-                        vertex_program_name GTP/Basic/LightCPos_VS
-                        //fragment_program_name GTP/Basic/SM/Dist_VSM_PS
-                        fragment_program_name GTP/Basic/SM/Dist_PS
-                        set_light_view true
-                        set_light_farplane true
-                        light_viewproj_param_name LightViewProj
-                        light_view_param_name LightView
-                        light_farplane_param_name lightFarPlane
-                        world_view_proj_param_name WorldViewProj
-                        world_param_name World
-         }

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;