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

Timestamp:

04/14/09 11:59:23 (15 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaders/deferred.cg (modified) (4 diffs)

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

@@ -25 +25 @@
                          uniform float3 normal,
                          float3 lightDir,
-                         float4 ao)
+                         float4 ao,
+                         float useAO)
 {
         // diffuse intensity
@@ -45 +46 @@
         else 
         {
-                outColor = (ambient * ao + diffuse) * color;
-                //outColor = ambient + diffuse * color;
+                if (useAO > 0.5f)
+                        outColor = (ambient * ao + diffuse) * color;
+                else
+                        outColor = (ambient + diffuse) * color;
         }
 
@@ -60 +63 @@
                    uniform sampler2D normals,
                    uniform float3 lightDir,
-                   uniform sampler2D aoTex
+                   uniform sampler2D aoTex,
+                   uniform float useAO
                    )
 {
@@ -70 +74 @@
         
         float3 normal = normalize(norm.xyz);
-        float4 col = shade(IN, color, normal, lightDir, ao);
+        float4 col = shade(IN, color, normal, lightDir, ao, useAO);
         
         OUT.color = col;