Changeset 1606 for GTP/trunk/Lib

Timestamp:

10/10/06 20:28:28 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h (modified) (1 diff)
• OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (4 diffs)
• Preprocessing/src/ViewCellsManager.cpp (modified) (1 diff)

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

@@ -210 +210 @@
         /// If view cells are used.
         bool mUseViewCells;
+
+        /// if view cells visualization should be shown
+        bool mShowViewCells;
 
         /// if the view cells are filtered

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

@@ -52 +52 @@
 mElementaryViewCell(NULL),
 mDeleteQueueAfterRendering(true),
-mNormalExecution(false)
+mNormalExecution(false),
+mShowViewCells(false)
 {
         Ogre::LogManager::getSingleton().logMessage("creating occlusion culling scene manager");
@@ -178 +179 @@
     if (mCurrentViewCell && mCurrentViewCell->GetMesh())
         {
-                const bool showSingleViewCell = true;
-                if (showSingleViewCell)
+                //const bool showSingleViewCell = true;
+                if (!mShowViewCells)
                 {
                         const int id = mCurrentViewCell->GetId();
                         mViewCellsGeometry[id]->_updateRenderQueue(getRenderQueue());
-
-                        GtpVisibilityPreprocessor::ObjectPvsMap::const_iterator oit, oit_end = mCurrentViewCell->GetPvs().mEntries.end();
-                        
-                        for (oit = mCurrentViewCell->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
-                        {
-                                OgreMeshInstance *obj = static_cast<OgreMeshInstance *>((*oit).first);
-                obj->GetEntity()->_updateRenderQueue(getRenderQueue());
-                        }       
                 }
                 else
@@ -201 +194 @@
                         }       
                 }
+
+                GtpVisibilityPreprocessor::ObjectPvsMap::const_iterator 
+                        oit, oit_end = mCurrentViewCell->GetPvs().mEntries.end();
+                        
+                for (oit = mCurrentViewCell->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+                {
+                        OgreMeshInstance *obj = static_cast<OgreMeshInstance *>((*oit).first);
+                        obj->GetEntity()->_updateRenderQueue(getRenderQueue());
+                }       
         }
 /*
@@ -638 +640 @@
                 if (mViewCellsLoaded)
                 {
-                        bool showViewCells = *static_cast<const bool *>(val);
+                        mShowViewCells = *static_cast<const bool *>(val);
                         // if we decide use view cells
                         // all objects are set to invisible per default
-                        VisualizeViewCells(showViewCells);
+                        VisualizeViewCells(mShowViewCells);
                 }
 

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -2488 +2488 @@
 
         ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(root);
+
+        // reset interior pvs
         interior->GetPvs().Clear();
+        // reset recursive pvs
         pvs.Clear();
         vector<ObjectPvs> pvsList;