Changeset 3092

Timestamp:

11/03/08 17:28:15 (16 years ago)

Author:

mattausch

Message:

error much better

Location:

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

Files:

• DeferredRenderer.cpp (modified) (2 diffs)
• shaderenv.h (modified) (1 diff)
• shaders/antialiasing.cg (modified) (1 diff)
• shaders/deferred.cg (modified) (3 diffs)
• shaders/mrt.cg (modified) (1 diff)
• shaders/ssao.cg (modified) (6 diffs)

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

@@ -269 +269 @@
         //-- the flip-flop fbos
 
-        mIllumFbo = new FrameBufferObject(w / 2, h / 2, FrameBufferObject::DEPTH_NONE);
+//      mIllumFbo = new FrameBufferObject(w / 2, h / 2, FrameBufferObject::DEPTH_NONE);
+        mIllumFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
         mFBOs.push_back(mIllumFbo);
 
@@ -278 +279 @@
         }
 
-        mDownSampleFbo = new FrameBufferObject(w / 2, h / 2, FrameBufferObject::DEPTH_NONE);
+        //mDownSampleFbo = new FrameBufferObject(w / 2, h / 2, FrameBufferObject::DEPTH_NONE);
+        mDownSampleFbo = new FrameBufferObject(w, h, FrameBufferObject::DEPTH_NONE);
         mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGBA_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
         // downsample buffer for the normal texture

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

@@ -42 +42 @@
 #define MAX_LOD_LEVEL 10
 
-#define MIN_DEPTH_DIFF 1e-2f
-#define PRECISION_SCALE 1e-2f
+#define MIN_DEPTH_DIFF 1e-3f
+#define PRECISION_SCALE 1e-1f
 
 // burnout

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

@@ -26 +26 @@
                         ): COLOR
 {
-        //return tex2D(colors, IN.c.xy);
+        return tex2D(colors, IN.c.xy);
 
         // normal discontinuity filter

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

@@ -145 +145 @@
                                   uniform float4x4 shadowMatrix,
                                   uniform float sampleWidth,
-                                  uniform sampler2D noise,
+                                  uniform sampler2D noiseTex,
                                   uniform float2 samples[NUM_PCF_TABS],
                                   uniform float weights[NUM_PCF_TABS],
@@ -189 +189 @@
                 lightSpacePos /= lightSpacePos.w;
 
-                float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, weights, noise);
-                //float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, noise);
+                float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, weights, noiseTex);
+                //float shadowTerm = CalcShadowTerm(IN, shadowMap, sampleWidth, lightSpacePos.xy, lightSpacePos.z, samples, noiseTex);
 
                 diffuse *= shadowTerm;
@@ -235 +235 @@
         const float currentDepth = currentPos.z * precisionScale;
 
-        const float2 ao = ssao(IN, colors, noise, samples, normal, eyeSpacePos, w, bl, br, tl, tr, normalize(viewDir));
+        const float2 ao = ssao(IN, colors, noise, samples, normal, 
+                                   eyeSpacePos, w, bl, br, tl, tr, normalize(viewDir));
 
 

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

@@ -42 +42 @@
 
 
-//#pragma position_invariant vtx
+#pragma position_invariant vtx
 
 vtxout vtx(vtxin IN)

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

@@ -60 +60 @@
         return samplePos;
 }
-
-#pragma position_invariant temporalSmoothing
 
 
@@ -137 +135 @@
                                                  uniform float3 oldbr,
                                                  uniform float3 oldtl,
-                                                 uniform float3 oldtr,
-                                                 const uniform float4x4 inverseModelTrafo,
-                                                 float id
+                                                 uniform float3 oldtr
+                                                 //,const uniform float4x4 inverseModelTrafo
+                                                 //, float id
                                                  )
 {
@@ -147 +145 @@
         //-- compute reprojection for temporal smoothing
 
-        float4x4 trafo;
-
+        //float4x4 trafo;
         // dynamic object
-        if (id > 20)
-                trafo = oldModelViewProj;
-        else
-                trafo = inverseModelTrafo * oldModelViewProj;
+        //if (id > 20) trafo = oldModelViewProj;
+        //else trafo = inverseModelTrafo * oldModelViewProj;
 
         // reproject into old frame and calculate projected depth
@@ -174 +169 @@
 
         const float depthDif = length(oldSamplePos - worldPos.xyz);
-        
+        //const float dummy5 = abs(oldEyeSpaceDepth - eyeSpaceDepth);
+        const float dummy5 = length(oldTexCoords - texcoord0) * 1e5f;
+        //const float dummy5 = depthDif;
+
         float notValid = 0.5f;
 
@@ -225 +223 @@
         illum_col.y = newWeight;
         illum_col.w = eyeSpaceDepth;
-        
+        illum_col.y = dummy5;
+
         return illum_col;
 }
@@ -394 +393 @@
 
         float4 col = tex2Dlod(colors, float4(IN.texCoord, 0, 0));
-        float3 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
-
-        if (ao.y < 10.0f) ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
-
-        OUT.illum_col = col * ao.x;
-        //OUT.illum_col = float4(ao.x, ao.x, ao.x, col.w);
+        float4 ao = tex2Dlod(ssaoTex, float4(IN.texCoord, 0, 0));
+
+        //if (ao.y < 10.0f) ao.x = Filter(IN.texCoord, ssaoTex, filterOffs, filterWeights);
+
+        //OUT.illum_col = col * ao.x;
+        OUT.illum_col = float4(ao.y, ao.y, ao.y, col.w);
         //OUT.illum_col.xyz = float3(1.0f - ao.x, 1.0f - ao.y * 1e-2f, 1);
         //OUT.illum_col.xyz = float3(1.0f - ao.x, ao.y, 0);