Changeset 2863 for GTP/trunk

Timestamp:

08/24/08 12:48:59 (16 years ago)

Author:

mattausch

Message:

repaired view vector correction for ssao

Location:

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

Files:

• SsaoShader.cpp (modified) (3 diffs)
• SsaoShader.h (modified) (1 diff)
• shaders/deferred.cg (modified) (7 diffs)

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

@@ -149 +149 @@
         swap(mNewFbo, mOldFbo); 
 
-        FirstPass(fbo, expFactor);
+        ComputeSsao(fbo, expFactor);
         // the second pass just renders the combined solution
-        SecondPass(fbo);
-}
-
-
-void SsaoShader::FirstPass(FrameBufferObject *fbo, float expFactor)
+        DisplayTexture();
+}
+
+
+void SsaoShader::ComputeSsao(FrameBufferObject *fbo, float expFactor)
 {
         GLuint colorsTex = fbo->GetColorBuffer(0)->GetTexture();
@@ -259 +259 @@
 
 
-void SsaoShader::SecondPass(FrameBufferObject *fbo)
+void SsaoShader::DisplayTexture()
 {
         glEnable(GL_TEXTURE_2D);
@@ -309 +309 @@
         mCamera->ComputePoints(ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr);
 
-#if 0 // matT: debug this!!
-        
-        bl = Normalize(nbl - fbl);
-        br = Normalize(nbr - fbr);
-        tl = Normalize(ftl - ntl);
-        tr = Normalize(ftr - ntr);
+#if 1 // matT: debug this!!
+        
+        bl = -Normalize(nbl - fbl);
+        br = -Normalize(nbr - fbr);
+        tl = -Normalize(ntl - ftl);
+        tr = -Normalize(ntr - ftr);
 
 #else // just take camera direction

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

@@ -48 +48 @@
 protected:
 
-        void FirstPass(FrameBufferObject *fbo, float expFactor);
+        void ComputeSsao(FrameBufferObject *fbo, float expFactor);
 
-        void SecondPass(FrameBufferObject *fbo);
+        void DisplayTexture();
 
         void CreateNoiseTex2D();

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

@@ -7 +7 @@
 
 // rule of thumb: approx 1 / NUM_SAMPLES
-#define SAMPLE_INTENSITY 0.2
-//#define SAMPLE_INTENSITY 0.125f
+//#define SAMPLE_INTENSITY 0.2
+#define SAMPLE_INTENSITY 0.125f
 
 #define AREA_SIZE 9e-1f
-#define VIEW_CORRECTION_SCALE 0.3f
+//#define VIEW_CORRECTION_SCALE 0.3f
+#define VIEW_CORRECTION_SCALE 1.0f
 #define DISTANCE_SCALE 1e-6f
 
@@ -51 +52 @@
 
 
+/** The ssao shader returning the an intensity value between 0 and 1
+*/
 float ssao(fragment IN,
                    uniform sampler2D positions,
@@ -101 +104 @@
                         (SAMPLE_INTENSITY * DISTANCE_SCALE) / (DISTANCE_SCALE + length_to_sample * length_to_sample);
 
-                // if normal perpenticular to view dir, only half of the samples count
+                // if surface normal perpenticular to view dir, the samples count less => compensate for this
                 float view_correction = 1.0f + VIEW_CORRECTION_SCALE * (1.0f - dot(currentViewDir, currentNormal));
 
@@ -108 +111 @@
 
         return (1.0f - total_ao);
+        //return float4(dot(currentViewDir, currentNormal));
 }
 
@@ -226 +230 @@
         // expand normal
         normal = normalize(normal * 2.0f - 1.0f);
+        /// the current view direction
         float3 viewDir = normalize(IN.view * 2.0f - float3(1.0f));
 
@@ -235 +240 @@
         float ao = ssao(IN, positions, noiseTexture, samples, normal.xyz, viewDir, noiseMultiplier, centerPosition);
         float4 attenuated_color = ao * col;
+        //float4 attenuated_color = ao;
 
         //float4 new_col = globIllum(IN, colors, positions, noiseTexture, samples, normal.xyz, viewDir, noiseMultiplier, centerPosition); 
-        //float ao = new_col.w;
         //float4 attenuated_color = ao * col + new_col;
         
@@ -266 +271 @@
         }
 
+        //OUT.color.xyz = viewDir;
+        //OUT.color = attenuated_color;
+        
         OUT.color.w = tex2D(colors, IN.texCoord.xy).w;