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

Timestamp:

Jul 29, 2005, 12:20:03 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some fixeds in the quadtree framework. No debug draw anymore

File:

• orxonox/trunk/src/lib/graphics/spatial_separation/quadtree.cc (modified) (2 diffs)

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

@@ -168 +168 @@
 
   /* check if object is still inside the terrain - this check is not complete @todo check all 4 bounds */
-  if( i < this->maxIndex && j < this->maxIndex)
-    this->nodes[i + j * this->maxIndex]->includesPoint(position);
-  else
-    PRINTF(5)("Object has left terrain\n");
+  if( i < this->maxIndex && j < this->maxIndex && i >= 0 && j >= 0)
+    return this->nodes[i + j * this->maxIndex];
+
+
+  PRINTF(4)("Object has left terrain\n");
+  return NULL;
 }
 
@@ -185 +187 @@
 {
   QuadtreeNode* q = this->getQuadtreeFromPosition(position);
-  return q->getTriangle(position);
+
+  if( likely(q != NULL))
+    return q->getTriangle(position - *this->offset);
+  return NULL;
 }