Changeset 103 for trunk/VUT/work

Timestamp:

05/18/05 02:06:32 (20 years ago)

Author:

mattausch

Message:

fixed bug with shadow maps

Location:

trunk/VUT/work

Files:

• TestCulling/TestCullingApplication.cpp (modified) (1 diff)
• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (11 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.h (modified) (2 diffs)
• ogre_changes/Plugins/OctreeSceneManager/include/OgreOctreeSceneManager.h (modified) (1 diff)
• ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp (modified) (3 diffs)

trunk/VUT/work/TestCulling/TestCullingApplication.cpp

@@ -57 +57 @@
 
         // Create a skybox
-    //mSceneMgr->setSkyBox(true, "Examples/CloudyNoonSkyBox", 1000, false);
+    //mSceneMgr->setSkyBox(true, "Examples/CloudyNoonSkyBox", 2000, false);
     ColourValue fadeColour(0.1, 0.1, 0.6);
         mWindow->getViewport(0)->setBackgroundColour(fadeColour);

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -38 +38 @@
 {
         // create the camera
-        mCamera = mSceneMgr->createCamera("CullCamera");
+        mCamera = mSceneMgr->createCamera("PlayerCam");
         
         /** set a nice viewpoint
@@ -108 +108 @@
         
         // Create a skybox
-        mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox", 7000, false);
-        //mSceneMgr->setSkyDome( true, "Examples/CloudySky", 5, 8, 500, false );
-
+        mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox", 5000, false);
+        
         std::string terrain_cfg("terrain.cfg");
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
@@ -127 +126 @@
 
         mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr);
+        mTerrainContentGenerator->SetMaxPos(Vector3(3000.0f, 5000.0f, 3000.0f));
+
+        mTerrainContentGenerator->GenerateScene(1500, "robot.mesh");
 //      mTerrainContentGenerator->GenerateScene(500, "ninja.mesh");
-        mTerrainContentGenerator->SetMaxPos(Vector3(3000.0f, 5000.0f, 3000.0f));
-        mTerrainContentGenerator->GenerateScene(1500, "robot.mesh");
 
         // no limitations needed anymore: the user can set 
@@ -188 +188 @@
 mVizCamera(vizCamera),
 mShowVisualization(false),
+mRenderNodesForViz(false),
 mVizCameraHeight(Real(2500.0)),
 mCamNode(camNode),
-mCullCamera(true)
+mCullCamera(false)
 {
         // Reduce move speed
@@ -235 +236 @@
         mSceneMgr->setOption("ShowOctree", &mShowOctree);
         mSceneMgr->setOption("CullCamera", &mCullCamera);
-        
-    pOver->show();
+        mSceneMgr->setOption("ShowVisualization", &mShowVisualization);
+        mSceneMgr->setOption("RenderNodesForViz", &mRenderNodesForViz);
+
+        pOver->show();
 } 
 //-----------------------------------------------------------------------
@@ -327 +330 @@
                 // important for visualization => draw octree bounding boxes
                 mSceneMgr->setOption("ShowOctree", &mShowVisualization);
+                // also render geometry?
+                mSceneMgr->setOption("RenderNodesForViz", &mRenderNodesForViz);
 
                 // -- setup visualization camera
@@ -370 +375 @@
 
         KEY_PRESSED(KC_O, 0.3, toggleUseOptimization());
-        KEY_PRESSED(KC_E, 0.3, toggleShowOctree());
+        KEY_PRESSED(KC_T, 0.3, toggleShowOctree());
         KEY_PRESSED(KC_C, 0.3, toggleUseVisibilityCulling());
-        KEY_PRESSED(KC_V, 0.3, toggleShowViz());
+        KEY_PRESSED(KC_1, 0.3, toggleShowViz());
+        KEY_PRESSED(KC_2, 0.3, toggleRenderNodesForViz());
 
         if (!mShowVisualization)
@@ -505 +511 @@
         {       
                 Viewport *vizvp = mWindow->addViewport(mVizCamera, 
-                        VIZ_VIEWPORT_Z_ORDER, 0.6, 0, 0.4, 0.4);
+                        VIZ_VIEWPORT_Z_ORDER, 0.6, 0.6, 0.4, 0.4); 
                                 
                 vizvp->setBackgroundColour(ColourValue(0.0, 0.3, 0.2, 1));
@@ -513 +519 @@
         mVizCamera->setAspectRatio(Real(vizvp->getActualWidth()) / 
                         Real(vizvp->getActualHeight()));
-
                 //vizvp->setClearEveryFrame(false);
 
@@ -520 +525 @@
                 plane.d = 1000;
                 plane.normal = Vector3::UNIT_Y;
-                mSceneMgr->setSkyPlane( true, plane, "Examples/MyTransparentTest", 4000, 75, true);*/
-                
+                mSceneMgr->setSkyPlane( true, plane, "Examples/Rockwall", 4000, 75, false);
+                */
         }
         else
@@ -529 +534 @@
                 mSceneMgr->setOption("ShowOctree", &mShowOctree);
         }
+}
+//-----------------------------------------------------------------------
+void MouseQueryListener::toggleRenderNodesForViz()
+{
+        mRenderNodesForViz = !mRenderNodesForViz;
+
+        mSceneMgr->setOption("RenderNodesForViz", &mRenderNodesForViz);
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -84 +84 @@
         void toggleUseVisibilityCulling();
         void toggleShowViz();
+        void toggleRenderNodesForViz();
         void zoomVizCamera(int zoom);
         void moveCamera();
@@ -120 +121 @@
         bool mUseVisibilityCulling;
         bool mShowVisualization;
+        bool mRenderNodesForViz;
         bool mCullCamera;
 

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctreeSceneManager.h

@@ -110 +110 @@
                 @param cam current camera
         */
-        void _renderOctant(Camera* cam, Octree *octree);
+        void _renderOctant(Camera* cam, Octree *octree, bool onlyShadowCasters);
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp

@@ -1168 +1168 @@
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
 //-----------------------------------------------------------------------
-void OctreeSceneManager::_renderOctant(Camera *cam, Octree *octant)
+void OctreeSceneManager::_renderOctant(Camera *cam, Octree *octant, bool onlyShadowCasters)
 {
         //Add stuff to be rendered;
@@ -1182 +1182 @@
                 if (cam->isVisible(sn->_getWorldAABB()))
                 {
-                        sn->_addToRenderQueue(cam, getRenderQueue(), false);
+                        sn->_addToRenderQueue(cam, getRenderQueue(), onlyShadowCasters);
                         //node->_findVisibleObjects(cam, getRenderQueue(), false, mDisplayNodes, false);
                         mVisible.push_back(sn);
@@ -1203 +1203 @@
         {
                 getRenderQueue()->addRenderable(octant->getWireBoundingBox());
-                ++mNumObjects;
+                mBoxes.push_back(octant->getWireBoundingBox());
         }