Changeset 2108 for GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE

Timestamp:

02/09/07 03:05:52 (18 years ago)

Author:

mattausch

Message:

loading geometry in scene manager

Location:

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

Files:

• TerrainFrameListener.cpp (modified) (4 diffs)
• TerrainFrameListener.h (modified) (1 diff)
• TestCullingTerrainApplication.cpp (modified) (6 diffs)

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

@@ -235 +235 @@
         // the scale factor for the visualized bounding boxes
         mSceneMgr->setOption("NodeVizScale", &mVizScale);
-                
+        
+        /////////
         //-- set the current culling algorithm type
-        setAlgorithm(mApplication->mAlgorithm);
+        //setAlgorithm(mApplication->mAlgorithm);
+
+        bool isNormalExecution;
+                
+        mSceneMgr->getOption("NormalExecution", &isNormalExecution);
+        if (isNormalExecution)
+        {
+                // no algorithm
+                mCurrentAlgorithm = 
+                        GtpVisibility::VisibilityEnvironment::NUM_CULLING_MANAGERS;
+        }
+        else
+        {
+                mSceneMgr->getOption("Algorithm", &mCurrentAlgorithm);
+        }
+        
+        applyCurrentAlgorithm();
+        
+        ///////////////////////////////
 
         // set scene manager options
@@ -481 +500 @@
                 // frame start time
                 mTimeFrameStarted = mTimer->getMilliseconds();
-                //Ogre::LogManager::getSingleton().logMessage("Frame started");
         }
 
@@ -517 +535 @@
                 {
                         mApplication->Clamp2Terrain(mCamNode, 5);
+                        //Ogre::LogManager::getSingleton().logMessage("clamp to terrain");
                 }
                 else
                 {
                         mApplication->Clamp2FloorPlane(mFloorDist);
+                        //Ogre::LogManager::getSingleton().logMessage("clamp to floor");
                 }
 
@@ -526 +546 @@
 
         default:
+                Ogre::LogManager::getSingleton().logMessage("should not come here");
                 break;
         };      

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

@@ -78 +78 @@
                 //-- write out stats for recorded walkthrough
                 d << "Algorithm: " << algorithmName << "\n"
-                        << "avg. FPS: " << avgFps << "\n"
-                        << "best FPS: " << mBestFps << "\n"
-                        << "worst FPS: " << mWorstFps << "\n"
-                        << "#frames: " << mFrameCount << "\n"
-                        << "avg. #triangles: " << avgTris << " M\n"
-                        << "avg. #query culled nodes: " << avgFrustumCulledNodes << "\n"
-                        << "avg. #frustum culled nodes: " << avgQueryCulledNodes << "\n"
-                        << "avg. #rendered nodes: " << avgRenderedNodes << "\n";
+                  << "avg. FPS: " << avgFps << "\n"
+                  << "best FPS: " << mBestFps << "\n"
+                  << "worst FPS: " << mWorstFps << "\n"
+                  << "#frames: " << mFrameCount << "\n"
+                  << "avg. #triangles: " << avgTris << " M\n"
+                  << "avg. #query culled nodes: " << avgFrustumCulledNodes << "\n"
+                  << "avg. #frustum culled nodes: " << avgQueryCulledNodes << "\n"
+                  << "avg. #rendered nodes: " << avgRenderedNodes << "\n";
         }
 

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

@@ -217 +217 @@
         if (!val.empty())
                 mInitialPosition.z = atof( val.c_str());
-
 */
+
 /*      val = config.getSetting("OnlineCullingAlgorithm");
 
@@ -457 +457 @@
         loadConfig("terrainCulling.cfg");
         
-        if (!LoadScene(mFilename))
+        if (0 && !LoadScene(mFilename))
                 LogManager::getSingleton().logMessage("error loading scene");
         
@@ -499 +499 @@
         if (1)//||msShowHillyTerrain)
         {
-        mSceneMgr->getOption("ShowTerrain", &msShowHillyTerrain); 
-                std::string terrain_cfg("terrainCulling.cfg");
+        std::string terrain_cfg("terrainCulling.cfg");
                 mSceneMgr->setWorldGeometry(terrain_cfg);
 
+                mSceneMgr->getOption("ShowTerrain", &msShowHillyTerrain); 
         }
         
@@ -660 +660 @@
         }
 #else
-        if (msShowHillyTerrain)
-        {
-                mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
-                //mSceneMgr = mRoot->createSceneManager("TerrainSceneManager");
-                //mSceneMgr = mRoot->createSceneManager("KdTreeSceneManager");
-        }
-        else
-        {       
-                mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
-                //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
-                //mSceneMgr = mRoot->createSceneManager("KdTreeSceneManager");
-        }
-
+        
+        mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
+        //mSceneMgr = mRoot->createSceneManager("TerrainSceneManager");
+        //mSceneMgr = mRoot->createSceneManager("KdTreeSceneManager");
+        
 #endif
 }
@@ -703 +695 @@
         RaySceneQueryResult::iterator rit = qryResult.begin();
         bool success = false;
-float yVal = 0;
-float minVal = 999999999999;
+        
+        float yVal = 0;
+        float minVal = 999999999999;
 
         while (rit != qryResult.end() && rit->movable)
@@ -779 +772 @@
                         {
                                 // terrain hack
-                                msShowHillyTerrain = true;
+                                //msShowHillyTerrain = true;
                                 LogManager::getSingleton().logMessage("error loading scene => load terrain");
                         }