Changeset 3018 for GTP/trunk

Timestamp:

10/09/08 11:48:06 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• DeferredRenderer.cpp (modified) (1 diff)
• chcdemo.cpp (modified) (4 diffs)
• shaders/deferred.cg (modified) (3 diffs)
• shaders/mrt.cg (modified) (5 diffs)

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

@@ -898 +898 @@
         cgGLSetParameter3f(sLightDirParam, lightDir.x, lightDir.y, lightDir.z);
 
-
-        glColor3f(1.0f, 1.0f, 1.0f);
-
+        Vector3 tl, tr, bl, br;
+        ComputeViewVectors(tl, tr, bl, br);
+        
+        // note: slightly larger texture could hide ambient occlusion error on border but costs resolution
         const float offs = 0.5f;
-
+        
         glBegin(GL_QUADS);
 
-        glTexCoord2f(0, 0); glVertex3f(-offs, -offs, -0.5f);
-        glTexCoord2f(1, 0); glVertex3f( offs, -offs, -0.5f);
-        glTexCoord2f(1, 1); glVertex3f( offs,  offs, -0.5f);
-        glTexCoord2f(0, 1); glVertex3f(-offs,  offs, -0.5f);
+        glTexCoord2f(0, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, bl.x, bl.y, bl.z); glVertex3f(-offs, -offs, -0.5f);
+        glTexCoord2f(1, 0); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, br.x, br.y, br.z); glVertex3f( offs, -offs, -0.5f);
+        glTexCoord2f(1, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tr.x, tr.y, tr.z); glVertex3f( offs,  offs, -0.5f);
+        glTexCoord2f(0, 1); glMultiTexCoord3fARB(GL_TEXTURE1_ARB, tl.x, tl.y, tl.z); glVertex3f(-offs,  offs, -0.5f);
 
         glEnd();

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

@@ -273 +273 @@
 static CGparameter sEyePosParam;
 
-static CGparameter sTLParam;
-static CGparameter sTRParam;
-static CGparameter sBRParam;
-static CGparameter sBLParam;
-
-static CGparameter sTLParamTex;
-static CGparameter sTRParamTex;
-static CGparameter sBRParamTex;
-static CGparameter sBLParamTex;
-
 static Matrix4x4 viewProjMat = IdentityMatrix();
 static Matrix4x4 oldViewProjMat = IdentityMatrix();
@@ -566 +556 @@
                 sEyePosParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "eyePos");
                 RenderState::sTexParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tex");
-        
-                sTLParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tl"); 
-                sTRParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tr"); 
-                sBRParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "br"); 
-                sBLParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "bl"); 
         }
         else
@@ -588 +573 @@
 
                 sEyePosParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "eyePos");
-                
-                sTLParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "tl"); 
-                sTRParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "tr"); 
-                sBRParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "br"); 
-                sBLParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "bl"); 
         }
         else
@@ -939 +919 @@
         cgGLSetParameter3f(sEyePosParamTex, pos.x, pos.y, pos.z);
 
-        Vector3 tl, tr, bl, br;
-        ComputeViewVectors(tl, tr, bl, br);
-
-        cgGLSetParameter3f(sBLParam, bl.x, bl.y, bl.z);
-        cgGLSetParameter3f(sBRParam, br.x, br.y, br.z);
-        cgGLSetParameter3f(sTLParam, tl.x, tl.y, tl.z);
-        cgGLSetParameter3f(sTRParam, tr.x, tr.y, tr.z);
-
-        //cout<<bl << " " << br << endl;
-        cgGLSetParameter3f(sBLParamTex, bl.x, bl.y, bl.z);
-        cgGLSetParameter3f(sBRParamTex, br.x, br.y, br.z);
-        cgGLSetParameter3f(sTLParamTex, tl.x, tl.y, tl.z);
-        cgGLSetParameter3f(sTRParamTex, tr.x, tr.y, tr.z);
-
 
         // draw to 3 color buffers

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

@@ -78 +78 @@
         
         OUT.color = col;
-        OUT.color.w = color.w;
+
+        // store scaled view vector from now on so wie don't have to normalize for e.g., ssao
+        float3 viewDir = IN.view;
+        const float lenView = length(viewDir);
+
+        OUT.color.w = color.w / lenView;
 
         return OUT;
@@ -160 +165 @@
         /// reconstruct position from the eye space depth
         float3 viewDir = IN.view;
+        const float lenView = length(viewDir);
+        viewDir /= lenView;
+
         const float eyeDepth = tex2Dlod(colors, float4(IN.texCoord, 0, 0)).w;
 
@@ -195 +203 @@
         OUT.color = useShading ? (ambient + diffuse) * color : color;
 
-        OUT.color.w = color.w;
+        // store scaled view vector from now on so wie don't have to normalize for e.g., ssao
+        OUT.color.w = color.w / lenView;
 
         return OUT;

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

@@ -17 +17 @@
   float4 worldPos: TEXCOORD1; // world position
   float3 normal: TEXCOORD2;
-  float4 projPos: TEXCOORD3;
 };
 
@@ -31 +30 @@
         float4 worldPos: TEXCOORD1; // world position
         float3 normal: TEXCOORD2;
-        float4 projPos: TEXCOORD3;
 };
 
@@ -59 +57 @@
 
         OUT.normal = IN.normal;
-        OUT.projPos = OUT.position;
 
         return OUT;
@@ -104 +101 @@
 
         // compute eye linear depth
-        const float4 projPos = IN.projPos / IN.projPos.w;
-        
-        float2 screenCoord = projPos.xy * 0.5f + 0.5f;
-        
-        const float3 viewVec = Interpol(screenCoord, bl, br, tl, tr);
-        const float invMagView = 1.0f / length(viewVec);
-        // note: has to done in this order, otherwise strange precision problems!
-        pix.col.w = invMagView * length(eyePos - IN.worldPos.xyz);
+        pix.col.w = length(eyePos - IN.worldPos.xyz);
 
         return pix;
@@ -133 +123 @@
         // hack: squeeze some information about the ambient term into the target
         //pix.col.w = glstate.material.emission.x;
-        
-        // compute eye linear depth and scale with lenght to avoid sqr root in pixel shader
-        const float4 projPos = IN.projPos / IN.projPos.w;
-        
-        float2 screenCoord = projPos.xy * 0.5f + 0.5f;
-        const float magView = length(Interpol(screenCoord, bl, br, tl, tr));
-        pix.col.w = length(eyePos - IN.worldPos.xyz) / magView;
+        pix.col.w = length(eyePos - IN.worldPos.xyz);
 
         return pix;