Changeset 2108 for GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp

Timestamp:

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

Author:

mattausch

Message:

loading geometry in scene manager

File:

• GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp (modified) (6 diffs)

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");
                         }