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

Timestamp:

10/17/06 09:25:48 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• GameTools_DepthShadow.hlsl (modified) (5 diffs)
• GameTools_Phong.hlsl (modified) (3 diffs)

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

@@ -21 +21 @@
 float4 DepthPS(VS_OUT IN ):COLOR
 {
+//return 1;
         float4 pos = (IN.Position / IN.Position.w);
-        pos = (pos +1.0 ) / 2.0;
+        //pos = (pos +1.0 ) / 2.0;
         return float4(pos.z, pos.z * pos.z, 1, 1);      
 }
@@ -48 +49 @@
 }
 
-
+/*
 float4 depthShadowPS(VS_OUT_SHADOW IN,
                                         uniform float4x4 lightViewProj,
@@ -54 +55 @@
                                         ):COLOR
 {       
-        float bias = 0.1;
+        float bias = 0.0001;
         float4 light = float4(1,1,1,1);
-        float4 shadow = float4(0.3,0.3,0.3,1);
+        float4 shadow = float4(0.6,0.6,0.6,1);
         
         float4 pos = (IN.lPosition / IN.lPosition.w);
@@ -63 +64 @@
         float4 storedDepth = tex2D(depthShadowMap, pos.xy);
         
-        if(storedDepth.r + bias > pos.z)
+        if(storedDepth.r + bias < pos.z)
         {
                 float M1 = storedDepth.r;
@@ -76 +77 @@
         return light;   
 }
+*/
 
+
+float4 depthShadowPS(VS_OUT_SHADOW IN,
+                                        uniform float4x4 lightViewProj,
+                                        uniform sampler2D depthShadowMap : register(s0)
+                                        ):COLOR
+{       
+        float bias = 0.0001;
+        float4 light = float4(1,1,1,1);
+        float4 shadow = float4(0.65,0.65,0.65,1);
+        //float4 shadow = float4(0,0,0,1);
+        
+        if(IN.lPosition.z > 0.0)
+        {
+                float4 pos = (IN.lPosition / IN.lPosition.w);
+                pos.xy = (pos.xy + 1.0) / 2.0;
+        
+        
+                pos.y = 1.0 - pos.y;
+                float4 storedDepth = tex2D(depthShadowMap, pos.xy);
+        
+                if(storedDepth.r + bias < pos.z)
+                {               
+                        light = shadow;
+                }
+                //if(length(pos.xy)>1)
+                //              light = shadow;
+        }
+        
+        
+        return light;   
+}

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

@@ -60 +60 @@
     float3 pos = IN.wPos;
     
-    float M = 1;
+    float M = 4;
    
     float3 lightpositions[8];
@@ -92 +92 @@
         L = normalize(L);
         float3 H = normalize(L + V);
-        float lightscale = 1.0;
+        float lightscale = 3.0;
         float4 spec = specular * lightcolors[i] * pow(dot(H, N), shininess) * lightscale;
         float4 diff = diffuse * lightcolors[i] * abs(dot(L, N)) * lightscale;
@@ -103 +103 @@
 
 }
