Changeset 3347 for GTP/trunk

Timestamp:

04/13/09 21:44:00 (16 years ago)

Author:

mattausch

Message:

1 rendertarget not working perfectly

Location:

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

Files:

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

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

@@ -432 +432 @@
         mDownSampleFbo->AddColorBuffer(ColorBufferObject::RGB_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_LINEAR);
 
+
         for (int i = 0; i < 2; ++ i)
         {
@@ -928 +929 @@
 
         // the neighbouring texels
-        float xOffs = 1.0f / fbo->GetWidth();
-        float yOffs = 1.0f / fbo->GetHeight();
+        const float xOffs = 1.0f / fbo->GetWidth();
+        const float yOffs = 1.0f / fbo->GetHeight();
 
         sCgAntiAliasingProgram->SetTexture(0, colorsTex);
@@ -1382 +1383 @@
         gluOrtho2D(0, 1, 0, 1);
 
-
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
         glLoadIdentity();
-
         
         glPushAttrib(GL_VIEWPORT_BIT);

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

@@ -8 +8 @@
 #define NUM_PRECOMPUTED_SAMPLES 4096
 
-#define NUM_SAMPLES 8
+//#define NUM_SAMPLES 8
 //#define NUM_SAMPLES 16
 //#define NUM_SAMPLES 24
-//#define NUM_SAMPLES 48
+#define NUM_SAMPLES 32
 
 //#define MIN_SAMPLES 48

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

@@ -250 +250 @@
 
         //OUT.illum_col.xyz = float3(ao.w * 5e-1f, 0, 0);
-        //OUT.illum_col.xyz = float3(ao.z * 1e-1f);
+        //OUT.illum_col.xyz = float3(ao.y * 1e-2f);
         //OUT.illum_col.xyz = float3(ao.y * 1e-1f);//, 0, 0);
         //OUT.illum_col.xyz = ao.xyz;

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

@@ -255 +255 @@
         const float4 oldPixel = tex2Dlod(oldTex, float4(oldTexCoords, .0f, .0f));
         //const float oldDiff = tex2Dlod(myTex, float4(oldTexCoords, .0f, .0f)).x;
-        const float oldDiff = tex2Dlod(myTex, float4(oldTexCoords, .0f, .0f)).z;
+        const float oldDiff = oldPixel.z;//tex2Dlod(myTex, float4(oldTexCoords, .0f, .0f)).z;
 
         // calculate eye space position of sample in old frame
@@ -306 +306 @@
                 isPixelValid = pixelIsValid;
         }
+        //isPixelValid = pixelIsValid;
         
         return float2(isPixelValid, abs(oldEyeSpaceDepth - projectedEyeSpaceDepth));

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

@@ -154 +154 @@
         else
         {       
-                w = .0f;
+                w   = .0f;
                 idx = .0f;
         }
 
-        return float3(ssao, w, idx);
+        return float3(ssao, idx, w);
 }
 
@@ -201 +201 @@
                         tex2Dlod(samples, float4((0.5f + i + idx) / NUM_PRECOMPUTED_SAMPLES, 0.5f, .0f, .0f)).xy;
 
+
                 ////////////////////
                 //-- add random noise: reflect around random normal vector 
@@ -207 +208 @@
                 if (convergence < SSAO_CONVERGENCE_THRESHOLD)
                 {
-                        float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, 0, 0)).xy;
+                        float2 mynoise = tex2Dlod(noiseTex, float4(IN.texCoord * 4.0f, .0f, .0f)).xy;
                         //offset = myreflect(samples[i], mynoise);
                         //offset = myrotate(samples[i], mynoise.x);
@@ -584 +585 @@
                 else if (ao.y > partlyResetThres)
                 {
+                        if (oldIdx > 4.0f * NUM_SAMPLES) oldIdx = 0;
                         //oldWeight = min(oldWeight, 4.0f * NUM_SAMPLES); oldIdx = oldWeight;
-                        //oldWeight = .0f; oldIdx = .0f;
+                        oldWeight = oldIdx;//.0f; oldIdx = .0f;
                 }
         }