Changeset 139 for trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp

Timestamp:

06/20/05 08:13:57 (19 years ago)

Author:

mattausch

Message:

fixed bug with tight octree boxes
added more flexible renderqueue (can delete per flag)
reordered functions in visibility terrain scene manager

File:

• trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp (modified) (6 diffs)

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp

@@ -36 +36 @@
 #include <OgreOctree.h>
 #include <OgreOctreeNode.h>
+#include <OgreLogManager.h>
 
 namespace Ogre
@@ -109 +110 @@
                 mDepth = 0;
 
+        _updateBounds();
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
     mNumNodes = 0;
@@ -175 +177 @@
         //mWireBoundingBox->setupBoundingBox(mBox);
         mWireBoundingBox->setupBoundingBox(mWorldAABB);
+
     return mWireBoundingBox;
 }
@@ -229 +232 @@
         // Reset bounds first
     mWorldAABB.setNull();
-
+  
     // Update bounds from own attached objects
         NodeList::iterator it, it_end;
@@ -247 +250 @@
             for (int k = 0; k < 2; ++k)
             {
-                if (mChildren[i][j][k] != 0)
+                if (mChildren[i][j][k])
                                 {
                                         mWorldAABB.merge(mChildren[i][j][k]->_getWorldAABB());
@@ -254 +257 @@
         }
         }
+        // HACK: clamp to bounds
+        AxisAlignedBox box;
+        _getCullBounds(&box);
+        mWorldAABB = mWorldAABB.intersection(box); 
+        
+        //std::stringstream d; d << "updating box: " << mWorldAABB << ", depth: " << mDepth << "null: " << mBox.isNull();
+        //LogManager::getSingleton().logMessage(d.str());
+
         // recursively update parent bounds
         if (mParent)