Changeset 5704 in orxonox.OLD

Timestamp:

Nov 22, 2005, 2:07:49 PM (18 years ago)

Author:

patrick

Message:

collision_detection: removed some more unused variables

Location:

branches/collision_detection/src/lib/collision_detection

Files:

• bounding_volume.cc (modified) (2 diffs)
• bounding_volume.h (modified) (1 diff)
• obb_tree_node.cc (modified) (5 diffs)
• obb_tree_node.h (modified) (1 diff)

branches/collision_detection/src/lib/collision_detection/bounding_volume.cc

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

branches/collision_detection/src/lib/collision_detection/bounding_volume.h

@@ -36 +36 @@
     const sVec3D*       vertices;                   //!< if CD_STORE_VERTICES enabled, this is the place, where the vert. will be sotred
     int                 numOfVertices;              //!< number of vertices in the vertices buffer
-    bool                bOrigVertices;              //!< is true if the vertices pointer points to the original model data - only important for deleting
     const modelInfo*    modelInf;                   //!< Reference to the model's ModelInfo
     const int*          triangleIndexes;            //!< Array with the triangle indexes in modelInfo

branches/collision_detection/src/lib/collision_detection/obb_tree_node.cc

@@ -116 +116 @@
   sVec3D* verticesList;
 
-  PRINT(3)("\n");
   PRINTF(3)("OBB Depth: %i, tree index: %i, numVertices: %i\n", depth, treeIndex, length);
   this->depth = depth;
 
-
-  this->bvElement = new OBB();
-  
+  this->bvElement = new OBB();  
   this->bvElement->modelInf = &modelInf;
   this->bvElement->triangleIndexes = triangleIndexes;
   this->bvElement->numTriangles = length;
   
-  PRINTF(3)("Created OBBox\n");
   this->calculateBoxCovariance(this->bvElement, modelInf, triangleIndexes, length);
-  PRINTF(3)("Calculated attributes1\n");
   this->calculateBoxEigenvectors(this->bvElement, modelInf, triangleIndexes, length);
-  PRINTF(3)("Calculated attributes2\n");
   this->calculateBoxAxis(this->bvElement, modelInf, triangleIndexes, length);
-  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 this is the first node, the vertices data are the original ones of the model itself, 
+     so dont delete them in cleanup */
   if( likely( this->depth > 0))
   {
@@ -179 +170 @@
 void OBBTreeNode::spawnBVTree(const int depth, const sVec3D *verticesList, unsigned int length)
 {
-  PRINT(3)("\n");
-  PRINTF(3)("OBB Depth: %i, tree index: %i, numVertices: %i\n", depth, treeIndex, length);
-  this->depth = depth;
-
-
-  this->bvElement = new OBB();
-  this->bvElement->vertices = verticesList;
-  this->bvElement->numOfVertices = length;
-  PRINTF(3)("Created OBBox\n");
-  this->calculateBoxCovariance(this->bvElement, verticesList, length);
-  PRINTF(3)("Calculated attributes1\n");
-  this->calculateBoxEigenvectors(this->bvElement, verticesList, length);
-  PRINTF(3)("Calculated attributes2\n");
-  this->calculateBoxAxis(this->bvElement, verticesList, length);
-  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))
-  {
-    this->forkBox(this->bvElement);
-
-
-    if(this->tmpLen1 > 2)
-    {
-      OBBTreeNode* node1 = new OBBTreeNode(this->obbTree);
-      this->nodeLeft = node1;
-      this->nodeLeft->spawnBVTree(depth - 1, this->tmpVert1, this->tmpLen1);
-    }
-    else
-    {
-      PRINTF(3)("Aboarding tree walk: less than 3 vertices left\n");
-    }
-
-    if( this->tmpLen2 > 2)
-    {
-      OBBTreeNode* node2 = new OBBTreeNode(this->obbTree);
-      this->nodeRight = node2;
-      this->nodeRight->spawnBVTree(depth - 1, this->tmpVert2, this->tmpLen2);
-    }
-    else
-    {
-      PRINTF(3)("Abording tree walk: less than 3 vertices left\n");
-    }
-  }
+//   PRINT(3)("\n");
+//   PRINTF(3)("OBB Depth: %i, tree index: %i, numVertices: %i\n", depth, treeIndex, length);
+//   this->depth = depth;
+// 
+// 
+//   this->bvElement = new OBB();
+//   this->bvElement->vertices = verticesList;
+//   this->bvElement->numOfVertices = length;
+//   PRINTF(3)("Created OBBox\n");
+//   this->calculateBoxCovariance(this->bvElement, verticesList, length);
+//   PRINTF(3)("Calculated attributes1\n");
+//   this->calculateBoxEigenvectors(this->bvElement, verticesList, length);
+//   PRINTF(3)("Calculated attributes2\n");
+//   this->calculateBoxAxis(this->bvElement, verticesList, length);
+//   PRINTF(3)("Calculated attributes3\n");
+// 
+// 
+// 
+//   if( likely( this->depth > 0))
+//   {
+//     this->forkBox(this->bvElement);
+// 
+// 
+//     if(this->tmpLen1 > 2)
+//     {
+//       OBBTreeNode* node1 = new OBBTreeNode(this->obbTree);
+//       this->nodeLeft = node1;
+//       this->nodeLeft->spawnBVTree(depth - 1, this->tmpVert1, this->tmpLen1);
+//     }
+//     else
+//     {
+//       PRINTF(3)("Aboarding tree walk: less than 3 vertices left\n");
+//     }
+// 
+//     if( this->tmpLen2 > 2)
+//     {
+//       OBBTreeNode* node2 = new OBBTreeNode(this->obbTree);
+//       this->nodeRight = node2;
+//       this->nodeRight->spawnBVTree(depth - 1, this->tmpVert2, this->tmpLen2);
+//     }
+//     else
+//     {
+//       PRINTF(3)("Abording tree walk: less than 3 vertices left\n");
+//     }
+//   }
 }
 
@@ -235 +224 @@
 void OBBTreeNode::calculateBoxCovariance(OBB* box, const sVec3D* verticesList, unsigned int length)
 {
+  PRINTF(3)("Created OBBox\n");
+  
   float     facelet[length];                         //!< surface area of the i'th triangle of the convex hull
   float     face = 0.0f;                             //!< surface area of the entire convex hull
@@ -428 +419 @@
 void OBBTreeNode::calculateBoxEigenvectors(OBB* box, const sVec3D* verticesList, unsigned int length)
 {
-
+  PRINTF(3)("Calculated attributes1\n");
   /* now getting spanning vectors of the sub-space:
   the eigenvectors of a symmertric matrix, such as the
@@ -484 +475 @@
 void OBBTreeNode::calculateBoxAxis(OBB* box, const sVec3D* verticesList, unsigned int length)
 {
-
+  PRINTF(3)("Calculated attributes3\n");
   /* now get the axis length */
   Line                ax[3];                                 //!< the axis

branches/collision_detection/src/lib/collision_detection/obb_tree_node.h

@@ -26 +26 @@
   public:
     OBBTreeNode(const OBBTree* tree);
+    OBBTreeNode(const OBBTree* tree, bool bRoot);
     virtual ~OBBTreeNode();