Changeset 1319

Timestamp:

09/04/06 00:27:46 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/include/OgreBvHierarchy.h (modified) (14 diffs)
• OGRE/include/OgreBvHierarchyCamera.h (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchyCamera.h)
• OGRE/include/OgreBvHierarchyInterface.h (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchyInterface.h)
• OGRE/include/OgreBvHierarchySceneManager.h (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchySceneManager.h)
• OGRE/include/OgreBvHierarchySceneNode.h (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvHierarchySceneNode.h)
• OGRE/include/OgreBvRenderable.h (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/include/OgreBvRenderable.h)
• src/OgreBvHierarchy.cpp (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchy.cpp)
• src/OgreBvHierarchyCamera.cpp (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchyCamera.cpp)
• src/OgreBvHierarchyInterface.cpp (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchyInterface.cpp)
• src/OgreBvHierarchySceneManager.cpp (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchySceneManager.cpp)
• src/OgreBvHierarchySceneNode.cpp (moved) (moved from GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/BvHierarchySceneManager/src/OgreBvHierarchySceneNode.cpp)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/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__