Changeset 5116 in orxonox.OLD

Timestamp:

Aug 24, 2005, 1:47:05 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: saver removal of vertices in obb's

Location:

trunk/src

Files:

• lib/collision_detection/bounding_volume.cc (modified) (2 diffs)
• lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• lib/collision_detection/obb.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)

trunk/src/lib/collision_detection/bounding_volume.cc

@@ -29 +29 @@
    this->setClassID(CL_BOUNDING_VOLUME, "BoundingVolume");
    this->center = new Vector();
-   this->bOrigVertices = false;
+   this->bOrigVertices = true;
 }
 
@@ -41 +41 @@
   // delete what has to be deleted here
   delete this->center;
+
+  if( this->vertices && !this->bOrigVertices)
+  {
+    delete this->vertices;
+    this->vertices = NULL;
+  }
 }

trunk/src/lib/collision_detection/cd_engine.cc

@@ -100 +100 @@
         ////////////////
 
-/*                if( likely(entity2 != this->terrain))
+/*        if( likely(entity2 != this->terrain))
         {
           PRINTF(4)("checking object %s against %s\n", entity1->getName(), entity2->getName());
@@ -108 +108 @@
         entity2 = iterator2->nextElement();
       }
-//      printf("\n");
+    //  printf("\n");
     }
     entity1 = iterator1->nextElement();

trunk/src/lib/collision_detection/obb.cc

@@ -44 +44 @@
   delete [] this->axis;
   delete [] this->halfLength;
-
-  if( this->vertices && !this->bOrigVertices)
-  {
-    delete this->vertices;
-    this->vertices = NULL;
-  }
 }
 

trunk/src/world_entities/test_entity.cc

@@ -46 +46 @@
 {
   delete this->md2Model;
-  this->obbTree = NULL;
 }