Changeset 1183 for GTP/trunk/Lib/Vis

Timestamp:

08/04/06 17:38:52 (18 years ago)

Author:

szydlowski

Message:

occlusion queries in kdtree scene manager working, but performance issues
many features still not implemented (e.g., visualization)

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreKdTree.h (modified) (8 diffs)
• src/OgreKdTree.cpp (modified) (11 diffs)
• src/OgreKdTreeSceneManager.cpp (modified) (7 diffs)
• src/OgreKdTreeSceneNode.cpp (modified) (2 diffs)

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

@@ -211 +211 @@
                         //virtual void cbInsert(KdTree * caller, KdRenderable * rend) = 0;
 
-                        WireBoundingBox * getWireBoundingBox()
+                        WireBoundingBox * getWireBoundingBox(bool node = true)
                         {
                                 if (mWBB == 0)
                                         mWBB = new WireBoundingBox();
 
-                                mWBB->setupBoundingBox(mAABB);
+                                if (node)
+                                        mWBB->setupBoundingBox(mAABB);
+                                else
+                                        mWBB->setupBoundingBox(mWorldAABB);
                                 
 #ifdef KDTREE_DEBUG
+                                SceneManager * sceneManager = Root::getSingleton()._getCurrentSceneManager();
                                 int level = -1;
                                 bool boxes = false;
-                                if (Root::getSingleton()._getCurrentSceneManager()->getOption("HighlightLevel",&level))
+                                if (sceneManager->getOption("HighlightLevel",&level))
                                 {
                                         if (mLevel == level)
@@ -232 +236 @@
                                         {
                                                 mWBB->setMaterial("BaseWhiteNoLighting");
-                                                if (Root::getSingleton()._getCurrentSceneManager()->getOption("ShowAllBoxes", &boxes))
+                                                if (sceneManager->getOption("ShowAllBoxes", &boxes))
                                                 {
                                                         if (boxes)
@@ -279 +283 @@
                         /** Updates bound of the real aabb of kdtree
                         */
-                        virtual void _updateBounds() = 0;
-
+                        virtual void _updateBounds(bool recurse = true) = 0;
 
                         Branch * mParent;
@@ -325 +328 @@
 
                         // branches do not posses geometry => just merge child aabbs
-                        virtual void _updateBounds()
+                        virtual void _updateBounds(bool recurse = true)
                         {
                                 // reset box
@@ -336 +339 @@
 
                                 // update parent recursively
-                                if (mParent)
-                                        mParent->_updateBounds();
+                                if (recurse && mParent)
+                                        mParent->_updateBounds(recurse);
                         }
                         
@@ -365 +368 @@
 
                         // update the world aabb based on the contained geometry
-                        virtual void _updateBounds();
+                        virtual void _updateBounds(bool recurse = true);
 
                         virtual void remove(KdRenderable * rend)
@@ -464 +467 @@
                 void dump(void);
                 Real calcCost(void);
+
+                /** Switches between displaying the bounding box of the node and
+                the box of the contained scene nodes
+                */
+                inline void setShowNodeAABB(bool show = true) { mShowNodeAABB = show; };
+                inline bool getShowNodeAABB(void) { return mShowNodeAABB; };
 
                 NodePtr getRoot(void) const { return mKdRoot; };
@@ -523 +532 @@
                 Stats mStats;
 
+                // show node or object aabb
+                bool mShowNodeAABB;
+
+
                 // DEBUG
                 void KdTree::dump(KdTree::Node * node);

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

@@ -329 +329 @@
         //----------------------------------------------------------------------------
 
-        KdTree::KdTree(int maxdepth): mMaxDepth(maxdepth), mKdRoot(0), mBuildMethod(KDBM_RECURSIVE), mBuildLog(0)
+        KdTree::KdTree(int maxdepth): 
+        mMaxDepth(maxdepth), 
+        mKdRoot(0), 
+        mBuildMethod(KDBM_RECURSIVE), 
+        mBuildLog(0), 
+        mShowNodeAABB(true)
         {
 #ifdef KDTREE_DEBUG
@@ -340 +345 @@
                         mp->setDiffuse(cv);
                 }
-                //try
-                //{
-                //      ColourValue cv(0.0, 1.0, 0.0);
-                //      MaterialPtr mp = MaterialManager::getSingleton().create("aabbHiLite","General");
-                //      mp->setSelfIllumination(cv);
-                //      mp->setDiffuse(cv);
-                //}
-                //catch (Ogre::Exception&)
-                //{
-                //      // SO FUCKING DON'T CARE !!!
-                //}
 #endif
                 try
@@ -871 +865 @@
                         ++ mStats.mNumNodes;
                         ++ mStats.mNumLeaves;
+                        // update bounding box
+                        leaf->_updateBounds(false);
                         return leaf;
                 }
@@ -957 +953 @@
                         // update stats
                         ++ mStats.mNumNodes;
+
+                        // update bounding box
+                        branch->_updateBounds(false);
+
 
                         //assert(branch->mRight || branch->mLeft);
@@ -1261 +1261 @@
                         }
 
+                        // update bounding boxes when geometry (leaf) was added
+                        if (newNode->isLeaf())
+                                newNode->_updateBounds();
+
                         //cleanup
                         OGRE_DELETE(sc.events);
@@ -1336 +1340 @@
                         WireBoundingBox * wbb = 0;
                         if (showBoxes)
-                                wbb = node->getWireBoundingBox();
+                                wbb = node->getWireBoundingBox(mShowNodeAABB);
 #endif
 
@@ -1357 +1361 @@
 #else
                                 if (showBoxes)
-                                        queue->addRenderable(leaf->getWireBoundingBox());
+                                        queue->addRenderable(leaf->getWireBoundingBox(mShowNodeAABB));
 #endif
                         }
@@ -1368 +1372 @@
 #else
                                 if (showBoxes)
-                                        queue->addRenderable(branch->getWireBoundingBox());
+                                        queue->addRenderable(branch->getWireBoundingBox(mShowNodeAABB));
 #endif
 
@@ -1469 +1473 @@
 
         // update the world aabb based on the contained geometry
-        void KdTree::Leaf::_updateBounds()
+        void KdTree::Leaf::_updateBounds(bool recurse)
         {
                 // reset box
@@ -1479 +1483 @@
                 while (it != end)
                 {
+                        //(*it)->_updateBounds();
                         mWorldAABB.merge((*it)->getBoundingBox());
                         it++;
@@ -1484 +1489 @@
 
                 // update parent recursively
-                if (mParent)
-                        mParent->_updateBounds();
+                if (recurse && mParent)
+                        mParent->_updateBounds(recurse);
         }
 } // namespace Ogre

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

@@ -59 +59 @@
 
 mHierarchyInterface = new KdTreeHierarchyInterface(this, mDestRenderSystem);
+
+// test
+//String chc = "CHC";
+//setOption("RenderMethod", &chc);
 }
 
