Changeset 5717 in orxonox.OLD for branches/collision_detection/src/world_entities

Timestamp:

Nov 23, 2005, 12:31:47 AM (19 years ago)

Author:

patrick

Message:

collision_detection: work flush

Location:

branches/collision_detection/src/world_entities

Files:

• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (2 diffs)

branches/collision_detection/src/world_entities/world_entity.cc

@@ -104 +104 @@
   }
   else
-    this->model = NULL;
+  {
+        this->model = NULL;
+        this->obbTree = NULL;
+  }
 }
 
@@ -113 +116 @@
 bool WorldEntity::buildObbTree(unsigned int depth)
 {
-  if (this->obbTree)
-    delete this->obbTree;
-
-  if (this->model != NULL)
-  {
+  if( this->model != NULL) {
     PRINTF(4)("creating obb tree\n");
-
-
     //this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
     this->obbTree = new OBBTree(depth, *model->getModelInfo());
@@ -127 +124 @@
   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;

branches/collision_detection/src/world_entities/world_entity.h

@@ -47 +47 @@
   void drawBVTree(unsigned int depth, int drawMode) const;
   /** @returns a reference to the obb tree of this worldentity */
-  BVTree* getOBBTree() const { return this->obbTree; };
+  inline const BVTree* getOBBTree() const { return this->obbTree; };
 
   /* @returns the Count of Faces on this WorldEntity */
@@ -59 +59 @@
  protected:
   Model*                  model;            //!< The model that should be loaded for this entity.
-  BVTree*                 obbTree;          //!< this is the obb tree reference needed for collision detection
+  const BVTree*           obbTree;          //!< this is the obb tree reference needed for collision detection
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity