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

Timestamp:

06/27/06 10:17:56 (19 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• programs/GameTools_DepthShadow.hlsl (modified) (3 diffs)
• programs/GameTools_Localized_EnvMap.hlsl (modified) (1 diff)
• scripts/GameTools.material (modified) (4 diffs)
• scripts/GameTools.program (modified) (1 diff)

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

@@ -32 +32 @@
         float4 hPosition        : POSITION;
         float4 Position         : TEXCOORD0;
+        float4 cPosition        : TEXCOORD1;
 };
 
 VS_OUT_SHADOW depthShadowVS(float4 position : POSITION, 
                 uniform float4x4 world,
+                uniform float4x4 worldView,
                 uniform float4x4 worldViewProj)
 {
@@ -41 +43 @@
   OUT.hPosition = mul(worldViewProj, position);
   OUT.Position = mul(world, position);
+  OUT.cPosition = mul(worldView, position);
   return OUT;
 }
@@ -48 +51 @@
                                         uniform float4x4 lightView,
                                         uniform float4x4 lightViewProj,
-                                        uniform sampler2D depthShadowMap ):COLOR
-{
-        float bias = 0.0;
-        float4 shadowColor = float4(0.4, 0.4, 0.4, 1.0);
+                                        uniform float4x4 lightView2,
+                                        uniform float4x4 lightViewProj2,
+                                        uniform sampler2D depthShadowMap : register(s0),
+                                        uniform sampler2D depthShadowMap2 : register(s1)):COLOR
+{                                       
+        float bias = 0.06;
+        float4 shadowColor = float4(0.6, 0.6, 0.6, 1.0);
 
-        float4 light = 1;
+        float4 light1 = 1;
+        float4 light2 = 1;
+        float weight1 = 1;
+        float weight2 = 1;
         
-        float4 lightCamPos = mul(lightView, IN.Position);
-        float d = length(lightCamPos.xyz);
+        float4 lightCamPos1 = mul(lightView, IN.Position);
+        float d1 = length(lightCamPos1.xyz);    
+        float4 lightScreenPos1 = mul(lightViewProj, IN.Position);
+        lightScreenPos1 = lightScreenPos1 / lightScreenPos1.w ; 
+        lightScreenPos1 = ( lightScreenPos1 + 1.0 ) / 2.0;
+        lightScreenPos1.y = 1.0 - lightScreenPos1.y;
+        float4 storedDepth1 = tex2D(depthShadowMap, lightScreenPos1.xy);
+                if(storedDepth1.r + bias < d1)
+                        light1=0;
         
-        float4 lightScreenPos = mul(lightViewProj, IN.Position);
-        lightScreenPos = lightScreenPos / lightScreenPos.w ;
-        float dist = length(lightScreenPos.xy);
         
-        if(dist < 1.0 && lightCamPos.z < 0)
+        float4 lightCamPos2 = mul(lightView2, IN.Position);
+        float d2 = length(lightCamPos2.xyz);
+        
+                        
+        float4 lightScreenPos2 = mul(lightViewProj2, IN.Position);
+        lightScreenPos2 = lightScreenPos2 / lightScreenPos2.w ; 
+
+        if(abs(lightScreenPos2.x) < 0.99 && abs(lightScreenPos2.y) < 0.99 )
         {
-                lightScreenPos = ( lightScreenPos + 1.0 ) / 2.0;
-                lightScreenPos.y = 1.0 - lightScreenPos.y;
-                float4 storedDepth = tex2D(depthShadowMap, lightScreenPos.xy);
-                        
-                
-                if(storedDepth.r + bias < d)
-                        light = shadowColor;
-                if(storedDepth.r == 0)
-                        light = 1;                      
+                lightScreenPos2 = ( lightScreenPos2 + 1.0 ) / 2.0;
+                lightScreenPos2.y = 1.0 - lightScreenPos2.y;
+                float4 storedDepth2 = tex2D(depthShadowMap2, lightScreenPos2.xy);
+                        if(storedDepth2.r + bias < d2)
+                                light2=0;       
         }
         else
-                light = 1;
+                weight2 = 0;
                 
-        return light;   
+        weight1 = 1 - weight2;  
+                
+        return saturate((light1*weight1 + light2*weight2) + shadowColor);       
 }
 

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

