Changeset 4524 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 7, 2005, 12:29:52 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: mod some interface arguments, defined some functions of bv tree

Location:

orxonox/trunk/src/util/collision_detection

Files:

• bounding_volume.h (modified) (1 diff)
• bv_tree.h (modified) (2 diffs)
• cd_engine.h (modified) (1 diff)

orxonox/trunk/src/util/collision_detection/bounding_volume.h

@@ -25 +25 @@
 
   virtual sVect3D* getVertices() const = NULL;
-  virtual void mergeWith(const BoundingVolume& bv) = NULL;
+  virtual void mergeWith(const BoundingVolume &bv) = NULL;
 
-  virtual void drawBV(int currentDepth, int depth) const = NULL;
-  virtual void drawBVPolygon(int currentDepth, int depth) const = NULL;
-  virtual void drawBVBlended(int currentDepth, int depth) const = NULL;
+  virtual void drawBV(int currentDepth, const int depth) const = NULL;
+  virtual void drawBVPolygon(int currentDepth, const int depth) const = NULL;
+  virtual void drawBVBlended(int currentDepth, const int depth) const = NULL;
 
  private:

orxonox/trunk/src/util/collision_detection/bv_tree.h

@@ -11 +11 @@
 
 // FORWARD DEFINITION
-
+class BoundingVolume;
 
 
@@ -21 +21 @@
   virtual ~BVTree();
 
+  void spawnBVTree(int depth);
+  void flushTree();
+
+  BoundingVolume* getBV(int index) const;
+  
+  void collideWith(const BVTree &tree);
+
+  void drawBV(int currentDepth, const int depth) const;
+  void drawBVPolygon(int currentDepth, const int depth) const;
+  void drawBVBlended(int currentDepth, const int depth) const;
 
  private:
+  BoundingVolume* firstElement;
 
 };

orxonox/trunk/src/util/collision_detection/cd_engine.h

@@ -37 +37 @@
   const int getState() const { return this->state; }
   void enable(const int options) { this->state |= options; }
-  void disable(const int options) { int temp = this->state & options; this->state ^= temp;}
+  void disable(const int options) { int temp = this->state & options; this->state ^= temp; }
 
-  void drawBV(int currentDepth, int depth) const;
-  void drawBVPolygon(int currentDepth, int depth) const;
-  void drawBVBlended(int currentDepth, int depth) const;
+  void drawBV(int currentDepth, const int depth) const;
+  void drawBVPolygon(int currentDepth, const int depth) const;
+  void drawBVBlended(int currentDepth, const int depth) const;
 
   void checkCollisions();