Changeset 7365 in orxonox.OLD for branches/cd/src/world_entities/world_entity.cc

Timestamp:

Apr 25, 2006, 3:17:20 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/cd: merged the new collision-detection back.
merged and collissions resolved.

File:

• branches/cd/src/world_entities/world_entity.cc (modified) (4 diffs)

branches/cd/src/world_entities/world_entity.cc

@@ -207 +207 @@
  * @param depth the depth to calculate
  */
-bool WorldEntity::buildObbTree(unsigned int depth)
+bool WorldEntity::buildObbTree(int depth)
 {
   if (this->obbTree)
@@ -214 +214 @@
   if (this->models[0] != NULL)
   {
-    PRINTF(4)("creating obb tree\n");
-
-
-    this->obbTree = new OBBTree(depth, (sVec3D*)this->models[0]->getVertexArray(), this->models[0]->getVertexCount());
+    this->obbTree = new OBBTree(depth, models[0]->getModelInfo(), this);
     return true;
   }
   else
   {
-    PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
+    PRINTF(1)("could not create obb-tree, because no model was loaded yet\n");
     this->obbTree = NULL;
     return false;
@@ -468 +465 @@
  * @param drawMode the mode to draw this entity under
  */
-void WorldEntity::drawBVTree(unsigned int depth, int drawMode) const
+void WorldEntity::drawBVTree(int depth, int drawMode) const
 {
   glMatrixMode(GL_MODELVIEW);
@@ -480 +477 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
+
   if (this->obbTree)
     this->obbTree->drawBV(depth, drawMode);
+
+
   glPopMatrix();
 }