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

Timestamp:

08/27/08 16:14:10 (16 years ago)

Author:

mattausch

Message:

implemented glob-illum solution

Location:

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

Files:

• deferred.cg (modified) (1 diff)
• ssao.cg (modified) (2 diffs)

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

@@ -63 +63 @@
         float3 normal = normalize(norm.xyz);// * 2.0f - float4(1.0f));
 
-        float4 col = shade(IN, color, position, normal.xyz, amb);
+        float4 col = shade(IN, color, position, normal, amb);
         
         //OUT.color = float4(1.0f);
         OUT.color = col;
+        OUT.color.w = color.w;
 
         return OUT;

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

@@ -151 +151 @@
         realPos.w = 1.0f;
 
+        // reproject
         float4 oldPos = mul(oldModelViewProj, realPos);
 
@@ -176 +177 @@
         OUT.illum_col.w = currentDepth;
 
-        
+        //OUT.combined_col = float4(newDepth / oldDepth * 100, 0, 0, 1) ;
+        //OUT.combined_col = float4(newDepth, 0, 0, 1) ;
 
         return OUT;