Changeset 4630 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jun 14, 2005, 5:19:23 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the memory requirements are lowered, some strucural changes in the bv generation

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/lin_alg.h (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (9 diffs)
• lib/collision_detection/obb_tree_node.h (modified) (2 diffs)
• subprojects/collision_detection/collision_detection.cc (modified) (2 diffs)

orxonox/trunk/src/lib/collision_detection/lin_alg.h

@@ -49 +49 @@
       for (iq=ip+1; iq<=N; iq++)
         sm=sm+fabs(A[ip][iq]);
-    if (sm==0) {
+    if (sm==0)
+    {
+      free(B);
+      free(Z);
       return;       //normal return
     }

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

@@ -45 +45 @@
 OBBTree*  OBBTreeNode::obbTree = NULL;
 
+float**  OBBTreeNode::coMat = NULL;
+float**  OBBTreeNode::eigvMat = NULL;
+float*   OBBTreeNode::eigvlMat = NULL;
+int*     OBBTreeNode::rotCount = NULL;
+
 /**
    \brief standard constructor
@@ -53 +58 @@
   this->nodeLeft = NULL;
   this->nodeRight = NULL;
+
+  if(coMat == NULL)
+  {
+    coMat = new float*[4];
+    for(int i = 0; i < 4; i++)
+      coMat[i] = new float[4];
+  }
+  if(eigvMat == NULL)
+  {
+    eigvMat = new float*[4];
+    for(int i = 0; i < 4; i++)
+      eigvMat[i] = new float[4];
+  }
+  if( eigvlMat == NULL)
+  {
+    eigvlMat = new float[4];
+  }
+  if( rotCount == NULL)
+    rotCount = new int;
 }
 
@@ -76 +100 @@
   this->depth = depth;
 
-  this->bvElement = this->createBox();
+  this->bvElement = new OBB();
   PRINTF(0)("Created OBBox\n");
   this->calculateBoxAttributes(this->bvElement, verticesList, length);
@@ -85 +109 @@
     this->forkBox(this->bvElement);
 
-  }
-}
-
-
-OBB* OBBTreeNode::createBox()
-{
-  return new OBB();
-}
+    OBBTreeNode*       node1 = new OBBTreeNode();
+    OBBTreeNode*       node2 = new OBBTreeNode();
+
+    this->nodeLeft = node1;
+    this->nodeRight = node2;
+
+    this->nodeLeft->spawnBVTree(depth - 1, this->tmpVert1, this->tmpLen1);
+    this->nodeRight->spawnBVTree(depth - 1, this->tmpVert2, this->tmpLen2);
+
+  }
+}
+
 
 
@@ -188 +216 @@
   vectors
   */
- /* Matrix                V(3,3);    */                           //!< for eigenvectors
- /* DiagonalMatrix        D(3);   */                              //!< for eigenvalues
-/*  SymmetricMatrix       C(3); */                                //!< for the covariance symmetrical matrix
   Vector**              axis = new Vector*[3];                //!< the references to the obb axis
-
+//   float**               a = new float*[4];
+//   float**               b = new float*[4];
+//   float                 eigval[3];
+//   int*                  rot = new int;
+
+
+  //coMat[0] = new float[4]; coMat[1] = new float[4]; coMat[2] = new float[4]; coMat[3] = new float[4];
+  //eigvMat[0] = new float[4]; eigvMat[1] = new float[4]; eigvMat[2] = new float[4]; eigvMat[3] = new float[4];
+
+  coMat[1][1] = covariance[0][0]; coMat[1][2] = covariance[0][1]; coMat[1][3] = covariance[0][2];
+  coMat[2][1] = covariance[1][0]; coMat[2][2] = covariance[1][1]; coMat[2][3] = covariance[1][2];
+  coMat[3][1] = covariance[2][0]; coMat[3][2] = covariance[2][1]; coMat[3][3] = covariance[2][2];
 
   /* new jacobi tests */
-  float** a = new float*[4];
-  a[0] = new float[4]; a[1] = new float[4]; a[2] = new float[4]; a[3] = new float[4];
-
-  float** b = new float*[4];
-  b[0] = new float[4]; b[1] = new float[4]; b[2] = new float[4]; b[3] = new float[4];
-
-  float eigval[3];
-
-  int* rot = new int;
-
-
-  a[1][1] = covariance[0][0];
-  a[1][2] = covariance[0][1];
-  a[1][3] = covariance[0][2];
-  a[2][1] = covariance[1][0];
-  a[2][2] = covariance[1][1];
-  a[2][3] = covariance[1][2];
-  a[3][1] = covariance[2][0];
-  a[3][2] = covariance[2][1];
-  a[3][3] = covariance[2][2];
-
-
-  JacobI(a, 3, eigval, b, rot);
+  JacobI(coMat, 3, eigvlMat, eigvMat, rotCount);
   PRINTF(0)("-- Done Jacobi Decomposition\n");
 
@@ -228 +242 @@
 //     for(int k = 1; k < 4; ++k)
 //     {
-//       printf(" \b%f ", b[j][k]);
+//       printf(" \b%f ", eigvMat[j][k]);
 //     }
 //     printf(" |\n");
 //   }
 
-  axis[0] = new Vector(b[1][1], b[2][1], b[3][1]);
-  axis[1] = new Vector(b[1][2], b[2][2], b[3][2]);
-  axis[2] = new Vector(b[1][3], b[2][3], b[3][3]);
+  axis[0] = new Vector(eigvMat[1][1], eigvMat[2][1], eigvMat[3][1]);
+  axis[1] = new Vector(eigvMat[1][2], eigvMat[2][2], eigvMat[3][2]);
+  axis[2] = new Vector(eigvMat[1][3], eigvMat[2][3], eigvMat[3][3]);
   box->axis = axis;
   PRINTF(0)("-- Got Axis\n");
-
-  delete [] a[0];
-  delete [] a[1];
-  delete [] a[2];
-  delete [] a[3];
-  delete [] a;
-
-  delete [] b[0];
-  delete [] b[1];
-  delete [] b[2];
-  delete [] b[3];
-  delete [] b;
-
 
 //   printf("\neigenvector: %f, %f, %f\n", box->axis[0]->x, box->axis[0]->y, box->axis[0]->z);
 //   printf("eigenvector: %f, %f, %f\n", box->axis[1]->x, box->axis[1]->y, box->axis[1]->z);
 //   printf("eigenvector: %f, %f, %f\n", box->axis[2]->x, box->axis[2]->y, box->axis[2]->z);
+
+
+//   delete [] a[0]; delete [] a[1]; delete [] a[2]; delete [] a[3];
+//   delete [] a;
+//
+//   delete [] b[0]; delete [] b[1]; delete [] b[2]; delete [] b[3];
+//   delete [] b;
+//
+//   delete rot;
 
 
@@ -291 +301 @@
   box->halfLength = halfLength;
   PRINTF(0)("-- Written Axis to obb\n");
-
+  PRINTF(0)("-- Finished Calculating Attributes\n");
 
 //   printf("\nwe got length: \n");
@@ -403 +413 @@
     element = iterator->nextElement();
   }
+
+  this->tmpVert1 = vertList1;
+  this->tmpVert2 = vertList2;
+  this->tmpLen1 = partition1.getSize();
+  this->tmpLen2 = partition2.getSize();
 
   //delete iterator;
@@ -412 +427 @@
 //     printf("v[%i][2] = %f\n", i, vertList2[i][2]);
 //   }
-
-  /* now spawn the obb tree: create the nodes and descent */
-  OBBTreeNode*       node1 = new OBBTreeNode();
-  OBBTreeNode*       node2 = new OBBTreeNode();
-
-  this->nodeLeft = node1;
-  this->nodeRight = node2;
-
-  this->nodeLeft->spawnBVTree(depth - 1, vertList1, partition1.getSize());
-  this->nodeRight->spawnBVTree(depth - 1, vertList2, partition2.getSize());
 }
 

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

