Changeset 2067 for GTP

Timestamp:

01/31/07 08:31:27 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src

Files:

• OgreBvHierarchySceneManager.cpp (modified) (1 diff)
• OgreOcclusionCullingSceneManager.cpp (modified) (3 diffs)

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

@@ -1329 +1329 @@
         // the scene objects using the bounding boxes
         mViewCellsManager = 
-                GtpVisibilityPreprocessor::ViewCellsManager::LoadViewCells(filename, &mObjects, false, &bconverter);
+                GtpVisibilityPreprocessor::ViewCellsManager::
+                LoadViewCells(filename, &mObjects, false, &bconverter);
 
         return (mViewCellsManager != NULL);

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

@@ -432 +432 @@
                         GtpVisibilityPreprocessor::Intersectable *obj = entry.mObject;
 
-                        if (obj->Type() == 
+                        if (obj->Type() != 
                                 GtpVisibilityPreprocessor::Intersectable::ENGINE_INTERSECTABLE)
+                                continue;
+                        
+                        EngineIntersectable *oi = static_cast<EngineIntersectable *>(obj);
+
+                        EntityContainer *entries = oi->GetItem();
+                        EntityContainer::const_iterator eit, eit_end = entries->end();
+
+                        for (eit = entries->begin(); eit != eit_end; ++ eit)
                         {
-                                EngineIntersectable *oi = static_cast<EngineIntersectable *>(obj);
-
-                                EntityContainer *entries = oi->GetItem();
-                                EntityContainer::const_iterator eit, eit_end = entries->end();
-
-                                for (eit = entries->begin(); eit != eit_end; ++ eit)
-                                {
-                                        (*eit)->setUserAny(Any((int)0));
-                                }
+                                (*eit)->setUserAny(Any((int)0));
                         }
                 }
@@ -1575 +1575 @@
         if (mViewCellsGeometryLoaded) return;
 
-        GtpVisibilityPreprocessor::ViewCellContainer viewCells = mViewCellsManager->GetViewCells();
+        GtpVisibilityPreprocessor::ViewCellContainer viewCells = 
+                mViewCellsManager->GetViewCells();
 
         GtpVisibilityPreprocessor::ViewCellContainer::const_iterator it, it_end = viewCells.end();
@@ -1582 +1583 @@
                 GtpVisibilityPreprocessor::ViewCell *viewCell = *it;
 
-                //std::stringstream str;
-                //str << "processing view cell with id : " << viewCell->GetId();
-                //LogManager::getSingleton().logMessage(str.str());
-                ManualObject *manual = OgreTypeConverter::ConvertToOgre(viewCell->GetMesh(), this);
+                ManualObject *manual = 
+                        OgreTypeConverter::ConvertToOgre(viewCell->GetMesh(), this);
                 
                 if (manual)