Changeset 2213

Timestamp:

03/08/07 17:19:43 (17 years ago)

Author:

szirmay

Message:

 

Location:

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

Files:

• PathMap.hlsl (modified) (1 diff)
• PathMapWeightCompute.hlsl (modified) (4 diffs)

GTP/trunk/App/Demos/Illum/Ogre/Media/PMDemo/PathMap.hlsl

@@ -76 +76 @@
 //return float4(1,0,0,1)+col.xxxx*0.0000000001;
 //return prmAtlasTilesHalfPixel.x*allClusterCount*clusterCount*0.000000000001 + tex2D(filteredAtlasSampler, float2(input.texAtlas.x /32.0f, 1.0 - input.texAtlas.y)).r;
-        return float4(col, 1);
+        return float4(col * 200, 1);
 }
 

GTP/trunk/App/Demos/Illum/Ogre/Media/PMDemo/PathMapWeightCompute.hlsl

@@ -27 +27 @@
     vsOutputComputeWeights output = (vsOutputComputeWeights)0;
     output.pos = input.pos;
-    output.tex = input.tex;
+    output.tex = (input.pos + 1.0) / 2.0;
     output.tex.y = 1.0 - output.tex.y;
     return output;
 }
 
-float4
-        psComputeWeights(vsOutputComputeWeights input) : COLOR0
+float4 psComputeWeights(vsOutputComputeWeights input) : COLOR0
 {
         float dataColumnWidth = 1.0 / (float)nRadionColumns;
@@ -61 +60 @@
         float visibility = 1;
         
-        float4 ret = cosa * cosb;
+        float4 ret = pow(cosa, 9) * cosb / dist2;
 
-        float ize = 0;
-        if(pos.z > 0) ize = 1;
+        //float ize = 0;
+        //if(pos.y > 0) ize = 1;
         //return float4(lightDir + ret.x * 0.00000000001, 1);
         //return ret;
-        return ret.x*0.0000000001 + ize;
+        return ret;
 }
 
@@ -88 +87 @@
                 //weight += tex2Dlod(allWeightsSampler, float4(coord1, 0, 0)).r * radrad;
                 weight += tex2Dlod(allWeightsSampler, float4(coord1, 0, 0)).r;
-                //clusterRad += radrad;
+                clusterRad += radrad;
                 currentEntryPoint++;
         }       
-        /*
-        if(clusterRad >= 0)
+        
+        /*if(clusterRad >= 0)
                 weight /= clusterRad;
         else
                 weight = 0;*/
-        
+                        
     weight /= (float) entryPointCount;
                 
@@ -116 +115 @@
 {
         //return texCoord.y;
-        return tex2D(weightTexture, texCoord).r;
+        return texCoord.r;
 }