@@ -41 +41 @@
 
   private:
-    OBB* createBox();
     void calculateBoxAttributes(OBB* box, sVec3D* verticesList, int length);
     void forkBox(OBB* box);
@@ -58 +57 @@
     int                 depth;                      //!< the depth of the node in the tree
     static OBBTree*     obbTree;                    //!< reference to the obb tree
+
+    /* tmp saving place for obb variables */
+    sVec3D*             tmpVert1;
+    sVec3D*             tmpVert2;
+    int                 tmpLen1;
+    int                 tmpLen2;
+
+    static float**       coMat;
+    static float**       eigvMat;
+    static float*        eigvlMat;
+    static int*          rotCount;
 };
 

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -35 +35 @@
   model = new MD2Model("models/tris.md2", "models/tris.pcx");
   model->tick(0.1f);
-  CDEngine::getInstance()->debugSpawnTree(2, model->data->pVertices, model->data->numVertices);
+
+//   int const length = 6;
+//   sVec3D* vertList = new sVec3D[length];
+//   sVec3D data[length]  = {{5.0, 0.0, 0.0},{2.0, 0.0, 5.0},{14.0, 0.0, 0.0}, {5.0, 0.0, 1.0}, {12.0, 0.0, 8.0}, {3.0, 5.0, 4.9}};
+//
+//   for(int i = 0; i < length; ++i)
+//   {
+//     vertList[i][0] = data[i][0];
+//     vertList[i][1] = data[i][1];
+//     vertList[i][2] = data[i][2];
+//   }
+
+  CDEngine::getInstance()->debugSpawnTree(1, model->data->pVertices, model->data->numVertices);
 
 
@@ -70 +82 @@
 void Framework::moduleDraw() const
 {
-  CDEngine::getInstance()->drawBV(2);
+  CDEngine::getInstance()->drawBV(1);
 
   LightManager::getInstance()->draw();