Changeset 2555 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOctreeHierarchyInterface.cpp

Timestamp:

10/05/07 15:36:52 (17 years ago)

Author:

mattausch

Message:

added partial implementation of chc++. problem: bounding box rendering in Ogre is VERY slow

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOctreeHierarchyInterface.cpp (modified) (2 diffs)

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

@@ -32 +32 @@
                 Octree *nextChild;
 
-                for (int z = 0; z < 2; ++ z)
-                {       
-                        for (int y = 0; y < 2; ++ y)
-                        {
-                                for (int x = 0; x < 2; ++ x)
-                                {
-                                        nextChild = octree->mChildren[x][y][z];
-        
-                                        if (nextChild)
-                        GetQueue()->push(nextChild);
-                                }
-            }
-        }
+                nextChild = octree->mChildren[0][0][0]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[1][0][0]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[0][1][0]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[1][1][0]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[0][0][1]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[1][0][1]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[0][1][1]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[1][1][1]; if (nextChild) GetQueue()->push(nextChild);
+        }
+}
+//-----------------------------------------------------------------------
+void OctreeHierarchyInterface::TraverseNode2(GtpVisibility::HierarchyNode *node)
+{
+        ++ mNumTraversedNodes;
+
+        Octree *octree = static_cast<Octree *>(node);
+
+        // if we come across some renderable geometry => render it
+        if (!octree->mNodes.empty())
+        {
+                AddToQueue(node);
+        }
+        
+        // if not all subtrees are empty
+        if (!IsLeaf(node))
+        {
+                Octree *nextChild;
+
+                nextChild = octree->mChildren[0][0][0]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[1][0][0]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[0][1][0]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[1][1][0]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[0][0][1]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[1][0][1]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[0][1][1]; if (nextChild) GetQueue()->push(nextChild);
+                nextChild = octree->mChildren[1][1][1]; if (nextChild) GetQueue()->push(nextChild);
         }
 }
@@ -195 +218 @@
         if (octant->lastRendered() != mFrameId)
         {
+                mTestMode = false;
+
                 octant->setLastRendered(mFrameId);
                 OctreeSceneManager *ocm = 
                         static_cast<OctreeSceneManager *>(mSceneManager);
 
-                ocm->_renderOctant(mCamera, 
+                ocm->_addOctantToQueue(mCamera, 
                                                    octant, 
                                                    mOnlyShadowCasters, 
                                                    mLeavePassesInQueue);
 
+                ocm->_renderOctant(mLeavePassesInQueue);
+
                 mVisibleNodes.push_back(node);
         }
+#endif  
+}
+//-----------------------------------------------------------------------
+void OctreeHierarchyInterface::AddToQueue(GtpVisibility::HierarchyNode *node)
+{
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        Octree *octant = static_cast<Octree *>(node);
+
+        if (octant->lastRendered() != mFrameId)
+        {
+                OctreeSceneManager *ocm = 
+                        static_cast<OctreeSceneManager *>(mSceneManager);
+
+                octant->setLastRendered(mFrameId);
+
+                ocm->_addOctantToQueue(mCamera, 
+                                                   octant, 
+                                                   mOnlyShadowCasters, 
+                                                   mLeavePassesInQueue);
+
+                mVisibleNodes.push_back(node);
+        }
+#endif  
+}
+//-----------------------------------------------------------------------
+void OctreeHierarchyInterface::RenderQueue()
+{
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        mTestMode = false;
+
+        OctreeSceneManager *ocm = 
+                        static_cast<OctreeSceneManager *>(mSceneManager);
+        ocm->_renderOctant(mLeavePassesInQueue);
 #endif  
 }