Changeset 5215 in orxonox.OLD for trunk/src/lib/graphics/spatial_separation

Timestamp:

Sep 22, 2005, 4:02:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some more fixing of the Errors reported by valgrind
removed some stuff in patrick's collision-detection.
also changed Vector* to Vector in Rectangle (patrick tell me, if this is not ok - but i doubt it

Location:

trunk/src/lib/graphics/spatial_separation

Files:

• quadtree.cc (modified) (3 diffs)
• quadtree_node.cc (modified) (8 diffs)

trunk/src/lib/graphics/spatial_separation/quadtree.cc

@@ -53 +53 @@
   /* make an array with access to the leafs of the Quad-Tree */
   this->nodes = new QuadtreeNode*[(int)pow(4, treeDepth)];
-  int* index = new int; *index = 0;
+  int index = 0; //new int; *index = 0; // !!changed by bensch!!
   for(int i = 0; i < (int)pow(2, treeDepth); ++i)
   {
-    this->rootNode->buildHashTable(this->nodes, index);
+    this->rootNode->buildHashTable(this->nodes, &index);
   }
   /* sort and revert the hash table to fit the right position */
@@ -65 +65 @@
   this->quadLength = this->nodes[0]->getDimension()->getAxis() * 2.0f;
   Rectangle* r = this->rootNode->getDimension();
-  Vector* offset = new Vector();
-  float xOff = r->getCenter()->x - r->getAxis();
-  float yOff = r->getCenter()->z - r->getAxis();
+  //  Vector* offset = new Vector(); // unused removed by bensch
+  float xOff = r->getCenter().x - r->getAxis();
+  float yOff = r->getCenter().z - r->getAxis();
   this->offset = new Vector();
   this->offset->x = xOff;
@@ -136 +136 @@
       for( int k = j + 1; k < len; ++k)
       {
-        a = this->nodes[i * len + j]->getDimension()->getCenter()->z;
-        b = this->nodes[i * len + k]->getDimension()->getCenter()->z;
+        a = this->nodes[i * len + j]->getDimension()->getCenter().z;
+        b = this->nodes[i * len + k]->getDimension()->getCenter().z;
 
         if( b > a)

trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -57 +57 @@
     PRINT(3)(" |");
   PRINT(3)(" | +-| (II) Rectangle Center (%5.2f, %5.2f), half axis length: %5.2f\n",
-  this->pDimension->getCenter()->x, this->pDimension->getCenter()->z, this->pDimension->getAxis());
+  this->pDimension->getCenter().x, this->pDimension->getCenter().z, this->pDimension->getAxis());
 
   this->init();
@@ -205 +205 @@
   tList<sTriangleExt*>*           listD = new tList<sTriangleExt*>();    //!< triangle list of nodeD
   const float*                    pVert;                                 //!< pointer to the vertices
-  const Vector*                   rectCenter;                            //!< vector to the center of the rect
+  Vector                          rectCenter;                            //!< vector to the center of the rect
 
   rectCenter = this->pDimension->getCenter();
@@ -213 +213 @@
     {
       pVert = &this->pVertices[this->pTriangles[i]->indexToVertices[j]];
-      if( pVert[0] > rectCenter->x + this->offset && pVert[2] > rectCenter->z + this->offset)
+      if( pVert[0] > rectCenter.x + this->offset && pVert[2] > rectCenter.z + this->offset)
         listA->add(&this->pTriangles[i]);
-      if( pVert[0] < rectCenter->x + this->offset && pVert[2] > rectCenter->z + this->offset)
+      if( pVert[0] < rectCenter.x + this->offset && pVert[2] > rectCenter.z + this->offset)
         listB->add(&this->pTriangles[i]);
-      if( pVert[0] < rectCenter->x + this->offset && pVert[2] < rectCenter->z + this->offset)
+      if( pVert[0] < rectCenter.x + this->offset && pVert[2] < rectCenter.z + this->offset)
         listC->add(&this->pTriangles[i]);
-      if( pVert[0] > rectCenter->x + this->offset && pVert[2] < rectCenter->z + this->offset)
+      if( pVert[0] > rectCenter.x + this->offset && pVert[2] < rectCenter.z + this->offset)
         listD->add(&this->pTriangles[i]);
     }
@@ -304 +304 @@
 
 
-  v.x = this->pDimension->getCenter()->x + this->pDimension->getAxis() / 2.0f;
+  v.x = this->pDimension->getCenter().x + this->pDimension->getAxis() / 2.0f;
   v.y = 0.0;
-  v.z = this->pDimension->getCenter()->z + this->pDimension->getAxis() / 2.0f;
+  v.z = this->pDimension->getCenter().z + this->pDimension->getAxis() / 2.0f;
   rA = new Rectangle(v, this->pDimension->getAxis() / 2.0f);
-  v.z = this->pDimension->getCenter()->z - this->pDimension->getAxis() / 2.0f;
+  v.z = this->pDimension->getCenter().z - this->pDimension->getAxis() / 2.0f;
   rB = new Rectangle(v, this->pDimension->getAxis() / 2.0f);
-  v.x = this->pDimension->getCenter()->x - this->pDimension->getAxis() / 2.0f;
+  v.x = this->pDimension->getCenter().x - this->pDimension->getAxis() / 2.0f;
   rC = new Rectangle(v, this->pDimension->getAxis() / 2.0f);
-  v.z = this->pDimension->getCenter()->z + this->pDimension->getAxis() / 2.0f;
+  v.z = this->pDimension->getCenter().z + this->pDimension->getAxis() / 2.0f;
   rD = new Rectangle(v, this->pDimension->getAxis() / 2.0f);
 
@@ -371 +371 @@
   for( int i = 0; i < this->treeDepth; ++i)
     PRINT(3)(" |");
-  PRINT(3)(" | +-| (II) Rectangle Dimension  (%5.2f, %5.2f) to (%5.2f, %5.2f), Center (%5.2f, %5.2f)\n", minX, minY, maxX, maxY, rect->getCenter()->x, rect->getCenter()->z, rect->getAxis());
+  PRINT(3)(" | +-| (II) Rectangle Dimension  (%5.2f, %5.2f) to (%5.2f, %5.2f), Center (%5.2f, %5.2f)\n", minX, minY, maxX, maxY, rect->getCenter().x, rect->getCenter().z, rect->getAxis());
   return rect;
 }
@@ -383 +383 @@
 bool QuadtreeNode::includesPoint(const Vector& v) const
 {
-  Vector center = *this->pDimension->getCenter();
+  Vector center = this->pDimension->getCenter();
   float ax = this->pDimension->getAxis();
 
@@ -492 +492 @@
   if( this->treeDepth == this->maxDepth)
   {
-    Vector t1 = *this->pDimension->getCenter();
+    Vector t1 = this->pDimension->getCenter();
     float ax = this->pDimension->getAxis();
     float h = 50.0f;
@@ -525 +525 @@
     return;
 
-  Vector t1 = *this->pDimension->getCenter();
+  Vector t1 = this->pDimension->getCenter();
   float ax = this->pDimension->getAxis();
   float h = 70.0f;