Changeset 2054 for GTP/trunk/App/Demos/Illum/Ogre/Media/materials/programs

Timestamp:

01/24/07 21:44:30 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GameTools_DepthShadow.hlsl (modified) (3 diffs)
• GameTools_Diffuse.hlsl (modified) (2 diffs)
• MetalTeapotNew.hlsl (modified) (3 diffs)

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

@@ -113 +113 @@
 
 
+
 VS_OUT_SHADOW distShadowVS(float4 position : POSITION,  
                                                         uniform float4x4 worldViewProj,
@@ -128 +129 @@
 }
 
-
+/*
 float4 distShadowPS(VS_OUT_SHADOW IN,
                                         uniform float4x4 lightViewProj,
@@ -173 +174 @@
         
         return shadow + (1 - shadow) * light;
-}
-
+}*/
+
+float4 distShadowPS(VS_OUT_SHADOW IN,
+                                        uniform float4x4 lightViewProj,
+                                        uniform float lightFarPlane,
+                                        uniform sampler2D depthShadowMap : register(s0)
+                                        ):COLOR
+{       
+        float bias = 0.001;
+        float epsilon = 0.001;
+        float4 light = float4(1,1,1,1);
+        float4 shadow = float4(0.85,0.85,0.85,1);
+        
+        if(IN.lPosition.z > 0.0)
+        {
+                float4 pos = (IN.lPosition / IN.lPosition.w);
+                
+                float d = length(pos.xy);
+                        
+                light = saturate((1.0 - d)/0.05);
+                
+                if(d <= 1.0)
+                {
+                        float dist = length(IN.lVPosition.xyz) / lightFarPlane;
+                        pos.xy = (pos.xy + 1.0) / 2.0;
+                        pos.y = 1.0 - pos.y;
+                        float4 storedDist = tex2D(depthShadowMap, pos.xy);
+                        
+                light = storedDist.r + dist*0.000000000001;
+        
+                }
+                
+        }
+        else
+                light = 0;      
+        
+        return shadow + (1 - shadow) * light;
+}
 
 /*

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

@@ -1 +1 @@
 float REDUCED_CUBEMAP_SIZE;
+int CUBEMAP_SIZE = 128;
+int RATE = 32;
 
 float4 readCubeMap(samplerCUBE cm, float3 coord)                
@@ -13 +15 @@
         if(dist == 0) dist = 1000000; ///sky
         return dist;
+}
+
+
+/////
+/// Reduce cube map shader
+/////
+struct MPos_OUT
+{
+ float4 VPos : POSITION;
+ float4 MPos : TEXCOORD0;
+};
+
+float4 ReduceCubeMap_PS(MPos_OUT IN,
+                                                uniform int nFace,
+                                                uniform samplerCUBE EnvironmentMapSampler : register(s0) ) : COLOR
+{  
+   RATE = 32;
+   CUBEMAP_SIZE = 128;
+   float4 color = 0;
+   float3 dir;
+  
+   for (int i = 0; i < RATE; i++)
+     for (int j = 0; j < RATE; j++)
+    {
+                float2 pos;
+                pos.x = IN.mPos.x + (2*i + 1)/(float)CUBEMAP_SIZE;
+                pos.y = IN.mPos.y - (2*j + 1)/(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);             
 }
 

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

@@ -413 +413 @@
         return I;
 }
-
+/*
 float4 mainPS(VertOut IN,
                                                         uniform float3 cameraPos,
@@ -448 +448 @@
    return Color;
 }
-
-/*
+*/
+
 float4 mainPS(VertOut IN,
                                                         uniform float3 cameraPos,
@@ -486 +486 @@
          
         return Color;
-}*/
-
-/*
-float4 mainPS(VertOut IN,
-                                                        uniform float3 cameraPos,
-                                                        uniform samplerCUBE CubeMap : register(s0),
-                                                        uniform samplerCUBE DistanceMap : register(s1),
-                                                        uniform samplerCUBE NormDistMap1 : register(s2),
-                                                        uniform samplerCUBE NormDistMap2 : register(s3),
-                                                        uniform float3 lastCenter,
-                                                        uniform float SingleBounce,
-                                                        uniform float refIndex,
-                                                        uniform float4 min,
-                                                        uniform float4 min1,
-                                                        uniform float4 min2,
-                                                        uniform float4 max,
-                                                        uniform float4 max1,
-                                                        uniform float4 max2
-                                                        ):COLOR
-{
-  float2 miniMaxi1;
-  miniMaxi1.x = min1.a;
-  miniMaxi1.y = max1.a;
-   
-  float4 I = float4(0,0,0,0);
-                
-  float3 N = normalize(IN.mNormal);
-  float3 x = IN.wPos - lastCenter;
-  float3 V  = normalize(IN.wPos - cameraPos);
-  float3 R = normalize(reflect(V, N)); 
-         
-  float3 p;
-  float dl, dp, llp, ppp;   
-  linearSearch( x, R, N, NormDistMap1, miniMaxi1, p, dl, dp, llp, ppp);
-  if( dot(p, p) != 0 )
-  {
-    //secantSearch(x, R, NormDistMap1, dl, dp, llp, ppp, p);
-    I = readCubeMap(NormDistMap1, p);
-  }
-<<<<<<< .mine
-I = max1 + 0.0000000000001 *x.x;
-=======
- I = max1 + 0.000000001 * x.x;
->>>>>>> .r1994
-  //I = readCubeMap(NormDistMap1, R)+0.00000000001*x.x; 
-  return I;     
-}*/
+}