Changeset 4814 in orxonox.OLD for orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

Timestamp:

Jul 7, 2005, 3:27:46 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the vertices data and the obb trees now get deleted, in the resume at the end (Class_list) there are still a number of references, will track this down now

File:

• orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc (modified) (3 diffs)

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -50 +50 @@
   this->nodeLeft = NULL;
   this->nodeRight = NULL;
+  this->bvElement = NULL;
 
   if(coMat == NULL)
@@ -79 +80 @@
 OBBTreeNode::~OBBTreeNode ()
 {
-
-  delete [] this->vertices;
-
-  delete this->bvElement;
-  delete this->nodeLeft;
-  delete this->nodeRight;
+  if( this->nodeLeft)
+  {
+    delete this->nodeLeft;
+    this->nodeLeft = NULL;
+  }
+  if( this->nodeRight)
+  {
+    delete this->nodeRight;
+    this->nodeRight = NULL;
+  }
+  printf("deleting nr %i obbTreeNode\n", this->getIndex());
+  if( this->bvElement)
+    delete this->bvElement;
+  this->bvElement = NULL;
 }
 
@@ -113 +122 @@
   PRINTF(3)("Calculated attributes3\n");
 
+  /* if this is the first node, the vertices data are the original ones of the model itself, so dont delete them in cleanup */
+  if( this->treeIndex == 1)
+    this->bvElement->bOrigVertices = true;
 
   if( likely( this->depth > 0))