Changeset 2942 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShadowMapping.cpp

Timestamp:

09/13/08 14:03:47 (16 years ago)

Author:

mattausch

Message:

lispsm finally working!!

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShadowMapping.cpp (modified) (11 diffs)

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

@@ -570 +570 @@
 void ShadowMap::ComputeShadowMap(RenderTraverser *renderer, const Matrix4x4 &projView)
 {
-        const float xlen = Magnitude(mSceneBox.Diagonal() * 0.5f);
-        const float ylen = Magnitude(mSceneBox.Diagonal() * 0.5f);
-        
-        const Vector3 dir = mLight->GetDirection();
-        //const Vector3 dir(0, 0, -1);
-
-        // set position so that we can see the whole scene
-        //Vector3 pos = mSceneBox.Center();
-        //pos -= dir * Magnitude(mSceneBox.Diagonal() * 0.5f);
-        //mShadowCam->SetPosition(pos);
-        mShadowCam->SetPosition(mCamera->GetPosition());
-
-        Vector3 upVec = CalcUpVec(mCamera->GetDirection(), dir);
-        Matrix4x4 lightView = MyLookAt(mShadowCam->GetPosition(), dir, upVec);
-        //Matrix4x4 lightView = MyLookAt(mShadowCam->GetPosition(), -dir, mCamera->GetDirection());
-
-        Matrix4x4 refl = ScaleMatrix(-1, 1, 1); 
-        lightView = lightView * refl;
-
-        mShadowCam->mViewOrientation = lightView;
-
-
         mFbo->Bind();
         
@@ -598 +576 @@
         glPushAttrib(GL_VIEWPORT_BIT);
         glViewport(0, 0, mSize, mSize);
-
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
         glDisable(GL_LIGHTING);
@@ -605 +581 @@
         glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
 
-//glDisable(GL_CULL_FACE);
-
-        glPolygonOffset(1.0f, 2000.0f);
-        glEnable(GL_POLYGON_OFFSET_FILL);
-        //glDisable(GL_POLYGON_OFFSET_FILL);
-
         glShadeModel(GL_FLAT);
-        glEnable(GL_DEPTH_TEST);
-
-        Matrix4x4 lightProj;
-
-        CalcLightProjection(lightProj);
-
-        glMatrixMode(GL_PROJECTION);
-        glPushMatrix();
-        glLoadMatrixf((float *)lightProj.x);
-
-        mLightProjView = lightView * lightProj;
-
-        cout << "here3" << endl;
-        DEL_PTR(lightPoly);
-        lightPoly = CreatePolyhedron(mLightProjView, mSceneBox);
-        cout << "here4\n" << lightView << endl;
-
-        glMatrixMode(GL_MODELVIEW);
-        glPushMatrix();
-        glLoadIdentity();
-
-        mShadowCam->SetupCameraView();
-
-        dummyMat = mLightProjView;
+
+
+        /////////////
+        //-- render scene into shadow map
+
+        _Render(renderer);
 
 
@@ -648 +600 @@
         mTextureMatrix = mLightProjView * biasMatrix; 
 
-
-
-
-        /////////////
-        //-- render scene into shadow map
-
-        renderer->RenderScene();
-
-        
-        glDisable(GL_POLYGON_OFFSET_FILL);
-        glMatrixMode(GL_MODELVIEW);
-        glPopMatrix();
-
-        glMatrixMode(GL_PROJECTION);
-        glPopMatrix();
-
         glPopAttrib();
-
         
         glEnable(GL_LIGHTING);
@@ -680 +615 @@
         PrintGLerror("shadow map");
 #endif
+        
         FrameBufferObject::Release();
 }
@@ -685 +621 @@
 
 void ShadowMap::RenderShadowView(RenderTraverser *renderer, const Matrix4x4 &projView)
+{
+        glEnable(GL_LIGHTING);
+        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+
+        _Render(renderer);
+        
+        glDisable(GL_POLYGON_OFFSET_FILL);
+        glDisable(GL_LIGHTING);
+}
+
+
+void ShadowMap::_Render(RenderTraverser *renderer)
 {
         const Vector3 dir = mLight->GetDirection();
@@ -700 +648 @@
         Vector3 upVec = CalcUpVec(mCamera->GetDirection(), dir);
         Matrix4x4 lightView = MyLookAt(mShadowCam->GetPosition(), dir, upVec);
-        //Matrix4x4 lightView = MyLookAt(mShadowCam->GetPosition(), -dir, mCamera->GetDirection());
-
-        //Matrix4x4 refl = ScaleMatrix(-1, 1, 1); 
-        //lightView = lightView * refl;
 
         mShadowCam->mViewOrientation = lightView;
 
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-        glEnable(GL_LIGHTING);
-        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 
         glPolygonOffset(1.0f, 2000.0f);
         glEnable(GL_POLYGON_OFFSET_FILL);
         
-        glEnable(GL_DEPTH_TEST);
-
         Matrix4x4 lightProj;
         CalcLightProjection(lightProj);
@@ -730 +669 @@
         lightPoly = CreatePolyhedron(mLightProjView, mSceneBox);
 
-        Frustum frustum(mLightProjView);
-        cout << "near: " << Normalize(frustum.mClipPlanes[4].mNormal) << endl;
-        cout << "far: " << Normalize(frustum.mClipPlanes[5].mNormal) << endl;
-
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
@@ -739 +674 @@
 
         //glDisable(GL_CULL_FACE);
-
         mShadowCam->SetupCameraView();
-        
-
+
+        
         /////////////
         //-- render scene into shadow map
@@ -748 +682 @@
         renderer->RenderScene();
 
-        
-        glDisable(GL_POLYGON_OFFSET_FILL);
-
-        glDisable(GL_LIGHTING);
-        glDisable(GL_DEPTH_TEST);
-
-        glLineWidth(2);
-        Polyhedron *hpoly = CreatePolyhedron(projView, mSceneBox);
-        DrawPoly(hpoly, Vector3(1, 1, 1), Vector3(0, 1, 1));
-
-        DEL_PTR(hpoly);
-
-
-        glEnable(GL_LIGHTING);
-        glEnable(GL_DEPTH_TEST);
-
         glMatrixMode(GL_MODELVIEW);
         glPopMatrix();
@@ -770 +688 @@
         glPopMatrix();
 
-
-#if 0
-        float *data = new float[mSize * mSize];
-
-        GrabDepthBuffer(data, mFbo->GetDepthTex());
-        ExportDepthBuffer(data, mSize);
-
-        delete [] data;
-        
-        PrintGLerror("shadow map");
-#endif
-        FrameBufferObject::Release();
-}
-
-
-
-
+        
+        glDisable(GL_POLYGON_OFFSET_FILL);
+}
 } // namespace