@@ -245 +245 @@
 }
 
-void PhotonMapSoftShadowPS(  float2 texCoord : TEXCOORD0, 
-                float3 wPos     : TEXCOORD1,    
-                float3 mNormal  : TEXCOORD2,
-                uniform float3 cameraPos,
-                uniform samplerCUBE DistanceMap : register(s0),
-                uniform float3 lastCenter,
-                out float4 Color :COLOR0)
-{
-        
-        Color = float4(1,1,1,1);
-        
-        mNormal = normalize(mNormal);
-        float3 newTexCoord;     
-        float3 mPos = wPos - lastCenter;
-        float3 V = normalize(wPos - cameraPos);
-        newTexCoord = V;        
-        
-        newTexCoord = Hit(mPos, V, DistanceMap);
-        
-        Color = float4(normalize(newTexCoord),1);
-}
+
 
 /////////////////////

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/GameTools.material

@@ +1 @@
+
+
+material GameTools/HPS
+{ 
+
+   technique 
+   { 
+      pass 
+      { 
+                IllumTechniques
+                {
+                        RenderTechnique HPS
+                        {
+                                particle_script GameTools/Little
+                        }                       
+                }
+                
+                scene_blend add
+                
+                lighting off            
+                depth_check off
+                
+            texture_unit
+                {
+                        texture 
+                }
+                         
+                
+        }
+  }
+}
+
+
+material Flare
+{
+        technique
+        {
+                pass
+                {
+                        //cull_hardware none                    
+                        lighting off
+                        //scene_blend add
+                        //scene_blend_op add
+                        //scene_blend_op_alpha add
+                        //scene_blend_alpha add
+                        depth_write off
+
+                        ambient 1 0 0 1
+                        diffuse 1 0 0 1
+                        //texture_unit
+                        //{
+                        //      texture flare.png
+                        //}
+                }
+        }
+}
+
 material Examples/MorningSkyBox
 {
@@ -626 +683 @@
       pass 
       { 
+                
+                IllumTechniques
+                {
+                        RenderTechnique ReducedColorCubeMap
+                        {
+                                update_interval         3
+                                distance_calc false
+                                face_angle_calc false
+                                update_all_face         false
+                        }
+                }
+      
+
                 vertex_program_ref GameTools/DiffuseVS
                 {       
@@ -735 +805 @@
             param_named_auto worldViewProj worldviewproj_matrix 
             param_named_auto world world_matrix     
+            param_named_auto worldIT inverse_transpose_world_matrix
          } 
                  fragment_program_ref  GameTools/PhotonMapCausticPS
@@ -892 +963 @@
         pass 
       { 
-      
-        cull_hardware none
-        cull_software none
-        lighting off
-        scene_blend add
-        depth_write off
-
-         vertex_program_ref GameTools/SpriteVS
-         {       
-            param_named_auto worldViewProj worldviewproj_matrix 
-            param_named_auto worldView worldview_matrix
-                        param_named_auto Proj projection_matrix     
-         } 
-         fragment_program_ref  GameTools/SpritePS
-         { 
-                 
-         }
-
-         texture_unit
-         {
-          texture flare.png
-         }
+                
+                cull_hardware none
+                cull_software none
+                lighting off
+                scene_blend add
+                depth_write off
+
+                vertex_program_ref GameTools/SpriteVS
+                        {       
+                                param_named_auto worldViewProj worldviewproj_matrix 
+                                param_named_auto worldView worldview_matrix
+                                param_named_auto Proj projection_matrix     
+                        } 
+                fragment_program_ref  GameTools/SpritePS
+                        { 
+                         
+                        }
+
+                texture_unit
+                {
+                texture flare.png
+                }
 
        }

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/scripts/GameTools.program

@@ -179 +179 @@
 }
 
-fragment_program GameTools/PhotonMapSoftShadowPS hlsl
-{
-        source GameTools_Localized_EnvMap.hlsl
-        entry_point PhotonMapSoftShadowPS
-        target ps_3_0
-}
+//fragment_program GameTools/PhotonMapSoftShadowPS hlsl
+//{
+//      source GameTools_Localized_EnvMap.hlsl
+//      entry_point PhotonMapSoftShadowPS
+//      target ps_3_0
+//}