Changeset 1118 for GTP/trunk

Timestamp:

07/11/06 15:47:50 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

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

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

@@ -3 +3 @@
 {
         float4 hPosition        : POSITION;
-        float4 Position : TEXCOORD0;
+        float4 Position         : TEXCOORD0;    
 };
 
-VS_OUT hDepthVS(float4 position : POSITION,     
-                uniform float4x4 worldView,
-                uniform float4x4 worldViewProj)
+VS_OUT DepthVS(float4 position : POSITION,      
+                                uniform float4x4 worldViewProj,                         
+                                uniform float4x4 viewProj,
+                                uniform float4x4 cameraMatrix)
 {
   
   VS_OUT OUT;
+ 
   OUT.hPosition = mul(worldViewProj, position);
-  OUT.Position = mul(worldView, position);
-  OUT.Position.z *= -1.0;
+  OUT.Position = mul(viewProj, position);
+  
   return OUT;
 }
 
-
-
+//for directional light
 float4 DepthPS(VS_OUT IN ):COLOR
 {
-        float dist = length(IN.Position.xyz);
-        return float4(dist, dist, dist, 1);
-        //return 1;     
+        float4 pos = (IN.Position / IN.Position.w);
+        pos = (pos +1.0 ) / 2.0;
+        return pos.z;   
 }
 
@@ -33 +34 @@
         float4 hPosition        : POSITION;
         float4 Position         : TEXCOORD0;
-        float4 cPosition        : TEXCOORD1;
+        float4 lPosition        : TEXCOORD1;
 };
 
 VS_OUT_SHADOW depthShadowVS(float4 position : POSITION, 
-                uniform float4x4 world,
-                uniform float4x4 worldView,
-                uniform float4x4 worldViewProj)
+                                                        uniform float4x4 worldViewProj,
+                                                        uniform float4x4 lightViewProj)
 {
   VS_OUT_SHADOW OUT;
   OUT.hPosition = mul(worldViewProj, position);
-  OUT.Position = mul(world, position);
-  OUT.cPosition = mul(worldView, position);
+  OUT.lPosition = mul(lightViewProj, position);  
+  OUT.Position = position;  
   return OUT;
 }
@@ -50 +50 @@
 
 float4 depthShadowPS(VS_OUT_SHADOW IN,
-                                        uniform float4x4 lightView,
                                         uniform float4x4 lightViewProj,
-                                        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 light1 = float4(1,1,1,1);
+                                        uniform sampler2D depthShadowMap : register(s0)
+                                        ):COLOR
+{       
+        float bias = 0.001;
+        float4 light = float4(1,1,1,1);
+        float4 shadow = float4(0.3,0.3,0.3,1);
         
-        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 = shadowColor;   
-        
-        
-        return light1;  
+        float4 pos = (IN.lPosition / IN.lPosition.w);
+        pos = (pos +1.0 ) / 2.0;
+        pos.y = 1.0 - pos.y;
+        float4 storedDepth = tex2D(depthShadowMap, pos.xy);
+        if(storedDepth.r + bias < pos.z)
+                light = shadow;
+        //return abs( pos.z - storedDepth.z );  
+        return light;   
 }
 

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

@@ -170 +170 @@
       pass 
       { 
-                cull_hardware anticlockwise
+                //cull_hardware anticlockwise
                 
                 vertex_program_ref GameTools/ShadowMap/DepthVS
         {       
-            param_named_auto worldView worldview_matrix
-            param_named_auto worldViewProj worldviewproj_matrix
-            
+           param_named_auto viewProj viewproj_matrix
+           param_named_auto worldViewProj worldviewproj_matrix            
             } 
                 fragment_program_ref  GameTools/ShadowMap/DepthPS

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

@@ -228 +228 @@
 {
         source GameTools_DepthShadow.hlsl
-        entry_point hDepthVS
-        target vs_1_1
+        entry_point DepthVS
+        target vs_3_0
 } 
 
@@ -236 +236 @@
         source GameTools_DepthShadow.hlsl
         entry_point DepthPS
-        target ps_2_0
+        target ps_3_0
 
 }