Changeset 3149

Timestamp:

11/20/08 13:14:40 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• combineSsao.cg (modified) (1 diff)
• tonemap.cg (modified) (2 diffs)

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

@@ -90 +90 @@
                           uniform sampler2D offsetTex,
                           uniform float2 filterOffs[NUM_SSAO_FILTERSAMPLES],
-                          uniform float filterWeights[NUM_SSAO_FILTERSAMPLES],
+                          uniform float filterWeights[NUM_SSAO_FILTERSAMPLES]
                           )
 {

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

@@ -33 +33 @@
         float maximum = .0f;
 
-        // the rgb weights
+        // the rgb-to-luminance weightings
         const float3 w = float3(0.299f, 0.587f, 0.114f);
         //const float3 w = float3(0.2125f, 0.7154f, 0.0721f);
@@ -135 +135 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
+
+        /////////////
+        //-- exponential smoothing of the tone mapping over time
+
         const float expFactor = 1e-2f;
-        // exponential smoothing of tone mapping over time
+        
         if (oldLogLum > 1e-3f) // check if loglum from last frame too small (=> tm too bright)
                 OUT.col.w = lerp(oldLogLum, logLumScaled, expFactor);