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

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

File:

• trunk/src/lib/graphics/spatial_separation/quadtree.cc (modified) (3 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)