Changeset 4688 in orxonox.OLD

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:

• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/collision_detection/cd_engine.h (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)
• subprojects/collision_detection/collision_detection.cc (modified) (2 diffs)

orxonox/trunk/src/lib/collision_detection/cd_engine.cc

@@ -59 +59 @@
 
 
+void CDEngine::checkCollisionObjects()
+{}
+
+
+void CDEngine::checkCollisionGround()
+{}
+
+
 void CDEngine::drawBV(int depth, int drawMode) const
 {

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

@@ -39 +39 @@
   void init();
 
-  void setState(const int newState) { this->state = newState; }
-  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; }
+  inline void setState(const int newState) { this->state = newState; }
+  inline const int getState() const { return this->state; }
+  inline void enable(const int options) { this->state |= options; }
+  inline void disable(const int options) { int temp = this->state & options; this->state ^= temp; }
+
+  inline void setEntityList(tList<WorldEntity>* entityList) { this->entityList = entityList; }
 
   void drawBV(int depth, int drawMode) const;

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -501 +501 @@
   }
 
-   PRINTF(0)("longest axis is: nr %i with a half-length of: %f\n", axisIndex, aLength);
+   PRINTF(3)("longest axis is: nr %i with a half-length of: %f\n", axisIndex, aLength);
 
 
@@ -648 +648 @@
     glEnd();
   }
+
 
   if( drawMode & DRAW_BV_AXIS || drawMode & DRAW_ALL)

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -72 +72 @@
   entityList->add(b);
 
+  CDEngine::getInstance()->setEntityList(entityList);
 
   LightManager* lightMan = LightManager::getInstance();
@@ -198 +199 @@
 void Framework::moduleTick(float dt)
 {
+
+  CDEngine::getInstance()->checkCollisions();
 
   currentFrame = SDL_GetTicks();