Changeset 1318

Timestamp:

09/04/06 00:18:05 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• GtpVisibility.sln (modified) (10 diffs)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchy.h (modified) (14 diffs)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchyCamera.h (added)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchyInterface.h (added)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchySceneManager.h (added)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchySceneNode.h (modified) (2 diffs)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvRenderable.h (added)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchy.cpp (modified) (28 diffs)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchyCamera.cpp (added)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchyInterface.cpp (added)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchySceneManager.cpp (added)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchySceneNode.cpp (added)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvhSceneManagerDll.cpp (added)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/Plugin_BvhSceneManager.dsp (added)
• OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/Plugin_BvhSceneManager.vcproj (added)
• OnlineCullingCHC/OGRE/misc/OgreBvHierarchySceneManager.def (added)

GTP/trunk/Lib/Vis/GtpVisibility.sln

@@ -41 +41 @@
         EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_BvhSceneManager", "OnlineCullingCHC\OGRE\BvHierarchySceneManager\src\Plugin_BvhSceneManager.vcproj", "{80DECC17-BDDD-4412-8CF8-F7C1C17A7436}"
+        ProjectSection(ProjectDependencies) = postProject
+        EndProjectSection
+EndProject
 Global
         GlobalSection(SolutionConfiguration) = preSolution
                 Debug = Debug
                 Debug Static = Debug Static
+                mlrt = mlrt
                 Release = Release
                 Release Internal = Release Internal
@@ -54 +59 @@
                 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Debug Static.ActiveCfg = Debug|Win32
                 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Debug Static.Build.0 = Debug|Win32
