Changeset 1203 for GTP/trunk/Lib

Timestamp:

08/13/06 21:40:58 (18 years ago)

Author:

szydlowski

Message:

certain types of movableobject (camera, frustum, light) now excluded from tree building, list is extensible

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE

Files:

• include/OgreKdTree.h (modified) (1 diff)
• include/OgreKdTreeSceneManager.h (modified) (1 diff)
• include/OgreKdTreeSceneNode.h (modified) (2 diffs)
• src/OgreKdTree.cpp (modified) (1 diff)
• src/OgreKdTreeSceneNode.cpp (modified) (4 diffs)

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

@@ -17 +17 @@
 #define KDBRANCHPTR_CAST(a) (static_cast<KdTree::Branch *>(a))
 #define KDLEAFPTR_CAST(a) (static_cast<KdTree::Leaf *>(a))
+
+#define KDTREE_LOGNAME "KdTreeBuild.log"
 
 #include <OgreAxisAlignedBox.h>

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

@@ -22 +22 @@
 
 class KdTreeSceneNode;
-//class WireBoundingBox;
 
 class KdTreeSceneManager : public SceneManager

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

@@ -28 +28 @@
                 ~KdTreeSceneNode() {};
 
-                // calculate all-enclosing AABB, similar to _updateBounds()
-                void forceComputeAABB(AxisAlignedBox& aabb); // OBSOLETE !!
-
                 // gather info for kd-tree creation
                 virtual void computeScene(PlaneEventList& events, AxisAlignedBox& aabb, int& nObjects, bool includeChildren = true);
@@ -41 +38 @@
 
                 // return a bounding box enclosing all objects
-                virtual AxisAlignedBox getBoundingBox() const;
-
-                // custom render op, show bounding box instead of axes
-                //virtual void getRenderOperation(RenderOperation& op);
-
-                //virtual void _findVisibleObjects(Camera* cam, RenderQueue* queue, 
-                //      bool includeChildren = true, bool displayNodes = false, bool onlyShadowCasters = false);
+                virtual AxisAlignedBox getBoundingBox(void) const;
 
                 // DEBUG
-                String dumpToString();
+                String dumpToString(void);
         protected:
                 virtual void _updateBounds(void);
 
-                //AxisAlignedBox mLocalAABB;
+                typedef std::set<String> StringSet;
+
+                static StringSet& getExcludedMovables(void);
         };
 

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

@@ -21 +21 @@
 #include <OgreMaterialManager.h>
 
-#define KDTREE_LOGNAME "KdTreeBuild.log"
 #define PLT_SIZE 101
 

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

@@ -43 +43 @@
                 /* TODO: find a generic solution where MOVABLE nodes are NOT INSERTED into the KDTREE */
                 /**************************************************************************************/
-                if (mName == "PlayerCamNode")
-                        return;
+                //if (mName == "PlayerCamNode")
+                //      return;
 
                 // first compute nodes AABB
@@ -52 +52 @@
                 for (i = mObjectsByName.begin(); i != mObjectsByName.end(); ++i)
                 {
-                        // Merge world bounds of each object
-                        mWorldAABB.merge(i->second->getWorldBoundingBox(true));
+                        // ignore objects with no actual geometry like frustums & lights
+                        if (getExcludedMovables().find(i->second->getMovableType()) == getExcludedMovables().end())
+                        {
+                                //LogManager::getSingleton().getLog(KDTREE_LOGNAME)->logMessage("Adding movable type " + i->second->getMovableType() + " to KdTree");
+                                // Merge world bounds of each object
+                                mWorldAABB.merge(i->second->getWorldBoundingBox(true));
+                        }
                 }
 
+                // create information for KdTree/SAH
                 if (!mWorldAABB.isNull())
                 {
                         // merge aabb with global AABB
                         aabb.merge(mWorldAABB);
+
                         // increase object count
                         nObjects++;
@@ -68 +75 @@
                         Vector3 min = mWorldAABB.getMinimum();
                         Vector3 max = mWorldAABB.getMaximum();
-                        //PlaneEvent * e;
                         for (int i = 0; i < 3; i++)
                         {
@@ -148 +154 @@
 
         // recalculate the world aabb
-        AxisAlignedBox KdTreeSceneNode::getBoundingBox() const
+        AxisAlignedBox KdTreeSceneNode::getBoundingBox(void) const
         {
-#if 0
-                AxisAlignedBox box;
+                return mWorldAABB;
+        }
 
-                // Update bounds from own attached objects
-                ObjectMap::const_iterator it = mObjectsByName.begin();
-                ObjectMap::const_iterator end = mObjectsByName.end();
-                for ( ; it != end ; ++it)
+        KdTreeSceneNode::StringSet& KdTreeSceneNode::getExcludedMovables(void)
+        {
+                static StringSet sExluded;
+
+                // initialise once
+                if (sExluded.empty())
                 {
-                        // Merge world bounds of each object
-                        box.merge(it->second->getWorldBoundingBox(true));
+                        sExluded.insert("Camera");
+                        sExluded.insert("Frustum");
+                        sExluded.insert("Light");
                 }
 
-                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
+                return sExluded;
         }
 
-        //void KdTreeSceneNode::getRenderOperation(RenderOperation& op)
-        //{
-        //      if (mWireBoundingBox == NULL) 
-        //      {
-        //              mWireBoundingBox = new WireBoundingBox();
-        //      }
-
-        //      mWireBoundingBox->setupBoundingBox(mWorldAABB);
-        //      mWireBoundingBox->getRenderOperation(op);
-        //}
-
         // DEBUG
-        String KdTreeSceneNode::dumpToString()
+        String KdTreeSceneNode::dumpToString(void)
         {
                 String objects;