Changeset 2978

Timestamp:

09/26/08 22:36:20 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (5 diffs)
• chcdemo.cpp (modified) (3 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/deferred.cg (modified) (4 diffs)
• shaders/ssao.cg (modified) (2 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/DeferredRenderer.cpp

@@ -29 +29 @@
 static CGparameter sColorsTexDeferredParam;
 static CGparameter sOldColorsTexDeferredParam;
+static CGparameter sOldColorsTexShadowParam;
 
 static CGparameter sPositionsTexDeferredParam;
@@ -468 +469 @@
                 sLightDirShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "lightDir");
 
+                sOldColorsTexShadowParam = cgGetNamedParameter(sCgDeferredShadowProgram, "oldColors");
+
 
                 PoissonDiscSampleGenerator2 poisson(NUM_PCF_TABS, 1.0f);
@@ -1056 +1059 @@
         GLuint shadowTex = shadowMap->GetDepthTexture();
 
+        GLuint oldColorsTex = fbo->GetColorBuffer(3 - colorBufferIdx)->GetTexture();
+
         Matrix4x4 shadowMatrix;
         shadowMap->GetTextureMatrix(shadowMatrix);
@@ -1078 +1083 @@
         cgGLSetTextureParameter(sShadowMapParam, shadowTex);
         cgGLEnableTextureParameter(sShadowMapParam);
+
+        cgGLSetTextureParameter(sOldColorsTexShadowParam, oldColorsTex);
+        cgGLEnableTextureParameter(sOldColorsTexShadowParam);
 
         cgGLSetParameter1f(sMaxDepthShadowParam, mScaleFactor);
@@ -1111 +1119 @@
         cgGLDisableTextureParameter(sNormalsTexShadowParam);
         cgGLDisableTextureParameter(sShadowMapParam);
+
+        cgGLDisableTextureParameter(sOldColorsTexShadowParam);
 
         cgGLDisableTextureParameter(sNoiseTexShadowParam);

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

@@ -924 +924 @@
         cgGLEnableProfile(RenderState::sCgFragmentProfile);
         cgGLBindProgram(RenderState::sCgMrtFragmentProgram);
+
+        // draw to 3 color buffers
+        // a color, normal, and positions buffer
+        if (sCurrentMrtSet == 0)
+        {
+                DeferredRenderer::colorBufferIdx = 0;
+                glDrawBuffers(3, mrt);
+        }
+        else 
+        {
+                DeferredRenderer::colorBufferIdx = 3;
+                glDrawBuffers(3, mrt2);
+        }
+        sCurrentMrtSet = 1 - sCurrentMrtSet;
 }
 
@@ -1051 +1065 @@
                 InitDeferredRendering();
                 
-                // draw to 3 color buffers
-                // a color, normal, and positions buffer
-                if (sCurrentMrtSet == 0)
-                {
-                        DeferredRenderer::colorBufferIdx = 0;
-                        glDrawBuffers(3, mrt);
-                }
-                else 
-                {
-                        DeferredRenderer::colorBufferIdx = 3;
-                        glDrawBuffers(3, mrt2);
-                }
-                sCurrentMrtSet = 1 - sCurrentMrtSet;
-
                 glEnableClientState(GL_NORMAL_ARRAY);
 
@@ -2024 +2024 @@
                 InitDeferredRendering();
 
-                // draw to 3 color buffers
-                glDrawBuffers(3, mrt);
                 glClear(GL_COLOR_BUFFER_BIT);
         }

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/shaderenv.h

@@ -47 +47 @@
 #define LOGLUM_RANGE 20.0f
 
+#define MAX_LOD_LEVEL 99
+
 #endif // __SHADERENV_H

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

@@ -87 +87 @@
         //-- write out logaritmic luminance for tone mapping
 
-        float4 oldColor = tex2Dlod(colors, float4(IN.texCoord.xy, 0, 99));
+        float4 oldColor = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL));
 
         const float3 w = float3(0.299f, 0.587f, 0.114f);
@@ -157 +157 @@
                                   uniform sampler2D noiseTexture,
                                   uniform float2 samples[NUM_PCF_TABS],
-                                  uniform float3 lightDir
+                                  uniform float3 lightDir,
+                                  uniform sampler2D oldColors
                                   )
 {
@@ -201 +202 @@
         OUT.color = (emmisive > 1.5f) ? color: (ambient + diffuse) * color;
 
+
         ////////////
         //-- write out logaritmic luminance for tone mapping
 
+        float4 oldColor = tex2Dlod(colors, float4(IN.texCoord.xy, 0, MAX_LOD_LEVEL));
+
         const float3 w = float3(0.299f, 0.587f, 0.114f);
 
@@ -212 +216 @@
         float logLumScaled = logLum * INV_LOGLUM_RANGE - logLumOffset;
 
-        OUT.color.w = logLumScaled;
+        if (oldColor.w > 0)
+                OUT.color.w = lerp(oldColor.w, logLumScaled, 0.2f);
+        else
+                OUT.color.w = logLumScaled;
         
         return OUT;

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

@@ -52 +52 @@
         float numSamples = 0;
 
+        // avoid singularity of 
+        centerPosition.xyz += currentNormal * 1e-4f;
+
         for (int i = 0; i < NUM_SAMPLES; ++ i) 
         {
@@ -82 +85 @@
                 const float cos_angle = max(dot(direction_to_sample, currentNormal), 0.0f);
 
-                // distance between current position and sample position controls AO intensity.
                 const float distance_intensity = 
                         (SAMPLE_INTENSITY * DISTANCE_SCALE) / (DISTANCE_SCALE + length_to_sample * length_to_sample);