Changeset 6894 in orxonox.OLD for branches/cdmerge/src/lib/collision_detection/obb_tree.h

Timestamp:

Jan 31, 2006, 2:41:28 PM (18 years ago)

Author:

patrick

Message:

cdmerge: merged with the newest trunk an corrected some segfaults

File:

• branches/cdmerge/src/lib/collision_detection/obb_tree.h (modified) (2 diffs)

branches/cdmerge/src/lib/collision_detection/obb_tree.h

@@ -17 +17 @@
 
 //! A class for representing an obb tree
-class OBBTree : public BVTree {
+class OBBTree : public BVTree
+{
 
   public:
-    OBBTree();
-    OBBTree(int depth, sVec3D *verticesList, const int length);
-    OBBTree(int depth, const modelInfo& modInfo);
+    OBBTree(int depth, const modelInfo* modInfo);
     virtual ~OBBTree();
     void init();
 
-    virtual void spawnBVTree(int depth, sVec3D *verticesList, const int length);
-    virtual void spawnBVTree(int depth, const modelInfo& modInfo);
+    virtual void spawnBVTree(const modelInfo& modelInf);
     virtual void flushTree();
 
-    virtual void collideWith(BVTree* tree, WorldEntity* nodeA, WorldEntity* nodeB);
-    virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2);
-
+    virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2) const;
     virtual void drawBV(int depth, int drawMode) const;
 
-    int getID() { return ++this->id;}
-    inline OBBTreeNode* getRootNode() { return this->rootNode; }
+    /** returns the next if for the obb tree node @return integer id number of the next node */
+    inline const int getID() { return ++this->id;}
+    /** returns the root node of the bounding volume tree @return reference to the root node */
+    inline const OBBTreeNode* getRootNode() const { return this->rootNode; }
 
     void debug();
@@ -42 +40 @@
   private:
     OBBTreeNode*         rootNode;                        //!< reference to the root node of the tree
-    int                  id;
+    int                  id;                              //!< the next id of a obb tree node
+    int                  depth;                           //!< the depth of the tree to generate
 };