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

Timestamp:

09/24/08 11:08:13 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -37 +37 @@
                          float3 lightDir)
 {
-        /*
-        float4 lightDir2 = float4(-0.5f, 0.5f, 0.4f, 0.0f);
-        float3 light2 = normalize(lightDir2.xyz);
-        float diffuseLight2 = saturate(dot(normal, light2));
-        */
         // diffuse intensity
         const float angle = saturate(dot(normal, lightDir)); 
@@ -51 +46 @@
         const float4 ambient = glstate.light[0].ambient;
         
-        return (emmisive < 0.95) ? (ambient + diffuse) * color : color;
+        float4 outColor;
 
-        //return (saturate(((ambient + diffuse))) * (1.0f - emmisive) + emmisive) * color;
+        if (emmisive > 1.5) outColor = color;
+        //else if (emmisive > 0.95)     outColor = color * lightDiffuse;
+        else
+                outColor = (ambient + diffuse) * color;
+
+        return outColor;
         //return saturate((((ambient + diffuse)) * (1.0f - emmisive) + emmisive) * color);
 }
@@ -82 +82 @@
         
         OUT.color = col;
+        //OUT.color = float4(100.0, 1, 1, 0);
         OUT.color.w = color.w;
 
@@ -123 +124 @@
         }
 
-        total_d /= (float)NUM_SAMPLES;
+        total_d /= (float)NUM_PCF_TABS;
 
         return total_d;
@@ -182 +183 @@
         
         // base lighting
-        OUT.color = (emmisive < 0.95) ? (ambient + diffuse) * color : color;
+        OUT.color = (emmisive > 1.5f) ? color: (ambient + diffuse) * color;
 
         // also write out depth component