Changeset 2543 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Timestamp:

08/21/07 19:37:28 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreBoundingBoxConverter.h (modified) (1 diff)
• src/OgreOcclusionCullingSceneManager.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreBoundingBoxConverter.h

@@ -291 +291 @@
                 FindIntersectingObjects(box, *entryObjects);
 
+                /*stringstream d;
+                d << "identified: " << entryObjects->size() << " objects \n";
+                LogManager::getSingleton().logMessage(d.str());
+*/
                 AddToObjects(entryObjects, objects, id);
         }

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

@@ -1686 +1686 @@
         const bool finalizeViewCells = false;
 
-        // load the view cells assigning the found objects to the pvss
-        mViewCellsManager = 
-                GtpVisibilityPreprocessor::ViewCellsManager::
+        /////////////
+        //-- load the view cells assigning the found objects to the pvss
+
+        if (!strstr(filename.c_str(), ".bn"))
+        {
+                LogManager::getSingleton().logMessage("*** loading xml view cells ***");
+
+                mViewCellsManager = GtpVisibilityPreprocessor::ViewCellsManager::
                         LoadViewCells(filename, mObjects, finalizeViewCells, &bconverter);
-        
-        LogManager::getSingleton().logMessage("******** view cells loaded *********");
-
-        // objects are set to invisible initially
-        //SetObjectsVisible(false);
-
-        if (finalizeViewCells)
-                CreateViewCellsGeometry();
-
-        return (mViewCellsManager != NULL);
+        }
+        else
+        {
+                LogManager::getSingleton().logMessage("*** loading binary view cells ***");
+                mViewCellsManager =
+                        LoadViewCellsBinary(filename, mObjects, finalizeViewCells, &bconverter);
+        }
+
+        if (mViewCellsManager)
+        {
+                // objects are set to invisible initially
+                if (0) SetObjectsVisible(false);
+
+                if (finalizeViewCells)
+                        CreateViewCellsGeometry();
+
+                LogManager::getSingleton().logMessage("******** view cells loaded *********");
+                return true;
+        }
+        else
+        {
+                LogManager::getSingleton().logMessage("******** loading view cells failed! *********");
+                return false;
+        }
 }
 //-------------------------------------------------------------------------