Changeset 4957 in orxonox.OLD

Timestamp:

Jul 25, 2005, 9:06:44 PM (19 years ago)

Author:

patrick

Message:

orxnox/trunk: resolved a conflict, functions now defined well

File:

• orxonox/trunk/src/lib/graphics/spatial_separation/quadtree_node.cc (modified) (4 diffs)

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

@@ -400 +400 @@
       b = *(sVec3D*)&this->pVertices[this->pTriangles[i]->indexToVertices[1]];
       c = *(sVec3D*)&this->pVertices[this->pTriangles[i]->indexToVertices[2]];
-      
+
       if( unlikely(this->pointInTriangle(position, a, b, c)))
-        {
-          tri = this->pTriangles[i];
-          break;
-        }
+        {
+          tri = this->pTriangles[i];
+          break;
+        }
     }
-  
+
   /* calculate height out of the data collected above */
-  
+
 }
 
@@ -419 +419 @@
 
  There is some random behaviour if there are more than one triangle at the same y
- coordinate. At the moment the function just takes the first triangle, that included the 
+ coordinate. At the moment the function just takes the first triangle, that included the
  vector
 */
@@ -433 +433 @@
 
       if( unlikely(this->pointInTriangle(position, a, b, c)))
-        return this->pTriangles[i];
+        return this->pTriangles[i];
     }
   return NULL;
@@ -456 +456 @@
 
 /**
- *  checks if two points are on the same side 
+ *  checks if two points are on the same side
  * @param point one to be checked
  * @param point two to be checked