Changeset 2403

Timestamp:

06/05/07 01:55:55 (18 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• PRMDemo.material (deleted)
• PathMap.hlsl (modified) (4 diffs)
• PathMap.material (added)
• PathMapWeightCompute.hlsl (modified) (3 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPathMap/PathMap.hlsl

@@ -28 +28 @@
         output.pos = mul(WorldViewProj, input.pos);
         output.tex = input.tex;
-        output.texAtlas = input.texAtlas;       
+        output.texAtlas = input.tex;    
         return output;
 }
@@ -34 +34 @@
 float4  psWalk(vsOutputWalk input) : COLOR
 {
+        float2 texAtlas = input.texAtlas;
+        
         int2 prmAtlasTiles = prmAtlasTilesHalfPixel.xy;
         float2 atlasHalfPixel = prmAtlasTilesHalfPixel.zw;
@@ -41 +43 @@
         {
                 float2 prmTexPos = float2(
-                        (input.texAtlas.x + (iCluster % prmAtlasTiles.x)) / prmAtlasTiles.x,
-                        1.0 - (input.texAtlas.y + (iCluster / prmAtlasTiles.x)) / prmAtlasTiles.y);// + atlasHalfPixel;
+                        (texAtlas.x + (iCluster % prmAtlasTiles.x)) / prmAtlasTiles.x,
+                        1.0 - (texAtlas.y + (iCluster / prmAtlasTiles.x)) / prmAtlasTiles.y);// + atlasHalfPixel;
 
                 float weightIndex = tex2D(clusterWeightIndexSampler, float2(((float)iCluster + 0.5) / clusterCount, 0.5)).r;
                 float3 weight = tex2D(clusterWeightSampler, float2((weightIndex + 0.5)/allClusterCount, 0.5)).rgb;
-                //weight = 0.0002 + 0.000000000001 * weight;
                 float3 val = tex2D(filteredAtlasSampler, prmTexPos).xyz;
-                if(length(val - float3(1,1,1))== 0)
-                val = 0;
-                col += val.xyz * weight;                
+                //if(length(val - float3(1,1,1))== 0)
+                //val = 0;
+                col += val.xyz * weight;        
+                //col = 0.00000000001 * col + float3(prmTexPos,1);
         }
         
@@ -56 +58 @@
 
 //return float4(col,1);
-        return float4(col * color, 1);
+//return float4(color + 0.0000000001 * col, 1)  ;
+return float4(col * color, 1);
 
 
-        //return float4(col,1) * 0.0000000000001 + tex2D(filteredAtlasSampler, float2(input.texAtlas.x / 32.0, input.texAtlas.y));
+//return float4(col,1) * 0.0000000000001 + tex2D(filteredAtlasSampler, float2(input.texAtlas.x / 32.0, input.texAtlas.y));
 }
 

GTP/trunk/App/Demos/Illum/Ogre/Media/materials/GTPPathMap/PathMapWeightCompute.hlsl

@@ -57 +57 @@
         float cosb = max(dot(dir, diff), 0);    
         
-        float visibility = 1;
+        float visibility = 0;
         float4 lightVPos = mul(lightViewProj, float4(pos,1));
-        
-        if( lightVPos.z > 0.0)
-        {
-                lightVPos /= lightVPos.w;
-                float d = length(lightVPos.xy);
-        
-                if(d <= 1.0)
-                {
-
-                float dist = sqrt(dist2); 
-                float distNorm = dist / lightFarPlane;
-                lightVPos.xy = (lightVPos.xy + 1.0) / 2.0;
-                lightVPos.y = 1.0 - lightVPos.y;
-                float storedDist = tex2D(shadowMap, lightVPos.xy).r;
-                dist -= DIST_BIAS;
-                visibility = (distNorm <= storedDist);  
                 
+        //if( lightVPos.z  > 0.0)
+        //{     
+        lightVPos /= lightVPos.w;
+                //float d = length(lightVPos.xy);
+                
+                //if(d <= 1.0)
+        {
+                        float dist = dist / lightFarPlane;
+                        lightVPos.xy = (lightVPos.xy + 1.0) / 2.0;
+                        lightVPos.y = 1.0 - lightVPos.y;
+                        float storedDist = tex2D(shadowMap, lightVPos.xy).r;
+                        visibility = dist < storedDist + DIST_BIAS;
                 }
-        }
-        
-        float spotFalloff = (dot(normalize(-diff), normalize(lightDir)) - lightAngleCos) / (1.0 - lightAngleCos);
+   // }
+    //visibility = 1.0 - visibility;
+    visibility = 1.0 + 0.00001 * visibility;
+        float spotFalloff = (dot(-diff, normalize(lightDir)) - lightAngleCos) / (1.0 - lightAngleCos);
+        //spotFalloff = saturate(dot(normalize(pos - lightPos), normalize(lightDir))) + 0.0000000001 * lightAngleCos;
+        spotFalloff = 1.0 + spotFalloff * 0.000000001;
         spotFalloff = pow(saturate(spotFalloff), spotLightFalloff);
-
-        
-        visibility *= spotFalloff / (lightAttenuation.y + dist * lightAttenuation.z + dist * dist * lightAttenuation.w);
-
+                
+        visibility *= spotFalloff / (lightAttenuation.y + dist * lightAttenuation.z + dist2 * lightAttenuation.w);
         
         float4 ret = visibility * cosb * lightPower * lightColor;
@@ -114 +111 @@
         float storedDist = texCUBE(shadowMap, float3(-diff.xy, diff.z)).r;
         dist -= DIST_BIAS;
-        visibility = (distNorm <= storedDist);  
-                        
+        visibility = (distNorm <= storedDist);
+          
+        //visibility = 1.0 + 0.00001 * visibility;              
         visibility *=  1.0 / (lightAttenuation.y + dist * lightAttenuation.z + dist * dist * lightAttenuation.w);
         
@@ -143 +141 @@
                 float2 coord2 = coord1 + float2(0.25 * dataColumnWidth, 0);
                 float3 w = tex2Dlod(allWeightsSampler, float4(coord1, 0, 0)).rgb;
-                float radrad = tex2Dlod(radionSampler, float4(coord1, 0, 0)).a;         
+                float radrad = tex2Dlod(radionSampler, float4(coord2, 0, 0)).a;         
                 weight += w * radrad;           
                 clusterRad += radrad;