@@ -240 +244 @@
                 return true;
         }
+        else if (strKey == "ShowNodeAABB")
+        {
+                bool sn = *static_cast<const bool *>(pValue);
+                if (mKdTree)
+                        mKdTree->setShowNodeAABB(sn);
+                return true;
+        }
+        // options for CHC
+        if (strKey == "UseDepthPass")
+        {
+                mUseDepthPass = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "PrepareVisualization")
+        {
+                mShowVisualization = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "RenderNodesForViz")
+        {
+                mRenderNodesForViz = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "RenderNodesContentForViz")
+        {
+                mRenderNodesContentForViz = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "SkyBoxEnabled")
+        {
+                mSkyBoxEnabled = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "SkyPlaneEnabled")
+        {
+                mSkyPlaneEnabled = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "SkyDomeEnabled")
+        {
+                mSkyDomeEnabled = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "VisualizeCulledNodes")
+        {
+                mVisualizeCulledNodes = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "DelayRenderTransparents")
+        {
+                mDelayRenderTransparents = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+
+        if (strKey == "DepthWrite")
+        {
+                mEnableDepthWrite = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "UseItemBuffer")
+        {
+                mUseItemBuffer = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "ExecuteVertexProgramForAllPasses")
+        { 
+                mExecuteVertexProgramForAllPasses  = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+        if (strKey == "RenderTransparentsForItemBuffer")
+        { 
+                mRenderTransparentsForItemBuffer  = (*static_cast<const bool *>(pValue));
+                return true;
+        }
+
 
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface)
@@ -270 +349 @@
         else if (strKey == "ShowAllBoxes")
         {
-                *static_cast<bool *>(pDestValue) = mShowAllBoxes;
+                if (mRenderMethod == KdTree::KDRM_INTERNAL)
+                        *static_cast<bool *>(pDestValue) = mShowAllBoxes;
+                else
+                        *static_cast<bool *>(pDestValue) = mVisualizeCulledNodes;
                 return true;
         }
@@ -308 +390 @@
                         return false;
                 }
+                return true;
+        }
+        else if (strKey == "ShowKdTree")
+        {
+                *static_cast<bool *>(pDestValue) = mShowBoxes;
+                return true;
+        }
+        else if (strKey == "ShowNodeAABB")
+        {
+                if (mKdTree)
+                        *static_cast<bool *>(pDestValue) = mKdTree->getShowNodeAABB();
+                else
+                        *static_cast<bool *>(pDestValue) = false;
                 return true;
         }
@@ -331 +426 @@
         refKeys.push_back("RenderMethod");
         refKeys.push_back("ShowKdTree");
+        refKeys.push_back("ShowNodeAABB");
         refKeys.push_back("TreeBox");
 #ifdef KDTREE_DEBUG
@@ -639 +735 @@
         while (it != end)
         {
-                (*it)->queueObjects(cam, getRenderQueue(), onlyShadowCasters);
+                if (!(*it)->isQueued(mHierarchyInterface->GetFrameId(), cam))
+                {
+                        (*it)->queueObjects(cam, getRenderQueue(), onlyShadowCasters);
+                }
                 it++;
         }
@@ -841 +940 @@
         }
         // add bounding boxes of rendered objects
-        if (0)
+        //if (0)
                 //for (BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it)
                 //{

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

@@ -12 +12 @@
 
 #include <OgreStringConverter.h>
+#include <OgreLogManager.h>
 
 namespace Ogre
@@ -140 +141 @@
         }
 
+        // recalculate the world aabb
         AxisAlignedBox KdTreeSceneNode::getBoundingBox() const
         {
+#if 0
+                AxisAlignedBox box;
+
+                // Update bounds from own attached objects
+                ObjectMap::const_iterator it = mObjectsByName.begin();
+                ObjectMap::const_iterator end = mObjectsByName.end();
+                for ( ; it != end ; ++it)
+                {
+                        // Merge world bounds of each object
+                        box.merge(it->second->getWorldBoundingBox(true));
+                }
+
+                if (box.getMinimum() != mWorldAABB.getMinimum() ||box.getMaximum() != mWorldAABB.getMaximum())
+                {
+                        try
+                        {
+                                Log * log = LogManager::getSingleton().getLog("KdTreeBuild.log");
+                                log->logMessage("mWorldAABB was not up to date");
+                        }
+                        catch (Exception)
+                        {
+                                // F.U.
+                        }
+                }
+
+                return box;
+#else
                 return mWorldAABB;
+#endif
         }