Changeset 2890 for GTP/trunk

Timestamp:

08/31/08 17:18:37 (16 years ago)

Author:

mattausch

Message:

view vector interpolation finally working

Location:

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

Files:

• Camera.cpp (modified) (1 diff)
• SsaoShader.cpp (modified) (2 diffs)
• shaders/ssao.cg (modified) (2 diffs)

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

@@ -186 +186 @@
         const Vector3 fc = mPosition + view * z_far; 
         
-        const Vector3 up = -GetUpVector();
-        const Vector3 right = -GetRightVector();
+        const Vector3 up = GetUpVector();
+        const Vector3 right = GetRightVector();
 
         Vector3 t1, t2;

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

@@ -551 +551 @@
         glTexCoord2f(0, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, bl.x, bl.y, bl.z); glVertex3f(-new_offs,  new_offs, -0.5f);
 */
-        glTexCoord2f(0, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tr.x, tr.y, tr.z); glVertex3f(-new_offs, -new_offs, -0.5f);
-        glTexCoord2f(1, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tl.x, tl.y, tl.z); glVertex3f( new_offs, -new_offs, -0.5f);
-        glTexCoord2f(1, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, bl.x, bl.y, bl.z); glVertex3f( new_offs,  new_offs, -0.5f);
-        glTexCoord2f(0, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, br.x, br.y, br.z); glVertex3f(-new_offs,  new_offs, -0.5f);
+        glTexCoord2f(0, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, bl.x, bl.y, bl.z); glVertex3f(-new_offs, -new_offs, -0.5f);
+        glTexCoord2f(1, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, br.x, br.y, br.z); glVertex3f( new_offs, -new_offs, -0.5f);
+        glTexCoord2f(1, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tr.x, tr.y, tr.z); glVertex3f( new_offs,  new_offs, -0.5f);
+        glTexCoord2f(0, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tl.x, tl.y, tl.z); glVertex3f(-new_offs,  new_offs, -0.5f);
 
         glEnd();
@@ -577 +577 @@
         mCamera->ComputePoints(ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr);
 
-#if 1
-        
         bl = Normalize(nbl - fbl);
         br = Normalize(nbr - fbr);
         tl = Normalize(ntl - ftl);
         tr = Normalize(ntr - ftr);
-
-#else // just take camera direction
-        
-        bl = -Normalize(mCamera->GetDirection());
-        br = -Normalize(mCamera->GetDirection());
-        tl = -Normalize(mCamera->GetDirection());
-        tr = -Normalize(mCamera->GetDirection());
-
-#endif
-
-        // pack into 0 .. 1
-        /*bl = bl * 0.5f + 0.5f;
-        br = br * 0.5f + 0.5f;
-        tl = tl * 0.5f + 0.5f;
-        tr = tr * 0.5f + 0.5f;*/
 }
 

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

@@ -94 +94 @@
         }
 
-        //return max(0.0f, 1.0f - total_ao);
-        return saturate(dot(currentViewDir, currentNormal));
+        return max(0.0f, 1.0f - total_ao);
+        //return saturate(dot(currentViewDir, currentNormal));
 }
 
@@ -125 +125 @@
         /// the current view direction
         //float3 viewDir = normalize(IN.view * 2.0f - float3(1.0f));
-        float3 viewDir = IN.view;
+        float3 viewDir = normalize(IN.view);
 
         // the current world position