Changeset 1251 for GTP/trunk/Lib/Vis/OnlineCullingCHC

Timestamp:

08/21/06 18:39:49 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/include/OgreKdTreeSceneManager.h (modified) (2 diffs)
• OGRE/include/OgreOcclusionCullingSceneManager.h (modified) (1 diff)
• OGRE/src/OgreKdTreeSceneManager.cpp (modified) (5 diffs)
• OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (9 diffs)
• include/QueryManager.h (modified) (1 diff)

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

@@ -228 +228 @@
         // if transparents are skipped during rendering
         bool mSkipTransparents;
-
         // the item buffer pass (render items color-coded)
         Pass *mItemBufferPass;
@@ -239 +238 @@
         //KdRenderableList mVisibleNodes;
         KdTree::NodeList mVisibleNodes;
+
+        bool mDeleteQueueAfterRendering;
 
         /************************************************************************/

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

@@ -205 +205 @@
         /// if the view cells are filtered
         bool mUseVisibilityFilter;
+
+        bool mDeleteQueueAfterRendering;
 };
 

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

@@ -49 +49 @@
 mRenderTransparentsForItemBuffer(true),
 mExecuteVertexProgramForAllPasses(false),
-mIsHierarchicalCulling(false)
+mIsHierarchicalCulling(false),
+mDeleteQueueAfterRendering(true)
 {
         // Replace root node with my node
@@ -731 +732 @@
 
                         // delete remaining renderables from queue:
-                        // all which are not in mLeavePassesInQueue)
+                        // all which are not in mLeavePassesInQueue
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
                         _deleteRenderedQueueGroups(mLeavePassesInQueue);
@@ -744 +745 @@
                         mLeavePassesInQueue = 0;
 
-#if 1   
                         // add visible nodes found by the visibility culling algorithm
                         if (mUseDepthPass)
                         {
-                                //KdRenderableList::const_iterator it, it_end = mVisibleNodes.end();
-
-                                ////getRenderQueue()->clear();
-                                //for (it = mVisibleNodes.begin(); it != it_end; ++ it)
-                                //{
-                                //      (*it)->queueObjects(mCameraInProgress, getRenderQueue(), false);
-                                //}
                                 KdTree::NodeList::const_iterator it, end = mVisibleNodes.end();
                                 for (it = mVisibleNodes.begin(); it != end; it++)
@@ -762 +755 @@
                                 }
                         }
-#endif
+
                         //-- now we can render all remaining queue objects
                         //-- used for depth pass, transparents, overlay
@@ -774 +767 @@
                 setAmbientLight(savedAmbient);
 
-                getRenderQueue()->clear(); // finally clear render queue
-                if (1) OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
+                if (!mDeleteQueueAfterRendering)
+                        getRenderQueue()->clear(); // finally clear render queue
+                else
+                        OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
 
                 if (0) WriteLog(); // write out stats

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

@@ -53 +53 @@
 mUseVisibilityFilter(false),
 mCurrentViewCell(NULL),
-mElementaryViewCell(NULL)
+mElementaryViewCell(NULL),
+mDeleteQueueAfterRendering(true)
 {
         mHierarchyInterface = new OctreeHierarchyInterface(this, mDestRenderSystem);
@@ -267 +268 @@
 
         //-- set actual pass here
+
         const Pass *result = SceneManager::_setPass(usedPass);
 
@@ -360 +362 @@
         else //-- the hierarchical culling algorithm
         {
-                // this is also called in TerrainSceneManager: really
-                // nexessary?
+                // note matt: this is also called in TerrainSceneManager: really necessary?
                 mDestRenderSystem -> setLightingEnabled(false);
 
@@ -417 +418 @@
 #endif
 
-                //-- reset parameters
+                //-- reset parameters needed for special rendering
+                
                 mIsDepthPassPhase = false;
                 mIsItemBufferPhase = false;
@@ -425 +427 @@
                 mLeavePassesInQueue = 0;
                 
-#if 1   
                 // add visible nodes found by the visibility culling algorithm
                 if (mUseDepthPass)
@@ -437 +438 @@
                         }
                 }
-#endif  
                 //-- now we can render all remaining queue objects
                 //-- used for depth pass, transparents, overlay
@@ -443 +443 @@
 
                 TerrainSceneManager::_renderVisibleObjects();
-        } // hierarchical culling
+        } // end hierarchical culling
                 
         // HACK: set the new render level index, important to avoid cracks
@@ -452 +452 @@
         setAmbientLight(savedAmbient);
 
-        getRenderQueue()->clear(); // finally clear render queue
-        if (1) OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
+        if (!mDeleteQueueAfterRendering)
+                getRenderQueue()->clear(); // finally clear render queue
+        else
+                OGRE_DELETE(mRenderQueue); // HACK: should rather only be cleared ...
+
         if (0) WriteLog(); // write out stats
 }
@@ -519 +522 @@
                 return true;
         }
-
         if (key == "DepthWrite")
         {

GTP/trunk/Lib/Vis/OnlineCullingCHC/include/QueryManager.h

@@ -83 +83 @@
         */
     virtual bool
-    ShootRay(const Ray &ray,
+                ShootRay(const Ray &ray,
              std::vector<Mesh *> *visibleMeshes,
              bool isGlobalLine = false