Changeset 2352 for GTP

Timestamp:

05/07/07 17:52:44 (18 years ago)

Author:

vizrt_christian_seidl

Message:

FEATURE: Changes for BITerrainManager

Location:

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE

Files:

• TerrainFrameListener.cpp (modified) (4 diffs)
• TerrainFrameListener.h (modified) (2 diffs)
• TestCullingTerrainApplication.cpp (modified) (4 diffs)

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.cpp

@@ -30 +30 @@
         "RUC",
         "SWC",
-        "DEF"
+        "DEF",
+        "INT"
 };
 
@@ -166 +167 @@
 mUseVisibilityFilter(false),
 mFloorDist(2),
-mFlushQueue(false)
+mFlushQueue(false),
+m_iShowBoundingBoxes(0),
+m_iBoundingBoxLevel(0)
 {
         //mInputDevice = PlatformManager::getSingleton().createInputReader();
@@ -1326 +1329 @@
 }
 
+void TerrainFrameListener::showBoundingBoxes()
+{
+        m_iShowBoundingBoxes++;
+        m_iShowBoundingBoxes%=2;
+        mSceneMgr->setOption("ShowBiHierarchy", (void*)&m_iShowBoundingBoxes);
+}
+
+
 //-----------------------------------------------------------------------
 void TerrainFrameListener::toggleShowViz()
@@ -1486 +1497 @@
                 mCamNode->resetOrientation();
                 break;
+        case KC_B:
+                showBoundingBoxes();
+                break;
+        case KC_3:
+                if (m_iBoundingBoxLevel>0) m_iBoundingBoxLevel--;
+                mSceneMgr->setOption("HiLiteLevel", (void*)&m_iBoundingBoxLevel);
+                break;
+        case KC_4:
+                m_iBoundingBoxLevel++;
+                mSceneMgr->setOption("HiLiteLevel", (void*)&m_iBoundingBoxLevel);
+                break;
+
 
 

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TerrainFrameListener.h

@@ -211 +211 @@
         /** Takes one video frame.
         */
+
+        void showBoundingBoxes();
         void takeVideoFrame(std::ofstream &ofstr);
 
@@ -308 +310 @@
         int mNumVideoFrames;
         /// the newly created object
+        int m_iShowBoundingBoxes;
+        int m_iBoundingBoxLevel;
         SceneNode *mCurrentObject;    
 

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp

@@ -432 +432 @@
         // terrain creation
         std::string terrain_cfg("terrainCulling.cfg");
+        
         mSceneMgr->setWorldGeometry(terrain_cfg);
 
         // was terrain loaded?
         mSceneMgr->getOption("ShowTerrain", &msShowHillyTerrain); 
+        msShowHillyTerrain=true;
+
                 
         // hack view point for terrain
@@ -471 +474 @@
         {
                 // the objects are generated randomly distributed over the terrain
-                if (1) generateScene(1500, 0); // create robots
-                if (0) generateScene(100, 1); // create ninjas
+                if (1) generateScene(500, 0); // create robots
+                if (0) generateScene(300, 1); // create ninjas
                 if (0) generateScene(1000, 2); // create trees
         }
+        int MaxDepth=30;
+        mSceneMgr->setOption("BiHierarchyMaxDepth", &MaxDepth);
+        int Mode=1;
+        mSceneMgr->setOption("EnhancedVisibility", &Mode);
+        mSceneMgr->setOption("RebuildBiHierarchy", NULL);
+        mSceneMgr->setOption("RebuildKdTree", NULL);
 }
 //-----------------------------------------------------------------------
@@ -564 +573 @@
                                                                  this);
 
-        mTerrainFrameListener->setPriority(10);
-        mTerrainFrameListener->setPriority(10);
-        mRoot->addFrameListener(mTerrainFrameListener);
+        //mTerrainFrameListener->setPriority(10);
+        //mTerrainFrameListener->setPriority(10);
+        mRoot->addFrameListener(mTerrainFrameListener); 
 }
 //-----------------------------------------------------------------------
@@ -583 +592 @@
 #else
 
-        mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
-        
-        //mSceneMgr = mRoot->createSceneManager("TerrainSceneManager");
+        //mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
+        
+        //mSceneMgr = mRoot->createSceneManager("TerrainSceneManager"); 
         //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
-
-        //mSceneMgr = mRoot->createSceneManager("KdTreeSceneManager");
+        //mSceneMgr = mRoot->createSceneManager("BiHierarchySceneManager");
+
+        mSceneMgr = mRoot->createSceneManager("BiTreeTerrainSceneManager");
         
 #endif