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

Timestamp:

08/28/08 22:37:40 (16 years ago)

Author:

mattausch

Message:

downsampling not working yet

Location:

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

Files:

• globillum.cg (modified) (2 diffs)
• ssao.cg (modified) (2 diffs)

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

@@ -32 +32 @@
 {
         float4 ssao_col: COLOR0;
-        float4 combined_col: COLOR1;
-        float4 illum_col: COLOR2;
+        float4 illum_col: COLOR1;
 };
 
@@ -185 +184 @@
         }
 
-        OUT.combined_col = (currentCol + OUT.illum_col) * OUT.ssao_col.x;
-        //OUT.combined_col = float4(newDepth, oldDepth, 1, 1) ;
-
         OUT.ssao_col.w = currentDepth;
 
         return OUT;
 }
+
+
+pixel combine(fragment IN, 
+                          uniform sampler2D colors,
+                          uniform sampler2D ssaoTex,
+                          uniform sampler2D illumTex
+                   )
+{
+        pixel OUT;
+
+        float4 col = tex2D(colors, IN.texCoord.xy);
+        float ao = tex2D(ssaoTex, IN.texCoord.xy).x;
+        float4 illum = tex2D(illumTex, IN.texCoord.xy);
+        
+        OUT.illum_col = (col + illum) * ao;
+
+        return OUT;
+}

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

@@ -29 +29 @@
 {
         float4 illum_col: COLOR0;
-        float4 combined_col: COLOR1;
 };
 
@@ -173 +172 @@
         }
 
-        OUT.combined_col = currentCol * OUT.illum_col.x;
         OUT.illum_col.w = currentDepth;
 
         return OUT;
 }
+
+
+
+pixel combine(fragment IN, 
+                          uniform sampler2D colors,
+                          uniform sampler2D ssaoTex)
+{
+        pixel OUT;
+
+        float4 col = tex2D(colors, IN.texCoord.xy);
+        float4 ao = tex2D(ssaoTex, IN.texCoord.xy);
+
+        OUT.illum_col = col * ao.x;
+
+        return OUT;
+}