Changeset 2108 for GTP/trunk/Lib

Timestamp:

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

Author:

mattausch

Message:

loading geometry in scene manager

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (11 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp

@@ -216 +216 @@
                         LogManager::getSingleton().logMessage("loading terrain");
                 }
+                else
+                {
+                        mShowTerrain = false;
+                        LogManager::getSingleton().logMessage("loading geometry");
+                }
         }
 
@@ -356 +361 @@
                         "TerrainSceneManager::loadConfig");
         }
+
         TerrainPageSourceOptionList optlist;
         ConfigFile::SettingsIterator setIt = config.getSettingsIterator();
@@ -367 +373 @@
                 }
         }
+
         // set the page source
         selectPageSource(pageSourceName, optlist);
@@ -394 +401 @@
         }
 
-        // set old view cell geometry to invisible
+        // show current view cell geometry
     if (mCurrentViewCell && mCurrentViewCell->GetMesh())
         {
@@ -906 +913 @@
                 mElementaryViewCell = NULL;
 
-                // with view cells all objects are set to invisible per default
+                // all objects are set to invisible per default
                 SetObjectsVisible(!mUseViewCells);
 
@@ -936 +943 @@
                 return true;
         }
+        if (key == "ShowTerrain")
+        { 
+                mShowTerrain = *static_cast<const bool *>(val);
+                return true;
+        }
         if (key == "UseVisibilityFilter")
         {
@@ -942 +954 @@
                 // set null => recomputation of the pvs
         mElementaryViewCell = NULL;
+
                 return true;
         }
@@ -982 +995 @@
                 return true;
         }
-        if (key == "AlgorithmType")
+        if (key == "NormalExecution")
+        {
+                * static_cast<bool *>(val) = (bool *)mNormalExecution;
+                return true;
+        }
+        if (key == "Algorithm")
         {
                 GtpVisibility::VisibilityEnvironment::CullingManagerType algorithm =
@@ -1683 +1701 @@
 {
         using namespace std;
+
         // use leaf nodes of the original spatial hierarchy as occludees
         vector<string> filenames;
         const int files = SplitFilenames(filename, filenames);
         
-        std::stringstream d;
+        stringstream d;
         d << "number of input files: " << files << "\n";
         LogManager::getSingleton().logMessage(d.str());
@@ -1702 +1721 @@
                 return false;
         }
-/*
+
         for (fit = filenames.begin(); fit != fit_end; ++ fit, ++ i)
         {
@@ -1720 +1739 @@
                 result = true;
         }
-*/      result=true;
+
         return result;
 }