Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jul 21, 2005, 12:37:46 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: the CDEngine now knows the terrain

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

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/lib/collision_detection/cd_engine.cc

    r4907 r4918  
    6161void CDEngine::checkCollisions()
    6262{
    63   this->checkCollisionObjects();
     63  //this->checkCollisionObjects();
    6464  this->checkCollisionGround();
    6565}
  • orxonox/trunk/src/lib/collision_detection/cd_engine.h

    r4836 r4918  
    1515class WorldEntity;
    1616class OBBTree;
     17class Terrain;
    1718
    1819
     
    4546
    4647  inline void setEntityList(tList<WorldEntity>* entityList) { this->entityList = entityList; }
     48  inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
    4749
    4850  void drawBV(int depth, int drawMode) const;
     
    6870  tList<WorldEntity>*     entityList;                       //!< pointer to the world entity list
    6971  OBBTree*                rootTree;                         //!< for testing purposes a root tree
     72
     73  Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
    7074};
    7175
Note: See TracChangeset for help on using the changeset viewer.