Changeset 1480 for GTP/trunk/App/Demos/Illum/PathMap/pathMap.fx

Timestamp:

09/22/06 20:58:26 (18 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/App/Demos/Illum/PathMap/pathMap.fx (modified) (4 diffs)

GTP/trunk/App/Demos/Illum/PathMap/pathMap.fx

@@ -43 +43 @@
 
 float4          weightsa[8];
-int4            indicesa[8];
 
 struct vsInputWalk
@@ -71 +70 @@
         output.occProjPos = mul(output.worldPos, occWorldToProjMatrix); 
         
-        output.normal = mul(float4(input.normal.xyz, 0.0), inverseTransposedModelToWorldMatrix);
+        output.normal = mul(inverseTransposedModelToWorldMatrix, float4(input.normal.xyz, 0.0));
         output.tex = input.tex;
         
@@ -84 +83 @@
         
         float3 col = 0;
-        for(int iCluster=0; iCluster<8; iCluster++)
+        for(int iCluster=0; iCluster<32; iCluster++)
         {
-                int4 index = indicesa[iCluster];
-                float4 weight = weightsa[iCluster];
+                float4 weight = weightsa[iCluster/4];
                 float3 val = tex2D(filteredAtlasSampler, float2(
-                        input.tex.x / 32.0 + 1.0 / 32.0 * (index.x % 32) + 0.0 / 4096.0, 1.0 - input.tex.y + 0.0 / 128.0));
+                        input.tex.x / 32.0 + 1.0 / 32.0 * (iCluster % 32) + 0.0 / 4096.0, 1.0 - input.tex.y + 0.0 / 128.0));
                 col += val.xyz * weight.x;
+                iCluster++;
+                
                 val = tex2D(filteredAtlasSampler, float2(
-                        input.tex.x / 32.0 + 1.0 / 32.0 * (index.y % 32) + 0.0 / 4096.0, 1.0 - input.tex.y  + 0.0 / 128.0));
+                        input.tex.x / 32.0 + 1.0 / 32.0 * (iCluster % 32) + 0.0 / 4096.0, 1.0 - input.tex.y  + 0.0 / 128.0));
                 col += val.xyz * weight.y;
+                iCluster++;
+                
                 val = tex2D(filteredAtlasSampler, float2(
-                        input.tex.x / 32.0 + 1.0 / 32.0 * (index.z % 32) + 0.0 / 4096.0, 1.0 - input.tex.y  + 0.0 / 128.0));
+                        input.tex.x / 32.0 + 1.0 / 32.0 * (iCluster % 32) + 0.0 / 4096.0, 1.0 - input.tex.y  + 0.0 / 128.0));
                 col += val.xyz * weight.z;
+                iCluster++;
+                
                 val = tex2D(filteredAtlasSampler, float2(
-                        input.tex.x / 32.0 + 1.0 / 32.0 * (index.w % 32) + 0.0 / 4096.0, 1.0 - input.tex.y  + 0.0 / 128.0));
+                        input.tex.x / 32.0 + 1.0 / 32.0 * (iCluster % 32) + 0.0 / 4096.0, 1.0 - input.tex.y  + 0.0 / 128.0));
                 col += val.xyz * weight.w;
         }
 //      col *= 1000.01; 
-//      col *= 0.0001;
+//      col *= 0.8;
 //      col = 0;
 
@@ -133 +137 @@
 #include "depthMap.fx"
 #include "dots.fx"
+#include "torch.tx"