Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4688 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Jun 24, 2005, 2:40:51 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: prepearing for collision detection

Location:
orxonox/trunk/src
Files:
4 edited

Legend:

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

    r4675 r4688  
    5959
    6060
     61void CDEngine::checkCollisionObjects()
     62{}
     63
     64
     65void CDEngine::checkCollisionGround()
     66{}
     67
     68
    6169void CDEngine::drawBV(int depth, int drawMode) const
    6270{
  • orxonox/trunk/src/lib/collision_detection/cd_engine.h

    r4635 r4688  
    3939  void init();
    4040
    41   void setState(const int newState) { this->state = newState; }
    42   const int getState() const { return this->state; }
    43   void enable(const int options) { this->state |= options; }
    44   void disable(const int options) { int temp = this->state & options; this->state ^= temp; }
     41  inline void setState(const int newState) { this->state = newState; }
     42  inline const int getState() const { return this->state; }
     43  inline void enable(const int options) { this->state |= options; }
     44  inline void disable(const int options) { int temp = this->state & options; this->state ^= temp; }
     45
     46  inline void setEntityList(tList<WorldEntity>* entityList) { this->entityList = entityList; }
    4547
    4648  void drawBV(int depth, int drawMode) const;
  • orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

    r4685 r4688  
    501501  }
    502502
    503    PRINTF(0)("longest axis is: nr %i with a half-length of: %f\n", axisIndex, aLength);
     503   PRINTF(3)("longest axis is: nr %i with a half-length of: %f\n", axisIndex, aLength);
    504504
    505505
     
    648648    glEnd();
    649649  }
     650
    650651
    651652  if( drawMode & DRAW_BV_AXIS || drawMode & DRAW_ALL)
  • orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

    r4686 r4688  
    7272  entityList->add(b);
    7373
     74  CDEngine::getInstance()->setEntityList(entityList);
    7475
    7576  LightManager* lightMan = LightManager::getInstance();
     
    198199void Framework::moduleTick(float dt)
    199200{
     201
     202  CDEngine::getInstance()->checkCollisions();
    200203
    201204  currentFrame = SDL_GetTicks();
Note: See TracChangeset for help on using the changeset viewer.