Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4521 in orxonox.OLD for orxonox/trunk/src/util/collision_detection


Ignore:
Timestamp:
Jun 6, 2005, 11:27:10 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: some corrections and additions

Location:
orxonox/trunk/src/util/collision_detection
Files:
2 edited

Legend:

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

    r4520 r4521  
    2424  inline const sVect3D* getHalfLength() const { return this->halfLength; }
    2525
    26   sVect3D* getVertices() const;
    27   void mergeWith(const BoundingVolume& bv);
     26  virtual sVect3D* getVertices() const = NULL;
     27  virtual void mergeWith(const BoundingVolume& bv) = NULL;
     28
     29  virtual void drawBV(int currentDepth, int depth) = NULL;
     30  virtual void drawBVPolygon(int currentDepth, int depth) const = NULL;
     31  virtual void drawBVBlended(int currentDepth, int depth) const = NULL;
    2832
    2933 private:
    30   Vector*    center;                     //!< Center point of box
    31   Vector*    axis;                       //!< Axes of oriented box [x,y,z]
    32   sVect3D*   halfLength;                 //!< Half lengths of the box
     34  Vector*             center;                     //!< Center point of box
     35  Vector*             axis;                       //!< Axes of oriented box [x,y,z]
     36  sVect3D*            halfLength;                 //!< Half lengths of the box
    3337
    34 
     38  unsigned int        treeIndex;                  //!< Index number of the BV in the tree
    3539};
    3640
  • orxonox/trunk/src/util/collision_detection/obb.h

    r4514 r4521  
    2020
    2121
     22
    2223 private:
    23 
     24  OBB*     leftNode;                   //!< left node of the tree
     25  OBB*     rightNode;                  //!< right node of the tree
    2426};
    2527
Note: See TracChangeset for help on using the changeset viewer.