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

Timestamp:

04/24/07 14:10:34 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GTPAdvancedEnvMap/diffuse/GTPDiffuse.hlsl (modified) (4 diffs)
• GTPAdvancedEnvMap/diffuse/GTPDiffuse.program (modified) (2 diffs)
• GTPAdvancedEnvMap/diffuseSimple (added)
• GTPAdvancedEnvMap/diffuseSimple/GTPDiffuseSimpe.material (added)
• GTPAdvancedEnvMap/diffuseSimple/GTPDiffuseSimple.hlsl (added)
• GTPBasic/GTPBasic.program (modified) (1 diff)
• GTPBasic/GTPShadowMap_PS.hlsl (modified) (2 diffs)
• GTPCaustic/GTPCaustic.material (modified) (2 diffs)
• GTPPathMap (added)
• GTPPathMap/PRMDemo.material (added)
• GTPPathMap/PathMap.hlsl (added)
• GTPPathMap/PathMapWeightCompute.hlsl (added)
• programs/GameTools_Phong.hlsl (modified) (2 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPAdvancedEnvMap/diffuse/GTPDiffuse.hlsl

@@ -6 +6 @@
 float4 readCubeMap(samplerCUBE cm, float3 coord)                
 {
-        float4 color = texCUBElod( cm, float4(coord.xy, -coord.z, 1) );
+        float4 color = texCUBElod( cm, float4(coord.xy, -coord.z, 0) );
         color.a = 1;
         return color;
@@ -13 +13 @@
 float readDistanceCubeMap(samplerCUBE dcm, float3 coord)                
 {
-        float dist = texCUBElod(dcm, float4(coord.xy, - coord.z, 1)).r;
+        float dist = texCUBElod(dcm, float4(coord.xy, - coord.z, 0)).r;
         if(dist == 0) dist = 1000000; ///sky
         return dist;
@@ -26 +26 @@
  float4 MPos : TEXCOORD0;
 };
-
+/*
 float4 ReduceCubeMap_PS(MPos_OUT IN,
                                                 uniform int nFace,
@@ -54 +54 @@
         return color / (RATE * RATE);           
 }
-
+*/
+
+float4 ReduceCubeMap_PS(MPos_OUT IN,
+                                                uniform int nFace,
+                                                uniform samplerCUBE EnvironmentMapSampler : register(s0) ) : COLOR
+{  
+   float4 color = 0;
+   float3 dir;
+  
+   for (int i = 0; i < RATE/2; i+=1)
+     for (int j = 0; j < RATE/2; j+=1)
+    {
+                float2 pos;
+                pos.x = IN.MPos.x + (4*i + 2)/(float)CUBEMAP_SIZE;
+                pos.y = IN.MPos.y - (4*j + 2)/(float)CUBEMAP_SIZE;      // y=-u
+
+                // "scrambling"
+                if (nFace == 0) dir = float3(1, pos.y, -pos.x);
+                if (nFace == 1) dir = float3(-1, pos.y, pos.x);
+                if (nFace == 2) dir = float3(pos.x, 1, -pos.y);
+                if (nFace == 3) dir = float3(pos.x, -1, pos.y);
+                if (nFace == 4) dir = float3(pos.x, pos.y, 1);
+                if (nFace == 5) dir = float3(-pos.x, pos.y,-1);
+
+                color += texCUBE( EnvironmentMapSampler, dir);
+    }
+ 
+        return color / (RATE * RATE / 4.0);             
+}
 
 ////////////////

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPAdvancedEnvMap/diffuse/GTPDiffuse.program

@@ -4 +4 @@
         entry_point Diffuse_Poly2Point_PS
         target ps_3_0
-        flow_control prefer
+        //flow_control prefer
 }
 
@@ -28 +28 @@
         entry_point ReduceCubeMap_PS
         target ps_3_0
-        flow_control prefer
+        //flow_control avoid
 }

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

@@ -193 +193 @@
    source GTPShadowMap_PS.hlsl
    entry_point shadowMapDist_Variance
+   target ps_2_0
+}
+
+fragment_program GTP/Basic/SM/Dist_POINT_VSM_PS hlsl
+{
+   source GTPShadowMap_PS.hlsl
+   entry_point shadowMapDist_POINT_Variance
    target ps_2_0
 }

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

@@ -106 +106 @@
     float4 pos = (IN.LightVPos / IN.LightVPos.w);
         float d = length(pos.xy);
-    light = saturate((1.0 - d)/0.05);           
     if(d <= 1.0)
     {
@@ -126 +125 @@
     }
   }
-  else
-   light = 0;   
         
   return shadowColor + (1 - shadowColor) * light;
 }
