Changeset 3063

Timestamp:

10/23/08 16:37:00 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• Camera.cpp (modified) (6 diffs)
• Camera.h (modified) (5 diffs)
• DeferredRenderer.cpp (modified) (1 diff)
• ShadowMapping.cpp (modified) (9 diffs)
• Visualization.cpp (modified) (2 diffs)
• Visualization.h (modified) (3 diffs)
• chcdemo.cpp (modified) (4 diffs)

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

@@ -116 +116 @@
 {
         mNear = nearDist;
+        UpdateProjectionMatrix();
 }
 
@@ -122 +123 @@
 { 
         mFar = farDist; 
+        UpdateProjectionMatrix();
 }
 
@@ -272 +274 @@
 
 
+void Camera::GetProjectionMatrix(Matrix4x4 &m)const
+{
+        m = mProjection;
+}
+
+
 /*********************************************************/
 /*       Class PerspectiveCamera implementation           */
@@ -280 +288 @@
 {
         mFOVy = 60.0f * M_PI / 180.0f;
+        mAspect = 1.0f;
+
+        UpdateProjectionMatrix();
 }
 
@@ -287 +298 @@
         mFOVy = fieldOfView * M_PI / 180.0f;
         mAspect = aspect;
+
+        UpdateProjectionMatrix();
 }
 
@@ -384 +397 @@
 
 
-void PerspectiveCamera::GetProjectionMatrix(Matrix4x4 &mat) const
-{
-        mat = GetPerspective(mFOVy, 1.0f / mAspect, mNear, mFar);
-
-        Matrix4x4 mat2;
-        glGetFloatv(GL_PROJECTION_MATRIX, (float *)mat2.x);
-
-        cout << "my projview:\n" << mat  << endl;
-        cout << "gl projview:\n" << mat2 << endl;
-}
-
-
-}
+void PerspectiveCamera::UpdateProjectionMatrix()
+{
+        mProjection = GetPerspective(mFOVy, 1.0f / mAspect, mNear, mFar);
+}
+
+
+}

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

@@ -72 +72 @@
         /** Returns the current projection matrix.
         */
-        virtual void GetProjectionMatrix(Matrix4x4 &mat) const = 0;
+        void GetProjectionMatrix(Matrix4x4 &mat) const;
         /** Returns the current model view matrix.
         */
@@ -121 +121 @@
 protected:
 
+        virtual void UpdateProjectionMatrix() = 0;
+
         void Precompute(const Vector3 &direction);
 
@@ -134 +136 @@
         Matrix4x4 mBaseOrientation;
         Matrix4x4 mViewOrientation;
+
+        Matrix4x4 mProjection;
 
         float mPitch;
@@ -161 +165 @@
         */
         inline float GetAspect() const { return mAspect; }