+                {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.mlrt.ActiveCfg = mlrt|Win32
+                {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.mlrt.Build.0 = mlrt|Win32
                 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release.ActiveCfg = Release|Win32
                 {935D1BDD-41B0-49F1-A86C-EB49B94DDB20}.Release.Build.0 = Release|Win32
@@ -64 +71 @@
                 {101A7691-74F3-48B4-96A3-CF35578F5900}.Debug Static.ActiveCfg = Debug|Win32
                 {101A7691-74F3-48B4-96A3-CF35578F5900}.Debug Static.Build.0 = Debug|Win32
+                {101A7691-74F3-48B4-96A3-CF35578F5900}.mlrt.ActiveCfg = mlrt|Win32
+                {101A7691-74F3-48B4-96A3-CF35578F5900}.mlrt.Build.0 = mlrt|Win32
                 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release.ActiveCfg = Release|Win32
                 {101A7691-74F3-48B4-96A3-CF35578F5900}.Release.Build.0 = Release|Win32
@@ -74 +83 @@
                 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug Static.ActiveCfg = Debug|Win32
                 {7319E499-473D-4CE5-9983-725D6E68A55D}.Debug Static.Build.0 = Debug|Win32
+                {7319E499-473D-4CE5-9983-725D6E68A55D}.mlrt.ActiveCfg = mlrt|Win32
+                {7319E499-473D-4CE5-9983-725D6E68A55D}.mlrt.Build.0 = mlrt|Win32
                 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release.ActiveCfg = Release|Win32
                 {7319E499-473D-4CE5-9983-725D6E68A55D}.Release.Build.0 = Release|Win32
@@ -84 +95 @@
                 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug Static.ActiveCfg = Debug|Win32
                 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug Static.Build.0 = Debug|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.mlrt.ActiveCfg = mlrt|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.mlrt.Build.0 = mlrt|Win32
                 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release.ActiveCfg = Release|Win32
                 {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release.Build.0 = Release|Win32
@@ -94 +107 @@
                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Debug Static.ActiveCfg = Debug|Win32
                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Debug Static.Build.0 = Debug|Win32
+                {EABCE292-D598-4600-A1C9-2591E7D62FDA}.mlrt.ActiveCfg = mlrt|Win32
+                {EABCE292-D598-4600-A1C9-2591E7D62FDA}.mlrt.Build.0 = mlrt|Win32
                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release.ActiveCfg = Release|Win32
                 {EABCE292-D598-4600-A1C9-2591E7D62FDA}.Release.Build.0 = Release|Win32
@@ -104 +119 @@
                 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug Static.ActiveCfg = Debug|Win32
                 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Debug Static.Build.0 = Debug|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.mlrt.ActiveCfg = mlrt|Win32
+                {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.mlrt.Build.0 = mlrt|Win32
                 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release.ActiveCfg = Release|Win32
                 {69BC58F0-C7EB-4B43-B782-B6F047EF0528}.Release.Build.0 = Release|Win32
@@ -114 +131 @@
                 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Debug Static.ActiveCfg = Debug|Win32
                 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Debug Static.Build.0 = Debug|Win32
+                {248F19A6-2FE0-4F5D-8928-E0EA10609887}.mlrt.ActiveCfg = mlrt|Win32
+                {248F19A6-2FE0-4F5D-8928-E0EA10609887}.mlrt.Build.0 = mlrt|Win32
                 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release.ActiveCfg = Release|Win32
                 {248F19A6-2FE0-4F5D-8928-E0EA10609887}.Release.Build.0 = Release|Win32
@@ -124 +143 @@
                 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Debug Static.ActiveCfg = Debug|Win32
                 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Debug Static.Build.0 = Debug|Win32
+                {17F2C6F9-6101-430E-ABF4-71383868EF24}.mlrt.ActiveCfg = mlrt|Win32
+                {17F2C6F9-6101-430E-ABF4-71383868EF24}.mlrt.Build.0 = mlrt|Win32
                 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release.ActiveCfg = Release|Win32
                 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release.Build.0 = Release|Win32
@@ -130 +151 @@
                 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release Static.ActiveCfg = Release|Win32
                 {17F2C6F9-6101-430E-ABF4-71383868EF24}.Release Static.Build.0 = Release|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug.ActiveCfg = Debug|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug.Build.0 = Debug|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug Static.ActiveCfg = Debug|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Debug Static.Build.0 = Debug|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.mlrt.ActiveCfg = mlrt|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.mlrt.Build.0 = mlrt|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release.ActiveCfg = Release|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release.Build.0 = Release|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Internal.ActiveCfg = Release Internal|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Internal.Build.0 = Release Internal|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Static.ActiveCfg = Release Internal|Win32
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}.Release Static.Build.0 = Release Internal|Win32
+
         EndGlobalSection
         GlobalSection(ExtensibilityGlobals) = postSolution

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchy.h

@@ -8 +8 @@
 */
 
-#ifndef _OgreKdTree_H__
-#define _OgreKdTree_H__
+#ifndef _OgreBvHierarchy_H__
+#define _OgreBvHierarchy_H__
 
 #define KDNODE_CAST(a) (static_cast<KdTree::Node>(a))
@@ -29 +29 @@
 #include <stack>
 
-#include "OgreKdTreeCamera.h"
+#include "OgreBvHierarchyCamera.h"
 #include "HierarchyInterface.h"
 
@@ -35 +35 @@
 namespace Ogre
 {
-        class KdTreeCamera;
-        class KdRenderable;
+        class BvHierarchyCamera;
+        class BvRenderable;
         struct SplitInfo;
 
@@ -66 +66 @@
                 { };
 
-                PlaneEvent(KdRenderable *rend, const Vector3& pos, PlaneEvent::Dimension dim, PlaneEvent::Type type):
+                PlaneEvent(BvRenderable *rend, const Vector3& pos, PlaneEvent::Dimension dim, PlaneEvent::Type type):
                         mRenderable(rend), mPosition(pos), mDimension(dim), mType(type) 
                 { };
@@ -125 +125 @@
                 }
 
-                KdRenderable * getRenderable() const //??
+                BvRenderable * getRenderable() const //??
                 {
                         return mRenderable;
@@ -139 +139 @@
         protected:
                 // event info
-                KdRenderable *                  mRenderable;
+                BvRenderable *                  mRenderable;
                 Vector3                                 mPosition;
                 PlaneEvent::Dimension   mDimension;
@@ -186 +186 @@
 
         typedef std::list<PlaneEvent> PlaneEventList;
-        typedef std::list<KdRenderable *> KdRenderableList;
+        typedef std::list<BvRenderable *> BvRenderableList;
         
         class KdTree
@@ -397 +397 @@
 
                         // a leaf is empty when it does not posses renderables
-                        virtual bool isEmpty() const { return mKdRenderables.empty(); }
+                        virtual bool isEmpty() const { return mBvRenderables.empty(); }
 
                         // a leaf has geometry when it has renderables
-                        virtual bool hasGeometry() const { return !mKdRenderables.empty(); }
+                        virtual bool hasGeometry() const { return !mBvRenderables.empty(); }
 
                         // a leaf adds itself to the leaf set
@@ -417 +417 @@
                         virtual void _updateBounds(bool recurse = true);
 
-                        virtual void remove(KdRenderable * rend)
-                        {
-                                mKdRenderables.remove(rend);
-                                //mKdRenderables.erase(find(mKdRenderables.begin(), mKdRenderables.end(), rend));
+                        virtual void remove(BvRenderable * rend)
+                        {
+                                mBvRenderables.remove(rend);
+                                //mBvRenderables.erase(find(mBvRenderables.begin(), mBvRenderables.end(), rend));
                         };
 
-                        virtual void insert(KdRenderable * rend)
-                        {
-                                mKdRenderables.push_back(rend);
+                        virtual void insert(BvRenderable * rend)
+                        {
+                                mBvRenderables.push_back(rend);
                         };
 
-                        KdRenderableList mKdRenderables;
+                        BvRenderableList mBvRenderables;
                 };
 
@@ -562 +562 @@
 
                 // insert a new scene node into an existing kd-tree
-                void insert(KdRenderable * rend);
+                void insert(BvRenderable * rend);
                 // remove a scene node from the tree
-                void remove(KdRenderable * rend);
+                void remove(BvRenderable * rend);
                 // function to initialize a kd-tree based on the contents of the scene
-                void build(KdRenderable * sceneRoot);
+                void build(BvRenderable * sceneRoot);
 
                 // test visibility of objects and add to render queue
-                void queueVisibleObjects(KdTreeCamera* cam, RenderQueue* queue, bool onlyShadowCasters, 
+                void queueVisibleObjects(BvHierarchyCamera* cam, RenderQueue* queue, bool onlyShadowCasters, 
                         bool showBoxes, KdTree::NodeList& visibleNodes);
 
@@ -594 +594 @@
                 void init();
                 // recursive insert funciton
-                void recInsert(KdTree::Node * node, KdRenderable * rend);
+                void recInsert(KdTree::Node * node, BvRenderable * rend);
                 // helper functions for insert
-                void recInsertNew(KdTree::Branch * parent, PlaneEvent::Side side, KdRenderable * rend);
+                void recInsertNew(KdTree::Branch * parent, PlaneEvent::Side side, BvRenderable * rend);
                 void splitBox(const KdTree::Branch& parent, AxisAlignedBox& left, AxisAlignedBox& right);
-                void rebuildSubtree(KdTree::Node * node, KdRenderable * rend);
+                void rebuildSubtree(KdTree::Node * node, BvRenderable * rend);
                 // build scene from a list of nodes rather than a hierarchy
-                KdTree::Node * buildFromList(KdRenderableList& nodelist, KdTree::Branch * parent, AxisAlignedBox& aabb);
-                void addRendToList(KdTree::Node * node, KdRenderableList& nodelist);
+                KdTree::Node * buildFromList(BvRenderableList& nodelist, KdTree::Branch * parent, AxisAlignedBox& aabb);
+                void addRendToList(KdTree::Node * node, BvRenderableList& nodelist);
 
                 // recursively delete empty nodes
@@ -615 +615 @@
 
                 // recursive rendering function
-                void recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, KdTreeCamera* cam,
+                void recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, BvHierarchyCamera* cam,
                         RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, 
                         KdTree::NodeList& visibleNodes, bool fullVis = false);
@@ -659 +659 @@
                 // allows choosing between regular vis (NONE/PART, same es isVisible)
                 // and enhaced vis (NONE/PART/FULL) for early traversal abort
-                KdTreeCamera::NodeVisibility (KdTreeCamera::*getVisibility)(const AxisAlignedBox& box) const;
+                BvHierarchyCamera::NodeVisibility (BvHierarchyCamera::*getVisibility)(const AxisAlignedBox& box) const;
 
                 // DEBUG
@@ -668 +668 @@
 } // namespace Ogre
 
-#endif // _OgreKdTree_H__
+#endif // _OgreBvHierarchy_H__

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchySceneNode.h

@@ -8 +8 @@
 */
 
-#ifndef _OgreKdTreeSceneNode_H__
-#define _OgreKdTreeSceneNode_H__
+#ifndef _OgreBvHierarchySceneNode_H__
+#define _OgreBvHierarchySceneNode_H__
 
 #include <OgreSceneNode.h>
-#include "OgreKdRenderable.h"
+#include "OgreBvRenderable.h"
 
 namespace Ogre
 {
 
-        class KdTreeSceneNode : public SceneNode, public KdRenderable
+        class KdTreeSceneNode : public SceneNode, public BvRenderable
         {
         public:
@@ -52 +52 @@
 } // namespace Ogre
 
-#endif // _OgreKdTreeSceneNode_H__
+#endif // _OgreBvHierarchySceneNode_H__

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchy.cpp

@@ -8 +8 @@
 */
 
-#include "OgreKdTree.h"
-#include "OgreKdRenderable.h"
-#include "OgreKdTreeSceneNode.h"
-#include "OgreKdTreeSceneManager.h"
+#include "OgreBvHierarchy.h"
+#include "OgreBvRenderable.h"
+#include "OgreBvHierarchySceneNode.h"
+#include "OgreBvHierarchySceneManager.h"
 
 #include <OgreStringConverter.h>
@@ -589 +589 @@
 /************************************************************************/
 
-void KdTree::remove(KdRenderable * rend)
+void KdTree::remove(BvRenderable * rend)
 {
         // DEBUG
@@ -621 +621 @@
         {
                 OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR,
-                        "SNAFU while inserting KdRenderable into KdTree.",
+                        "SNAFU while inserting BvRenderable into KdTree.",
                         "KdTree::recInsert" );
                 return;
@@ -648 +648 @@
 }
 
-void KdTree::insert(KdRenderable * rend)
+void KdTree::insert(BvRenderable * rend)
 {
         // make sure the tree exists
@@ -663 +663 @@
                 {
                         //LogManager::getSingleton().logMessage("Inserted node outside of world AABB.");
-                        KdRenderableList nodelist;
+                        BvRenderableList nodelist;
                         nodelist.push_back(rend);
                         addRendToList(mKdRoot, nodelist);
@@ -677 +677 @@
 }
 
-void KdTree::recInsert(KdTree::Node * node, KdRenderable * rend)
+void KdTree::recInsert(KdTree::Node * node, BvRenderable * rend)
 {
         if (node == 0) // DEBUG
         {
                 OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR,
-                        "SNAFU while inserting KdRenderable into KdTree.",
+                        "SNAFU while inserting BvRenderable into KdTree.",
                         "KdTree::recInsert" );
                 return;
@@ -744 +744 @@
 }
 
-void KdTree::recInsertNew(KdTree::Branch * parent, PlaneEvent::Side side, KdRenderable * rend)
+void KdTree::recInsertNew(KdTree::Branch * parent, PlaneEvent::Side side, BvRenderable * rend)
 {
         //LogManager::getSingleton().logMessage("## Inserting into new subtree");
@@ -789 +789 @@
 }
 
-void KdTree::rebuildSubtree(KdTree::Node * node, KdRenderable * rend)
+void KdTree::rebuildSubtree(KdTree::Node * node, BvRenderable * rend)
 {
         //LogManager::getSingleton().logMessage("## Rebuilding subtree");
@@ -795 +795 @@
         AxisAlignedBox aabb = node->mAABB;
         
-        KdRenderableList nodelist;
+        BvRenderableList nodelist;
         nodelist.push_back(rend);
         addRendToList(node, nodelist);
@@ -821 +821 @@
                 {
                         OGRE_EXCEPT(Exception::ERR_INTERNAL_ERROR,
-                                "SNAFU while inserting KdRenderable into KdTree.",
+                                "SNAFU while inserting BvRenderable into KdTree.",
                                 "KdTree::recInsert" );
                 }
@@ -845 +845 @@
 }
 
-void KdTree::addRendToList(KdTree::Node * node, KdRenderableList& nodelist)
+void KdTree::addRendToList(KdTree::Node * node, BvRenderableList& nodelist)
 {
         if (node->isLeaf())
         {
                 KdTree::Leaf * leaf = KDLEAFPTR_CAST(node);
-                KdRenderableList::iterator it  = leaf->mKdRenderables.begin();
-                KdRenderableList::iterator end = leaf->mKdRenderables.end();
+                BvRenderableList::iterator it  = leaf->mBvRenderables.begin();
+                BvRenderableList::iterator end = leaf->mBvRenderables.end();
                 while (it != end)
                 {
@@ -872 +872 @@
 /************************************************************************/
 
-void KdTree::build(KdRenderable * sceneRoot)
+void KdTree::build(BvRenderable * sceneRoot)
 {
         Timer *timer = Root::getSingleton().getTimer();
@@ -931 +931 @@
 }
 
-KdTree::Node * KdTree::buildFromList(KdRenderableList& nodelist, KdTree::Branch * parent, AxisAlignedBox& aabb)
+KdTree::Node * KdTree::buildFromList(BvRenderableList& nodelist, KdTree::Branch * parent, AxisAlignedBox& aabb)
 {
         // data we want to collect
@@ -938 +938 @@
         int nObjects = 0;
 
-        KdRenderableList::iterator it = nodelist.begin();
-        KdRenderableList::iterator end = nodelist.end();
+        BvRenderableList::iterator it = nodelist.begin();
+        BvRenderableList::iterator end = nodelist.end();
         while (it != end)
         {
@@ -1031 +1031 @@
                 // Terminating condition reached, create leaf and add renderables to list
                 KdTree::Leaf * leaf = new KdTree::Leaf(this, level, aabb, parent);
-                KdRenderable *rend;
+                BvRenderable *rend;
                 it = begin;
                 while (it != end)
@@ -1178 +1178 @@
                         // Terminating condition reached, create leaf and add renderables to list
                         KdTree::Leaf * leaf = new KdTree::Leaf(this, level, sc.aabb, sc.parent);
-                        KdRenderable *rend;
+                        BvRenderable *rend;
                         PlaneEventList::iterator begin = sc.events->begin();
                         PlaneEventList::iterator end = sc.events->end();
@@ -1396 +1396 @@
 
 //-------------------------------------------------------------------------
-void KdTree::queueVisibleObjects(KdTreeCamera* cam, RenderQueue* queue, bool onlyShadowCasters, 
+void KdTree::queueVisibleObjects(BvHierarchyCamera* cam, RenderQueue* queue, bool onlyShadowCasters, 
         bool showBoxes, KdTree::NodeList& visibleNodes)
 {
@@ -1411 +1411 @@
 //-------------------------------------------------------------------------
 void KdTree::recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, 
-        KdTreeCamera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, 
+        BvHierarchyCamera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, 
         KdTree::NodeList& visibleNodes, bool fullVis)
 {
-        KdTreeCamera::NodeVisibility vis = KdTreeCamera::KDNV_PART;
+        BvHierarchyCamera::NodeVisibility vis = BvHierarchyCamera::KDNV_PART;
         // test visibility
         //if (cam->isVisible(node->mAABB))
         if (fullVis || 
-                ((vis = (cam->*getVisibility)(node->mAABB)) != KdTreeCamera::KDNV_NONE))
+                ((vis = (cam->*getVisibility)(node->mAABB)) != BvHierarchyCamera::KDNV_NONE))
         {
                 visibleNodes.push_back(node);
 
-                bool v = (fullVis || vis == KdTreeCamera::KDNV_FULL);
+                bool v = (fullVis || vis == BvHierarchyCamera::KDNV_FULL);
 
                 node->queueVisibleObjects(currentFrame, cam, queue, onlyShadowCasters, showBoxes, v);
@@ -1450 +1450 @@
 {
         if (enh)
-                getVisibility = &KdTreeCamera::getVisibilityEnhanced;
+                getVisibility = &BvHierarchyCamera::getVisibilityEnhanced;
         else
-                getVisibility = &KdTreeCamera::getVisibilitySimple;
+                getVisibility = &BvHierarchyCamera::getVisibilitySimple;
 }
 
@@ -1458 +1458 @@
 bool KdTree::getEnhancedVis()
 {
-        return getVisibility == &KdTreeCamera::getVisibilityEnhanced;
+        return getVisibility == &BvHierarchyCamera::getVisibilityEnhanced;
 }
 
@@ -1523 +1523 @@
         {
                 LeafPtr leaf = KDLEAFPTR_CAST(node);
-                for (KdRenderableList::iterator it = leaf->mKdRenderables.begin();
-                        it != leaf->mKdRenderables.end(); it ++)
+                for (BvRenderableList::iterator it = leaf->mBvRenderables.begin();
+                        it != leaf->mBvRenderables.end(); it ++)
                 {
                         SceneNode *sn = dynamic_cast<SceneNode *>(*it);
@@ -1600 +1600 @@
         {
                 KdTree::Leaf * leaf = KDLEAFPTR_CAST(node);
-                KdRenderableList::iterator it  = leaf->mKdRenderables.begin();
-                KdRenderableList::iterator end = leaf->mKdRenderables.end();
+                BvRenderableList::iterator it  = leaf->mBvRenderables.begin();
+                BvRenderableList::iterator end = leaf->mBvRenderables.end();
                 while (it != end)
                 {
@@ -1649 +1649 @@
                 KdTree::Leaf * leaf = KDLEAFPTR_CAST(node);
                 return (PlaneEvent::surfaceArea(node->mAABB)/vs) *
-                        PlaneEvent::KI * leaf->mKdRenderables.size();
+                        PlaneEvent::KI * leaf->mBvRenderables.size();
         }
         else
@@ -1668 +1668 @@
         // detach all scene nodes in the case that we are rebuilding
         // the tree but not the scene
-        KdRenderableList::iterator it = mKdRenderables.begin();
-        KdRenderableList::iterator end = mKdRenderables.end();
+        BvRenderableList::iterator it = mBvRenderables.begin();
+        BvRenderableList::iterator end = mBvRenderables.end();
         while (it != end)
         {
@@ -1675 +1675 @@
                 it++;
         }
-        mKdRenderables.clear();
+        mBvRenderables.clear();
 }
 
@@ -1682 +1682 @@
         Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, bool fullVis)
 {
-        KdRenderableList::iterator it  = mKdRenderables.begin();
-        KdRenderableList::iterator end = mKdRenderables.end();
+        BvRenderableList::iterator it  = mBvRenderables.begin();
+        BvRenderableList::iterator end = mBvRenderables.end();
         while (it != end)
         {                       
@@ -1701 +1701 @@
 void KdTree::Leaf::getGeometryList(GtpVisibility::GeometryVector *geometryList)
 {
-        KdRenderableList::iterator it = mKdRenderables.begin();
-        KdRenderableList::iterator end = mKdRenderables.end();
+        BvRenderableList::iterator it = mBvRenderables.begin();
+        BvRenderableList::iterator end = mBvRenderables.end();
         while (it != end)
         {
@@ -1718 +1718 @@
 
         // merge boxes from attached geometry
-        KdRenderableList::iterator it = mKdRenderables.begin();
-        KdRenderableList::iterator end = mKdRenderables.end();
+        BvRenderableList::iterator it = mBvRenderables.begin();
+        BvRenderableList::iterator end = mBvRenderables.end();
         while (it != end)
         {