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

Timestamp:

09/25/08 11:05:46 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• antialiasing.cg (modified) (2 diffs)
• tonemap.cg (modified) (4 diffs)

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

@@ -21 +21 @@
 
 
-float3 ToneMap(float imageKey, float whiteLum, float middleGrey, 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 = middleGrey * pixLum / imageKey;
-         
-        // map to range and calc burnout
-        const float burnedLum = lum * (1.0f + lum / whiteLum * whiteLum) / (1.0f + lum);
-        
-        outCol = color * burnedLum / pixLum;
-
-        /*
-        outCol = color;
-
-        outCol.rgb *= MIDDLE_GRAY /(MIDDLE_GRAY + 0.001f);
-    outCol.rgb *= (1.0f + color.rgb / whiteLum);
-        outCol.rgb /= (1.0f + color.rgb);
-*/
-        //vColor.rgb += 0.6f * vBloom;
-        
-        return outCol;
-}
-
-
 float4 main(v2p IN, 
                         uniform sampler2D colors,
-                        uniform sampler2D normals,
-                        uniform float imageKey,
-                        uniform float whiteLum,
-                        uniform float middleGrey
+                        uniform sampler2D normals
                         ): COLOR
 {
@@ -121 +92 @@
         //return (s0 + s1 + s2 + s3) * 0.25f;
 
-        //return float4(w);
-        col.xyz = ToneMap(imageKey, whiteLum, middleGrey, col.xyz);
-
         return col;
 }

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

@@ -7 +7 @@
         float4 pos: WPOS;
         float4 texCoord: TEXCOORD0; 
+
+        float2 lt: TEXCOORD1; // left top
+        float2 rb: TEXCOORD2; // right bottom
+        float2 rt: TEXCOORD3; // right top
+        float2 lb: TEXCOORD4; // left bottom
 };
 
 
-
-float3 ToneMap(float imageKey, float whiteLum, float middleGrey, float3 color)
+struct pixel
 {
-        float3 outCol;
-        const float pixLum = 0.2125f * color.x + 0.7154f * color.y + 0.0721f * color.z;
-        
-        // adjust to middle gray
-        const float lum = middleGrey * pixLum / imageKey;
-         
-        // map to range and calc burnout
-        const float burnedLum = lum * (1.0f + lum / whiteLum * whiteLum) / (1.0f + lum);
-        
-        outCol = color * burnedLum / pixLum;
-
-        return outCol;
-}
-
+        float4 col: COLOR0;
+};
 
 
@@ -37 +29 @@
     for(int i = 0; i < 16; ++ i)
     {
-        average += tex2D(colors, IN.texCoord + float2(downSampleOffs[i].x, downSampleOffs[i].y) );
+        average += tex2D(colors, IN.texCoord.xy + downSampleOffs[i]);
     }
         
@@ -47 +39 @@
 
 float4 GreyScaleDownSample(fragment IN,
-                                                   uniform sampler2D colors,
-                                                   float2 offs[16]): COLOR
+                                                   uniform sampler2D colors): COLOR
 {
 
@@ -55 +46 @@
         float maximum = -1e20;
 
-        float4 color = 0.0f;
-        
         // the rgb weights
         const float3 w = float3(0.299f, 0.587f, 0.114f);
         //float3 w = float3(0.2125f, 0.7154f, 0.0721f);
 
+        float4 cols[4];
+
+        cols[0] = tex2D(colors, IN.texCoord.xy + IN.lt.xy);
+        cols[1] = tex2D(colors, IN.texCoord.xy + IN.lb.xy);
+        cols[2] = tex2D(colors, IN.texCoord.xy + IN.rt.xy);
+        cols[3] = tex2D(colors, IN.texCoord.xy + IN.rb.xy);
+
+
         for (int i = 0; i < 4; ++ i)
         {
-                color = tex2D(colors, IN.texcoord + float2(offs[i].x, offs[i].y));
+                const float intensity = dot(cols[i].rgb, w);
 
-                const float intensity = dot(color.rgb, W);
-
-                maximum = max(maximum, intentsity);
-                average += (0.25f * log(1e-5f + GreyValue));
+                maximum = max(maximum, intensity);
+                average += (0.25f * log(1e-5f + intensity));
         }
 
         average = exp(average);
 
+        return tex2D(colors, IN.texCoord.xy);
+
         // Output the luminance to the render target
         return float4(average, maximum, 0.0f, 1.0f);
 }
+    
 
-    
-    
+pixel ToneMap(fragment IN,
+                          uniform sampler2D colors,
+                          uniform float imageKey, 
+                          uniform float whiteLum, 
+                          uniform float middleGrey)
+{
+        pixel OUT;
+        float4 color = tex2D(colors, IN.texCoord.xy);
+
+        const float pixLum = 0.2125f * color.x + 0.7154f * color.y + 0.0721f * color.z;
+        
+        // adjust to middle gray
+        const float lum = middleGrey * pixLum / imageKey;
+         
+        // map to range and calc burnout
+        const float scaleLum = lum * (1.0f + lum / whiteLum * whiteLum) / (1.0f + lum);
+
+        OUT.col = color * scaleLum / pixLum;
+        OUT.col.w = color.w;
+
+        return OUT;
+}