+
+vertOUT PhongViewSpaceVS(float4 position : POSITION,
+                float3 normal   : NORMAL,
+                half3 tangent   : TEXCOORD1, 
+                float2 texCoord : TEXCOORD0,                    
+                uniform float4x4 worldViewProj,
+                uniform float4x4 worldView,
+                uniform float4x4 worldViewIT)
+{
+  vertOUT OUT;
+  OUT.hPos = OUT.hPosition = mul(worldViewProj, position);
+  OUT.wPos = mul(worldView, position).xyz;  
+  OUT.mNormal = mul(worldViewIT, normal).xyz;
+  //OUT.mNormal = normal;
+  OUT.texCoord = texCoord;  
+  return OUT;
+}
+
+float4 PhongTexturedPS( vertOUT IN,
+                uniform float3 cameraPos,
+       uniform float4 lightpos1,
+           uniform float4 lightpos2,
+           uniform float4 lightpos3,
+           uniform float4 lightpos4,
+           uniform float4 lightpos5,
+           uniform float4 lightpos6,
+           uniform float4 lightpos7,
+           uniform float4 lightpos8,
+           uniform float4 lightdir1,
+           uniform float4 lightdir2,
+           uniform float4 lightdir3,
+           uniform float4 lightdir4,
+           uniform float4 lightdir5,
+           uniform float4 lightdir6,
+           uniform float4 lightdir7,
+           uniform float4 lightdir8,
+           uniform float lightscale1,
+           uniform float lightscale2,
+           uniform float lightscale3,
+           uniform float lightscale4,
+           uniform float lightscale5,
+           uniform float lightscale6,
+           uniform float lightscale7,
+           uniform float lightscale8,
+           uniform float4 lightcol1,
+           uniform float4 lightcol2,
+           uniform float4 lightcol3,
+           uniform float4 lightcol4,
+           uniform float4 lightcol5,
+           uniform float4 lightcol6,
+           uniform float4 lightcol7,
+           uniform float4 lightcol8,
+           uniform float4 ambientLight,
+           uniform float shininess,
+           uniform float4 specular,
+           uniform float4 diffuse,
+           uniform float4 ambient,
+           uniform sampler2D colorTexture,
+           uniform float4x4 worldViewIT          
+
+            ) : COLOR0
+{
+   
+        
+    float3 N = IN.mNormal;
+    //float3 N = mul(worldViewIT, IN.mNormal);
+    N = normalize( N ); 
+    float3 pos = IN.wPos;
+    
+    float M = 3;
+   
+    float4 lightpositions[8];
+    float4 lightdirs[8];
+    float4 lightcolors[8];
+
+    lightpositions[0] = lightpos1;
+    lightpositions[1] = lightpos2;
+    lightpositions[2] = lightpos3;
+    lightpositions[3] = lightpos4;
+    lightpositions[4] = lightpos5;
+    lightpositions[5] = lightpos6;
+    lightpositions[6] = lightpos7;
+    lightpositions[7] = lightpos8;
+    
+    lightdirs[0] = lightdir1;
+    lightdirs[1] = lightdir2;
+    lightdirs[2] = lightdir3;
+    lightdirs[3] = lightdir4;
+    lightdirs[4] = lightdir5;
+    lightdirs[5] = lightdir6;
+    lightdirs[6] = lightdir7;
+    lightdirs[7] = lightdir8;
+
+    lightcolors[0] = lightcol1 * lightscale1;
+    lightcolors[1] = lightcol2 * lightscale2;
+    lightcolors[2] = lightcol3 * lightscale3;
+    lightcolors[3] = lightcol4 * lightscale4;
+    lightcolors[4] = lightcol5 * lightscale5;
+    lightcolors[5] = lightcol6 * lightscale6;
+    lightcolors[6] = lightcol7 * lightscale7;
+    lightcolors[7] = lightcol8 * lightscale8;
+
+        float4 texColor = tex2D(colorTexture, IN.texCoord);
+        if(length(texColor)==0)texColor = 1;
+    float4 I = 0;
+    I = texColor * ambientLight * ambient;
+        float maxlightangle = 3.14 / 2.0;
+    for(int i=0; i< M; i++)
+    {
+                float3 V = normalize(cameraPos - pos);
+                float3 L = lightpositions[i].xyz - pos * lightpositions[i].w;
+                float d = length(L);
+                L = normalize(L);
+                float3 H = normalize(L + V);
+                
+                float spotscale = 1.0;
+                if( lightdirs[i].w && lightpositions[i].w)//spotlight
+                {
+                        float lightangle;
+                        lightangle = acos(dot(-L, normalize(lightdirs[i].xyz)));                        
+                        spotscale = 1 - saturate(lightangle / maxlightangle);
+                        //spotscale *= spotscale;
+                }
+                        
+                float4 spec = spotscale * specular * lightcolors[i] * pow(dot(H, N), shininess);
+                float4 diff = spotscale * texColor * diffuse * lightcolors[i] * dot(L, N);
+                I += 1.0 / d / d * (spec + diff);       
+                //I+= spotscale;
+    }
+
+        //return texColor;
+        //return float4(N,1);
+    return I;
+
+}
+