+
+
+float4 shadowMapDist_POINT_Variance(LightCPos_OUT IN,
+                              uniform float lightFarPlane,
+                              uniform samplerCUBE shadowMap) : COLOR
+{
+  float4 light = float4(1,1,1,1);
+  
+  float dist = length(IN.LightCPos.xyz) / lightFarPlane;
+  float4 storedDist = texCUBE(shadowMap, float3(IN.LightCPos.xy, -IN.LightCPos.z));
+  dist -= DIST_BIAS_VSM;
+  float lit_factor = light * (dist <= storedDist.r);    
+         
+  float M1 = storedDist.r;
+  float M2 = storedDist.g;
+  float v2 = min(max(M2 - M1 * M1, 0.0) +  DIST_EPSILON, 1.0);
+  float m_d = M1 - dist;
+  float pmax = v2 / (v2 + m_d * m_d);
+                                                
+  // Adjust the light color based on the shadow attenuation
+  light = max(lit_factor, pmax);        
+        
+  
+  return (shadowColor + (1 - shadowColor) * light);
+}

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPCaustic/GTPCaustic.material

@@ -117 +117 @@
                                 use_triangles   true
                                 blur_caustic_cubemap true                               
+                        }
+                        
+                 }      
+         vertex_program_ref GTP/Basic/Shaded_VS
+         {       
+            param_named_auto WorldViewProj worldviewproj_matrix 
+            param_named_auto World world_matrix
+            param_named_auto WorldInv inverse_world_matrix
+         } 
+         fragment_program_ref GTP/EnvMap/Localized_Refraction_PS
+         { 
+                    param_named_auto cameraPos camera_position
+            param_named lastCenter float3 0 0 0
+            param_named sFresnel float 0.1
+<<<<<<< .mine
+            param_named sRefraction float 0.85
+=======
+            param_named sRefraction float 0.8
+>>>>>>> .r2314
+             }          
+             //Cube map for reflections and refractions 
+             texture_unit
+             {
+            
+             }
+             //Cube map of distances
+             texture_unit
+             {
+                filtering none
+             }
+          }
+   }
+}
+
+material GTP/Caustic/Glass_PointSprite
+{
+   technique 
+   {   
+      pass 
+      { 
+                 IllumTechniques
+                 {
+                        RenderTechnique ColorCubeMap
+                        {
+                                update_interval         0
+                                update_all_face true                                                                    
+                        }
+                        RenderTechnique DistanceCubeMap
+                        {
+                                update_interval         0
+                                update_all_face true                                                                            
+                        }
+                        RenderTechnique CausticCaster
+                        {
+                                attenuation     1000
+                                update_interval 1
+                                update_all_face true
+                                photonmap_resolution 64
+                                caustic_cubemap_resolution 256
+                                photon_map_material     GTP/Caustic/PhotonMap_HitEnv
+                                caustic_map_material    GTP/Caustic/CauCube_PointSprite
+                                blur_caustic_cubemap false
                         }
                         
@@ -146 +208 @@
    }
 }
-
-material GTP/Caustic/Glass_PointSprite
-{
-   technique 
-   {   
-      pass 
-      { 
-                 IllumTechniques
-                 {
-                        RenderTechnique ColorCubeMap
-                        {
-                                update_interval         0
-                                update_all_face true                                                                    
-                        }
-                        RenderTechnique DistanceCubeMap
-                        {
-                                update_interval         0
-                                update_all_face true                                                                            
-                        }
-                        RenderTechnique CausticCaster
-                        {
-                                attenuation     1000
-                                update_interval 1
-                                update_all_face true
-                                photonmap_resolution 64
-                                caustic_cubemap_resolution 256
-                                photon_map_material     GTP/Caustic/PhotonMap_HitEnv
-                                caustic_map_material    GTP/Caustic/CauCube_PointSprite
-                                blur_caustic_cubemap false
-                        }
-                        
-                 }      
-         vertex_program_ref GTP/Basic/Shaded_VS
-         {       
-            param_named_auto WorldViewProj worldviewproj_matrix 
-            param_named_auto World world_matrix
-            param_named_auto WorldInv inverse_world_matrix
-         } 
-         fragment_program_ref GTP/EnvMap/Localized_Refraction_PS
-         { 
-                    param_named_auto cameraPos camera_position
-            param_named lastCenter float3 0 0 0
-            param_named sFresnel float 0.1
-            param_named sRefraction float 0.8
-             }          
-             //Cube map for reflections and refractions 
-             texture_unit
-             {
-            
-             }
-             //Cube map of distances
-             texture_unit
-             {
-                filtering none
-             }
-          }
-   }
-}

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/programs/GameTools_Phong.hlsl

@@ -115 +115 @@
   OUT.hPos = OUT.hPosition = mul(worldViewProj, position);
   OUT.wPos = mul(worldView, position).xyz;  
-  OUT.mNormal = mul(normal, worldViewI).xyz;
+  OUT.mNormal = normal;//mul(normal, worldViewI).xyz;
   //OUT.mNormal = normal;
   OUT.texCoord = texCoord;  
@@ -165 +165 @@
         
     float3 N = IN.mNormal;
-    //float3 N = mul(worldViewIT, IN.mNormal);
     N = normalize( N ); 
     float3 pos = IN.wPos;