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

Timestamp:

Jan 31, 2006, 6:02:16 PM (18 years ago)

Author:

patrick

Message:

current_cd: merged with the current version of the trunk

File:

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

branches/current_cd/src/world_entities/world_entity.cc

@@ -206 +206 @@
 bool WorldEntity::buildObbTree(unsigned int depth)
 {
+<<<<<<< .working
   if (this->obbTree)
     delete this->obbTree;
@@ -211 +212 @@
   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
     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;
@@ -257 +266 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
  */
-void WorldEntity::collidesWith(WorldEntity* entity, const Vector& location)
+void WorldEntity::collidesWith(const WorldEntity& entity, const Vector& location) const
 {
   /**