Changeset 2999 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp

Timestamp:

10/03/08 14:35:07 (16 years ago)

Author:

mattausch

Message:

trying to use smaller fbo

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/chcdemo.cpp (modified) (8 diffs)

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

@@ -274 +274 @@
 static CGparameter sMaxDepthParam;
 static CGparameter sMaxDepthParamTex;
-static CGparameter sCurrentPosParamTex;
-static CGparameter sCurrentPosParam;
+static CGparameter sEyePosParamTex;
+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 oldViewProjMatrix;
@@ -457 +467 @@
                 exit(0);
         }
-
+        
+#if 0
+
+        int merged = 0;
+
+        SceneEntity *oldEnt = NULL;
+
+        cout << "merging entities .. " << endl;
         SceneEntityContainer::const_iterator sit, sit_end = sceneEntities.end();
-
-        int merged = 0;
-        
-        SceneEntity *oldEnt = NULL;
-#if 0
-        cout << "merging entities .. " << endl;
 
         for (sit = sceneEntities.begin(); sit < sit_end; ++ sit)
@@ -498 +509 @@
         cout << "merged " << merged << " of " << (int)sceneEntities.size() << " entities " << endl;
 #endif
+
         // set far plane based on scene extent
         farDist = 10.0f * Magnitude(bvh->GetBox().Diagonal());
@@ -599 +611 @@
 
                 sMaxDepthParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "maxDepth");
-                sCurrentPosParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "currentPos");
+                sEyePosParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "eyePos");
                 RenderState::sTexParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tex");
         
                 cgGLSetParameter1f(sMaxDepthParamTex, MAX_DEPTH_CONST / farDist);
+
+                sTLParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tl"); 
+                sTRParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "tr"); 
+                sBRParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "br"); 
+                sBLParamTex = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "bl"); 
         }
         else
@@ -620 +637 @@
 
                 sMaxDepthParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "maxDepth");
-                sCurrentPosParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "currentPos");
+                sEyePosParam = cgGetNamedParameter(RenderState::sCgMrtFragmentTexProgram, "eyePos");
                 
                 cgGLSetParameter1f(sMaxDepthParam, MAX_DEPTH_CONST / farDist);
+
+                sTLParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "tl"); 
+                sTRParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "tr"); 
+                sBRParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "br"); 
+                sBLParam = cgGetNamedParameter(RenderState::sCgMrtFragmentProgram, "bl"); 
         }
         else
@@ -646 +668 @@
         fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
         // the positions buffer
-        fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
+        //fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_32, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
+        fbo->AddColorBuffer(ColorBufferObject::BUFFER_LUMINANCE_ALPHA, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
         // the normals buffer
         fbo->AddColorBuffer(ColorBufferObject::BUFFER_FLOAT_16, ColorBufferObject::WRAP_CLAMP_TO_EDGE, ColorBufferObject::FILTER_NEAREST, ColorBufferObject::FILTER_NEAREST);
@@ -935 +958 @@
 
 
+static void ComputeViewVectors(Vector3 &tl, Vector3 &tr, Vector3 &bl, Vector3 &br)
+{
+        Vector3 ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr;
+
+        camera->ComputePoints(ftl, ftr, fbl, fbr, ntl, ntr, nbl, nbr);
+
+        bl = Normalize(nbl - fbl);
+        br = Normalize(nbr - fbr);
+        tl = Normalize(ntl - ftl);
+        tr = Normalize(ntr - ftr);
+}
+
+
 void InitDeferredRendering()
 {
@@ -952 +988 @@
 
         const Vector3 pos = camera->GetPosition();
-        cgGLSetParameter3f(sCurrentPosParam, pos.x, pos.y, pos.z);
-        cgGLSetParameter3f(sCurrentPosParamTex, pos.x, pos.y, pos.z);
+
+        cgGLSetParameter3f(sEyePosParam, pos.x, pos.y, pos.z);
+        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);
+
+        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