Changeset 6911 in orxonox.OLD for branches/current_cd/src/world_entities/world_entity.cc

Timestamp:

Jan 31, 2006, 7:12:41 PM (19 years ago)

Author:

patrick

Message:

cd: compiles again

File:

• branches/current_cd/src/world_entities/world_entity.cc (modified) (3 diffs)

branches/current_cd/src/world_entities/world_entity.cc

@@ -204 +204 @@
  * @param depth the depth to calculate
  */
-bool WorldEntity::buildObbTree(unsigned int depth)
-{
-<<<<<<< .working
+bool WorldEntity::buildObbTree(int depth)
+{
   if (this->obbTree)
     delete this->obbTree;
@@ -212 +211 @@
   if (this->models[0] != NULL)
   {
-=======
-  if( this->model != NULL) {
->>>>>>> .merge-right.r6905
-    PRINTF(4)("creating obb tree\n");
-<<<<<<< .working
-
-
-    this->obbTree = new OBBTree(depth, (sVec3D*)this->models[0]->getVertexArray(), this->models[0]->getVertexCount());
-=======
-    //this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
-    this->obbTree = new OBBTree(depth, *model->getModelInfo());
->>>>>>> .merge-right.r6905
+    this->obbTree = new OBBTree(depth, models[0]->getModelInfo());
     return true;
   }
@@ -266 +254 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
  */
-void WorldEntity::collidesWith(const WorldEntity& entity, const Vector& location) const
+void WorldEntity::collidesWith(WorldEntity* entity, const Vector& location)
 {
   /**