Changeset 3003 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Timestamp:

10/03/08 18:42:33 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders

Files:

• globillum.cg (modified) (3 diffs)
• tonemap.cg (modified) (1 diff)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/globillum.cg

@@ -175 +175 @@
         float w = norm.w;
         // the current world position
-        const float4 centerPosition = tex2D(positions, IN.texCoord.xy);
+        const float4 centerPosition2 = tex2D(positions, IN.texCoord.xy);
 
         /// reconstruct position from the eye space depth
-        /*float3 viewDir = normalize(IN.view);
+        float3 viewDir = normalize(IN.view);
         const float eyeDepth = tex2D(colors, IN.texCoord.xy).w;
         
@@ -185 +185 @@
 
         centerPosition.w = centerPosition2.w;
-*/
+
         // the current color
         const float4 currentCol = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 0));
@@ -191 +191 @@
         const float currentDepth = centerPosition.w;
 
-        GiStruct gi = globIllum(IN, colors, noiseTexture, samples, normal, centerPosition, w, eyePos, bl, br, tl, tr);
+        GiStruct gi = globIllum(IN, colors, noiseTexture, samples, normal, centerPosition2, w, eyePos, bl, br, tl, tr);
         
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/tonemap.cg

@@ -33 +33 @@
     average *= 1.0f / 4.0f;
 
-    return average;
+    return tex2D(colors, IN.texCoord);//average;
 }