Changeset 5279 in orxonox.OLD for trunk/src/lib/collision_detection

Timestamp:

Oct 4, 2005, 9:20:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: almost mac compatibility

Location:

trunk/src/lib/collision_detection

Files:

• bounding_volume.h (modified) (1 diff)
• bv_tree.h (modified) (1 diff)
• bv_tree_node.h (modified) (1 diff)

trunk/src/lib/collision_detection/bounding_volume.h

@@ -25 +25 @@
 
     sVec3D* getVertices() const { return this->vertices; }
-    virtual void mergeWith(const BoundingVolume &bv) = NULL;
+    virtual void mergeWith(const BoundingVolume &bv) = 0;
 
-    virtual void drawBV(int currentDepth, int drawMode) const = NULL;
+    virtual void drawBV(int currentDepth, int drawMode) const = 0;
 
 

trunk/src/lib/collision_detection/bv_tree.h

@@ -39 +39 @@
   virtual ~BVTree();
 
-  virtual void spawnBVTree(int depth, sVec3D *verticesList, const int length) = NULL;
-  virtual void flushTree() = NULL;
+  virtual void spawnBVTree(int depth, sVec3D *verticesList, const int length) = 0;
+  virtual void flushTree() = 0;
 
-  virtual void collideWith(BVTree* tree, WorldEntity* nodeA, WorldEntity* nodeB) = NULL;
-  virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2) = NULL;
+  virtual void collideWith(BVTree* tree, WorldEntity* nodeA, WorldEntity* nodeB) = 0;
+  virtual void collideWith(WorldEntity* entity1, WorldEntity* entity2) = 0;
 
-  virtual void drawBV(int depth, int drawMode) const = NULL;
+  virtual void drawBV(int depth, int drawMode) const = 0;
 
 

trunk/src/lib/collision_detection/bv_tree_node.h

@@ -25 +25 @@
   virtual ~BVTreeNode();
 
-  virtual void spawnBVTree(const int depth, sVec3D *verticesList, const int length ) = NULL;
+  virtual void spawnBVTree(const int depth, sVec3D *verticesList, const int length ) = 0;
 
-  virtual BoundingVolume* getBV(int index) const = NULL;
+  virtual BoundingVolume* getBV(int index) const = 0;
   inline const int getIndex() { return this->treeIndex; }
 
-  virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB) = NULL;
+  virtual void collideWith(BVTreeNode* treeNode, WorldEntity* nodeA, WorldEntity* nodeB) = 0;
 
-  virtual void drawBV(int depth, int drawMode) = NULL;
+  virtual void drawBV(int depth, int drawMode) = 0;