Changeset 1183 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include

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)

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTree.h (modified) (8 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);