Changeset 7589 in orxonox.OLD

Timestamp:

May 11, 2006, 2:20:53 AM (18 years ago)

Author:

patrick

Message:

cd: restructuring, bug not found, strange things going on

Location:

branches/cd/src/lib

Files:

• collision_detection/obb_tree_node.cc (modified) (3 diffs)
• math/plane.cc (modified) (1 diff)

branches/cd/src/lib/collision_detection/obb_tree_node.cc

@@ -291 +291 @@
   float               centerOffset[3];
 
+  box.center.debug();
 
   /* get the maximal dimensions of the body in all directions */
@@ -297 +298 @@
   {
     tmpVec = (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[0]].indexToVertices[0]]);
-    maxLength[0] = p0.distancePoint(tmpVec);
-    minLength[0] = p0.distancePoint(tmpVec);
+    Plane* p;
+    if( k == 0)
+      p = &p0;
+    else if( k == 1)
+      p = &p1;
+    else
+      p = &p2;
+    maxLength[k] = p->distancePoint(tmpVec);
+    minLength[k] = p->distancePoint(tmpVec);
+
     for( int j = 0; j < length; ++j)
     {
@@ -304 +313 @@
       {
         tmpVec = (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[j]].indexToVertices[i]]);
-        tmpLength = p0.distancePoint(tmpVec);
-        if( tmpLength > maxLength[0])
-          maxLength[0] = tmpLength;
-        else if( tmpLength < minLength[0])
-          minLength[0] = tmpLength;
+        tmpLength = p->distancePoint(tmpVec);
+        if( tmpLength > maxLength[k])
+          maxLength[k] = tmpLength;
+        else if( tmpLength < minLength[k])
+          minLength[k] = tmpLength;
       }
     }

branches/cd/src/lib/math/plane.cc

@@ -344 +344 @@
   float l = n.len();
   if( l == 0.0) return 0.0;
-  return (n.dot(s) + k) / n.len();
+  return (n.dot(s) /*+ k*/) / n.len();
 }