-        /** Returns the current projection matrix.
-        */
-        virtual void GetProjectionMatrix(Matrix4x4 &mat) const;
         /** Computes the extremal points of this frustum.
                 If farthestVisibleDistance is nearer than the far plane, 
@@ -177 +178 @@
 
 protected:
+        /** Calculates the current projection matrix.
+        */
+        virtual void UpdateProjectionMatrix();
 
         void ComputePointsInternal(Vector3 &ftl, Vector3 &ftr, Vector3 &fbl, Vector3 &fbr,

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

@@ -527 +527 @@
         sCgSsaoProgram->SetValue3f(10, tr.x, tr.y, tr.z);
 
-        cout << "new projview:\n" << projViewMatrix << endl;
-        cout << "old projview:\n" << oldProjViewMatrix << endl;
+        //cout << "new projview:\n" << projViewMatrix << endl;
+        //cout << "old projview:\n" << oldProjViewMatrix << endl;
 
         sCgSsaoProgram->SetMatrix(11, projViewMatrix);

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

@@ -335 +335 @@
 
 #if 0
+
 Vector3 ShadowMap::GetNearCameraPointE(const VertexArray &pts) const
 {
@@ -545 +546 @@
 }
 
+
 unsigned int ShadowMap::GetShadowColorTexture() const
 {
@@ -562 +564 @@
         polyhedron.CollectVertices(vertices);
 
-        // we 'look' at each point and calculate intersections of rays with scene bounding box
+        // we 'look' at each point and intect rays with the scene bounding box
         VertexArray::const_iterator it, it_end = vertices.end();
 
@@ -570 +572 @@
 
                 frustumPoints.push_back(v);
-                
                 // hack: start at point which is guaranteed to be outside of box
                 v -= Magnitude(mSceneBox.Diagonal()) * lightDir;
@@ -587 +588 @@
 
 
-void ShadowMap::ComputeShadowMap(RenderTraverser *renderer, const Matrix4x4 &projView)
+void ShadowMap::ComputeShadowMap(RenderTraverser *renderer, 
+                                                                 const Matrix4x4 &projView)
 {
         mFbo->Bind();
@@ -607 +609 @@
         _Render(renderer);
 
+        glPopAttrib();
+        
+        glShadeModel(GL_SMOOTH);
+        glEnable(GL_LIGHTING);
+        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+
+#if 0
+        float *data = new float[mSize * mSize];
+
+        GrabDepthBuffer(data, mFbo->GetDepthTex());
+        ExportDepthBuffer(data, mSize);
+
+        delete [] data;
+        
+        PrintGLerror("shadow map");
+#endif
+        
 
         //////////////
@@ -618 +637 @@
         mTextureMatrix = mLightProjView * biasMatrix; 
 
-        glPopAttrib();
-        
-        glShadeModel(GL_SMOOTH);
-        glEnable(GL_LIGHTING);
-        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-
-#if 0
-        float *data = new float[mSize * mSize];
-
-        GrabDepthBuffer(data, mFbo->GetDepthTex());
-        ExportDepthBuffer(data, mSize);
-
-        delete [] data;
-        
-        PrintGLerror("shadow map");
-#endif
-        
         FrameBufferObject::Release();
 }
 
 
-void ShadowMap::RenderShadowView(RenderTraverser *renderer, const Matrix4x4 &projView)
+void ShadowMap::RenderShadowView(RenderTraverser *renderer, 
+                                                                 const Matrix4x4 &projView)
 {
         glEnable(GL_LIGHTING);
@@ -671 +674 @@
         mShadowCam->SetPosition(mCamera->GetPosition());
 
-        Vector3 upVec = CalcUpVec(mCamera->GetDirection(), dir);
-        Matrix4x4 lightView = LookAt(mShadowCam->GetPosition(), dir, upVec);
+        const Vector3 upVec = CalcUpVec(mCamera->GetDirection(), dir);
+        const Matrix4x4 lightView = LookAt(mShadowCam->GetPosition(), dir, upVec);
 
         mShadowCam->mViewOrientation = lightView;
@@ -684 +687 @@
         CalcLightProjection(lightProj);
 
+        mLightProjView = lightView * lightProj;
+
+        DEL_PTR(lightPoly);
+        lightPoly = CreatePolyhedron(mLightProjView, mSceneBox);
+
         glMatrixMode(GL_PROJECTION);
         glPushMatrix();
-        glLoadMatrixf((float *)lightProj.x);
-
-        mLightProjView = lightView * lightProj;
-
-        DEL_PTR(lightPoly);
-        lightPoly = CreatePolyhedron(mLightProjView, mSceneBox);
 
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
         
-        mShadowCam->SetupCameraView();
+        // set projection matrix manually
+        mShadowCam->mProjection = lightProj;
+        
+        // load gl view projection
+        mShadowCam->SetupViewProjection();
 
         

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

@@ -104 +104 @@
 
 
-void Visualization::Render()
+void Visualization::Render(bool showShadowFrustra)
 {
         stack<BvhNode *> tStack;
@@ -153 +153 @@
         RenderFrustum();
 
-        ShadowMap::VisualizeFrustra();
+        if (showShadowFrustra)
+                ShadowMap::VisualizeFrustra();
 
         Vector3 pos = mCamera->GetPosition();

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

@@ -27 +27 @@
 
         ~Visualization();
-
         /** Renders the visualizatioin
         */
-        void Render();
+        void Render(bool showShadowFrustra);
         /** Sets the scene hierarchy.
         */
@@ -36 +35 @@
         /** Sets the visualization camera.
         */
-        void SetVizCamera(Camera *cam)  {mVizCamera = cam;}
+        void SetVizCamera(Camera *cam) { mVizCamera = cam; }
         /** Sets the currently used scene camera.
         */
-        void SetCamera(PerspectiveCamera *cam)  {mCamera = cam;}
+        void SetCamera(PerspectiveCamera *cam) {mCamera = cam; }
         /** Sets the current render state
         */
@@ -49 +48 @@
         */
         void RenderFrustum();
+
 
 protected:

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

@@ -880 +880 @@
         int oldRenderMethod = renderMethod;
         // for rendering the light view, we use forward rendering
-        if (renderLightView)
-                renderMethod = RenderState::FORWARD;
+        if (renderLightView) renderMethod = RenderState::FORWARD;
 
         /// enable vbo vertex array
@@ -1601 +1600 @@
         //-- visualization of the occlusion culling
 
-        visualization->Render();
+        visualization->Render(showShadowMap);
 
         
@@ -1948 +1947 @@
         glDisable(GL_CULL_FACE);
         state.LockCullFaceEnabled(true);
-
+        /// don't use alphatocoverage
         state.SetUseAlphaToCoverage(false);
 
@@ -1967 +1966 @@
 
         glEnableClientState(GL_NORMAL_ARRAY);
-
         // change back state
         BvhNode::SetCurrentState(CAMERA_PASS);