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

Timestamp:

09/23/08 18:02:33 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• antialiasing.cg (modified) (3 diffs)
• deferred.cg (modified) (5 diffs)
• sky_preetham.cg (modified) (1 diff)

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

@@ +1 @@
+#include "../shaderenv.h"
+
 struct v2p
 {
@@ -18 +20 @@
 
 
+
+float3 ToneMap(const float imageKey, float3 color)
+{
+        float3 outCol;
+        const float pixLum = 0.2125f * color.x + 0.7154f * color.y + 0.0721f * color.z;
+        
+        // adjust to middle gray
+        const float lum = MIDDLE_GRAY * pixLum / imageKey;
+         
+    // map to range
+        const float scaledLum = lum / (1.0f + lum);
+
+    /*outCol *= MIDDLE_GRAY / (vLum + 1e-3f);
+    outCol *= (1.0f + vColor / LUM_WHITE);
+        outCol /= (1.0f + vColor);*/
+        
+        outCol = color * scaledLum;
+        //vColor.rgb += 0.6f * vBloom;
+        
+        return outCol;
+}
+
 float4 main(v2p IN, 
                         uniform sampler2D colors,
-                        uniform sampler2D normals
+                        uniform sampler2D normals,
+                        uniform float imageKey
                         ): COLOR
 {
@@ -86 +111 @@
         float4 sc = tex2Dlod(colors, float4(IN.c.xy, 0, 0));
 
-        return (s0 + s1 + s2 + s3 + sc) * 0.2f;
+        float4 col = (s0 + s1 + s2 + s3 + sc) * 0.2f;
         //return (s0 + s1 + s2 + s3) * 0.25f;
+
         //return float4(w);
+        col.xyz = ToneMap(imageKey, col.xyz);
+
+        return col;
 }

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

@@ -15 +15 @@
         float4 color: COLOR0;
 };
-
-
-
-float3 ToneMap(const float imageKey, float3 color)
-{
-        float3 outCol;
-        const float pixLum = 0.2125f * color.x + 0.7154f * color.y + 0.0721f * color.z;
-        
-        // adjust to middle gray
-        const float lum = MIDDLE_GRAY * pixLum / imageKey;
-         
-    // map to range
-        const float scaledLum = lum / (1.0f + lum);
-
-    /*outCol *= MIDDLE_GRAY / (vLum + 1e-3f);
-    outCol *= (1.0f + vColor / LUM_WHITE);
-        outCol /= (1.0f + vColor);*/
-        
-        outCol = color / scaledLum;
-        //vColor.rgb += 0.6f * vBloom;
-        
-        return outCol;
-}
 
 
@@ -74 +51 @@
         const float4 ambient = glstate.light[0].ambient;
         
+        return (emmisive < 0.95) ? (ambient + diffuse) * color : color;
+
         //return (saturate(((ambient + diffuse))) * (1.0f - emmisive) + emmisive) * color;
-        return saturate((((ambient + diffuse)) * (1.0f - emmisive) + emmisive) * color);
+        //return saturate((((ambient + diffuse)) * (1.0f - emmisive) + emmisive) * color);
 }
 
@@ -86 +65 @@
                    uniform sampler2D positions,
                    uniform sampler2D normals,
-                   uniform float3 lightDir,
-                   uniform float imageKey
+                   uniform float3 lightDir
                    )
 {
@@ -161 +139 @@
                                   uniform sampler2D noiseTexture,
                                   uniform float2 samples[NUM_PCF_TABS],
-                                  uniform float3 lightDir,
-                                  uniform float imageKey
+                                  uniform float3 lightDir
                                   )
 {
@@ -207 +184 @@
         OUT.color = (emmisive < 0.95) ? (ambient + diffuse) * color : color;
 
-        OUT.color.xyz = ToneMap(imageKey, OUT.color.xyz);
-
         // also write out depth component
         OUT.color.w = color.w;

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

@@ -92 +92 @@
         OUT.color = float4(hcol, 1.0);
 
-        OUT.color.rgb *= 5e-5f; 
+        //OUT.color.rgb *= 1e-2f; 
+        //OUT.color.rgb *= 2e-5f; 
 
         //OUT.worldPos = mul(glstate.matrix.inverse.projection, OUT.position);