Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4524 in orxonox.OLD for orxonox/trunk


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/util/collision_detection/bounding_volume.h

    r4522 r4524  
    2525
    2626  virtual sVect3D* getVertices() const = NULL;
    27   virtual void mergeWith(const BoundingVolume& bv) = NULL;
     27  virtual void mergeWith(const BoundingVolume &bv) = NULL;
    2828
    29   virtual void drawBV(int currentDepth, int depth) const = NULL;
    30   virtual void drawBVPolygon(int currentDepth, int depth) const = NULL;
    31   virtual void drawBVBlended(int currentDepth, int depth) const = NULL;
     29  virtual void drawBV(int currentDepth, const int depth) const = NULL;
     30  virtual void drawBVPolygon(int currentDepth, const int depth) const = NULL;
     31  virtual void drawBVBlended(int currentDepth, const int depth) const = NULL;
    3232
    3333 private:
  • orxonox/trunk/src/util/collision_detection/bv_tree.h

    r4514 r4524  
    1111
    1212// FORWARD DEFINITION
    13 
     13class BoundingVolume;
    1414
    1515
     
    2121  virtual ~BVTree();
    2222
     23  void spawnBVTree(int depth);
     24  void flushTree();
     25
     26  BoundingVolume* getBV(int index) const;
     27 
     28  void collideWith(const BVTree &tree);
     29
     30  void drawBV(int currentDepth, const int depth) const;
     31  void drawBVPolygon(int currentDepth, const int depth) const;
     32  void drawBVBlended(int currentDepth, const int depth) const;
    2333
    2434 private:
     35  BoundingVolume* firstElement;
    2536
    2637};
  • orxonox/trunk/src/util/collision_detection/cd_engine.h

    r4523 r4524  
    3737  const int getState() const { return this->state; }
    3838  void enable(const int options) { this->state |= options; }
    39   void disable(const int options) { int temp = this->state & options; this->state ^= temp;}
     39  void disable(const int options) { int temp = this->state & options; this->state ^= temp; }
    4040
    41   void drawBV(int currentDepth, int depth) const;
    42   void drawBVPolygon(int currentDepth, int depth) const;
    43   void drawBVBlended(int currentDepth, int depth) const;
     41  void drawBV(int currentDepth, const int depth) const;
     42  void drawBVPolygon(int currentDepth, const int depth) const;
     43  void drawBVBlended(int currentDepth, const int depth) const;
    4444
    4545  void checkCollisions();
Note: See TracChangeset for help on using the changeset viewer.