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

Timestamp:

07/07/08 15:11:03 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

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

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

@@ -152 +152 @@
   float diffuse = diffuseLight + diffuseLight2;
 
-  float ao = ssao(IN, positions, normals, noiseTexture);
+  //float ao = ssao(IN, positions, normals, noiseTexture);
+  float ao = 1.0f;
   //OUT.color = ao; 
   OUT.color = ao * (ambient + diffuse) * color;

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

@@ -63 +63 @@
 }
 
+/*struct Material
+{
+  float4 diffuse;
+}*/
 
-pixel frag(fragin IN, uniform sampler2D tex, uniform float maxDepth)
+
+pixel fragtex(fragin IN, uniform sampler2D tex, uniform float maxDepth, uniform float4 diffuse)
 {
   pixel pix;
       
-  pix.col = tex2D(tex, IN.texCoord.xy);
+  pix.col = diffuse * tex2D(tex, IN.texCoord.xy);
   pix.pos = IN.worldPos * maxDepth;
   pix.norm = IN.normal;
@@ -75 +80 @@
   return pix;
 }
+
+
+pixel frag(fragin IN, uniform float maxDepth, uniform float4 diffuse)
+{
+  pixel pix;
+      
+  pix.col = diffuse;
+  pix.pos = IN.worldPos * maxDepth;
+  pix.norm = IN.normal;
+  pix.pos.w = IN.projPos.w;
+
+  return pix;
+}