Changeset 1320 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreBvHierarchySceneNode.cpp

Timestamp:

09/04/06 08:56:26 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreBvHierarchySceneNode.cpp (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/src/OgreBvHierarchySceneNode.cpp) (11 diffs)

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

@@ -18 +18 @@
         // TRIVIA: this function is _not_ called for nodes which did not change since the last frame
         // only exception: the root node ... it's aabb should be null however, so we don't care
-        void KdTreeSceneNode::_updateBounds(void)
+        void BvHierarchySceneNode::_updateBounds(void)
         {
                 // Reset bounds first
@@ -33 +33 @@
                 if (!mWorldAABB.isNull())
                 {
-                        static_cast<KdTreeSceneManager *>(mCreator)->_updateNode(this);
+                        static_cast<BvHierarchySceneManager *>(mCreator)->_updateNode(this);
                 }
         }
 
-        void KdTreeSceneNode::computeScene(PlaneEventList& events, AxisAlignedBox& aabb, int& nObjects, bool includeChildren)
+        void BvHierarchySceneNode::computeScene(BvhPlaneEventList& events, AxisAlignedBox& aabb, int& nObjects, bool includeChildren)
         {
                 /**************************************************************************************/
                 /* HACK: do not include camera node, FUCKS UP world AABB really BAD, dunno why        */
-                /* TODO: find a generic solution where MOVABLE nodes are NOT INSERTED into the KDTREE */
+                /* TODO: find a generic solution where MOVABLE nodes are NOT INSERTED into the BvHierarchy */
                 /**************************************************************************************/
                 //if (mName == "PlayerCamNode")
@@ -55 +55 @@
                         if (getExcludedMovables().find(i->second->getMovableType()) == getExcludedMovables().end())
                         {
-                                //LogManager::getSingleton().getLog(KDTREE_LOGNAME)->logMessage("Adding movable type " + i->second->getMovableType() + " to KdTree");
+                                //LogManager::getSingleton().getLog(BvHierarchy_LOGNAME)->logMessage("Adding movable type " + i->second->getMovableType() + " to BvHierarchy");
                                 // Merge world bounds of each object
                                 mWorldAABB.merge(i->second->getWorldBoundingBox(true));
@@ -61 +61 @@
                 }
 
-                // create information for KdTree/SAH
+                // create information for BvHierarchy/SAH
                 if (!mWorldAABB.isNull())
                 {
@@ -71 +71 @@
 
                         // generate events
-                        PlaneEvent::Dimension axes[] = 
-                                {PlaneEvent::PED_X, PlaneEvent::PED_Y, PlaneEvent::PED_Z};
+                        BvhPlaneEvent::Dimension axes[] = 
+                                {BvhPlaneEvent::PED_X, BvhPlaneEvent::PED_Y, BvhPlaneEvent::PED_Z};
                         Vector3 min = mWorldAABB.getMinimum();
                         Vector3 max = mWorldAABB.getMaximum();
@@ -80 +80 @@
                                 if (min[i] == max[i])
                                 {       
-                                        //e = new PlaneEvent(this, min, axes[i], PlaneEvent::PET_ON);
+                                        //e = new BvhPlaneEvent(this, min, axes[i], BvhPlaneEvent::PET_ON);
                                         //sceneinfo.events.push_back(*e);
-                                        events.push_back(PlaneEvent(this, min, axes[i], PlaneEvent::PET_ON));
+                                        events.push_back(BvhPlaneEvent(this, min, axes[i], BvhPlaneEvent::PET_ON));
                                 }
                                 else
                                 {
-                                        //e = new PlaneEvent(this, min, axes[i], PlaneEvent::PET_START);
+                                        //e = new BvhPlaneEvent(this, min, axes[i], BvhPlaneEvent::PET_START);
                                         //sceneinfo.events.push_back(*e);
-                                        //e = new PlaneEvent(this, max, axes[i], PlaneEvent::PET_END);
+                                        //e = new BvhPlaneEvent(this, max, axes[i], BvhPlaneEvent::PET_END);
                                         //sceneinfo.events.push_back(*e);
-                                        events.push_back(PlaneEvent(this, min, axes[i], PlaneEvent::PET_START));
-                                        events.push_back(PlaneEvent(this, max, axes[i], PlaneEvent::PET_END));
+                                        events.push_back(BvhPlaneEvent(this, min, axes[i], BvhPlaneEvent::PET_START));
+                                        events.push_back(BvhPlaneEvent(this, max, axes[i], BvhPlaneEvent::PET_END));
                                 }
                         }
@@ -102 +102 @@
                         for (child = mChildren.begin(); child != mChildren.end(); ++child)
                         {
-                                KdTreeSceneNode* sceneChild = static_cast<KdTreeSceneNode*>(child->second);
+                                BvHierarchySceneNode* sceneChild = static_cast<BvHierarchySceneNode*>(child->second);
                                 sceneChild->computeScene(events, aabb, nObjects);
                         }
@@ -108 +108 @@
         }
 
-        //void KdTreeSceneNode::_findVisibleObjects(Camera* cam, RenderQueue* queue, 
+        //void BvHierarchySceneNode::_findVisibleObjects(Camera* cam, RenderQueue* queue, 
         //      bool includeChildren, bool displayNodes, bool onlyShadowCasters)
-        void KdTreeSceneNode::queueObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters)
+        void BvHierarchySceneNode::queueObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters)
         {
                 //SceneNode::_findVisibleObjects(cam, queue, includeChildren, displayNodes, onlyShadowCasters);
@@ -136 +136 @@
         }
 
-        void KdTreeSceneNode::getGeometryList(GtpVisibility::GeometryVector *geometryList)
+        void BvHierarchySceneNode::getGeometryList(GtpVisibility::GeometryVector *geometryList)
         {
                 SceneNode::ObjectIterator objIt = getAttachedObjectIterator();
@@ -154 +154 @@
 
         // recalculate the world aabb
-        AxisAlignedBox KdTreeSceneNode::getBoundingBox(void) const
+        AxisAlignedBox BvHierarchySceneNode::getBoundingBox(void) const
         {
                 return mWorldAABB;
         }
 
-        KdTreeSceneNode::StringSet& KdTreeSceneNode::getExcludedMovables(void)
+        BvHierarchySceneNode::StringSet& BvHierarchySceneNode::getExcludedMovables(void)
         {
                 static StringSet sExluded;
@@ -175 +175 @@
 
         // DEBUG
-        String KdTreeSceneNode::dumpToString(void)
+        String BvHierarchySceneNode::dumpToString(void)
         {
                 String objects;