Changeset 973 for GTP/trunk/App/Demos/Vis

Timestamp:

05/22/06 07:58:02 (19 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

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

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

@@ -1199 +1199 @@
                 mViewCellsLoaded = mApplication->LoadViewCells(mApplication->mViewCellsFilename);
                 
+                if (!mViewCellsLoaded)
+                {
+                        std::stringstream d;
+                        d << "loading view cells failed";
+                        LogManager::getSingleton().logMessage(d.str());
+                }
+
                 mLoadingOverlay->hide();
         }

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

@@ -185 +185 @@
 
         
-#if 0
-        val = config.getSetting("ViewCells");
-
+        /*val = config.getSetting("ViewCells");
         if (!val.empty())
-        {
-                 mViewCellsFilename = val.c_str();
-        }
-#endif
+        {        mViewCellsFilename = val.c_str();}*/
 
         val = config.getSetting("VisibilityEnvironment");
@@ -199 +194 @@
         {
                  mEnvironmentFilename = val.c_str();
-                 std::stringstream d; d << "loading environment from from file: " << mEnvironmentFilename;
+                 std::stringstream d; d << "loading environment from file: " << mEnvironmentFilename;
                  LogManager::getSingleton().logMessage(d.str());
         }
@@ -243 +238 @@
                 else //-- load environment options
                 {
-                        //-- get view cells name. load only on demand
+                        //-- get view cells file name, load view cells only on demand
                         mViewCellsFilename = visEnv->getViewCellsFileName();
 
@@ -252 +247 @@
         else
         {
-                LogManager::getSingleton().logMessage("error! no visibility scenemanager available");
+                LogManager::getSingleton().logMessage("error: no visibility scenemanager available");
         }
         // set camera position accordingly
@@ -605 +600 @@
         if (msShowHillyTerrain)
         {
-                //mSceneMgr = mRoot->createSceneManager("VisibilityTerrainSceneManager");
                 //mSceneMgr = mRoot->createSceneManager("TerrainSceneManager");
                 mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
         }
         else
-        {       //mSceneMgr = mRoot->createSceneManager("VisibilityTerrainSceneManager");
-        //mSceneMgr = mRoot->createSceneManager("VisibilityOctreeSceneManager");
+        {       
                 //mSceneMgr = mRoot->createSceneManager("OctreeSceneManager");
                 mSceneMgr = mRoot->createSceneManager("OcclusionCullingSceneManager");
@@ -756 +749 @@
 
         //-- the actual loading happens here
-        if (mSceneMgr->setOption("LoadViewCells", filename.c_str()))
-        return true;
-
-        LogManager::getSingleton().logMessage("error loading view cells!!");
-
-        return false;
+        return mSceneMgr->setOption("LoadViewCells", filename.c_str());
 }
 

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

@@ -142 +142 @@
         String mFilename;
         String mViewCellsFilename;
-        // name of the visibility environment file
+        /// name of the visibility environment file
         String mEnvironmentFilename;