Changeset 7706 in orxonox.OLD

Timestamp:

May 18, 2006, 8:13:53 PM (18 years ago)

Author:

patrick

Message:

cd: now the obb fits perfectly for the first time

File:

• branches/cd/src/lib/collision_detection/obb_tree_node.cc (modified) (1 diff)

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

@@ -359 +359 @@
   for( int i = 0; i < 3; ++i)
   {
-//     centerOffset[i] = (fabs(maxLength[i]) - fabs(minLength[i])) / 2.0f;       // min length is negatie
-    centerOffset[i] = (maxLength[i] + minLength[i]) / 2.0f;       // min length is negatie
-    box.halfLength[i] = (maxLength[i] - minLength[i]) / 2.0f;                 // min length is negative
-  }
-
-  box.center.x += centerOffset[0];
-  box.center.y += centerOffset[1];
-  box.center.z += centerOffset[2];
+    if( maxLength[i] > 0.0f && minLength[i] > 0.0f)  // both axis positiv
+      centerOffset[i] = minLength[i] + (maxLength[i] - minLength[i]) / 2.0f;
+    else if( maxLength[i] > 0.0f && maxLength[i] < 0.0f) // positiv and negativ
+      centerOffset[i] = (maxLength[i] + minLength[i]) / 2.0f;
+    else //both negativ
+     centerOffset[i] = minLength[i] + (maxLength[i] - minLength[i]) / 2.0f;
+
+    box.halfLength[i] = (maxLength[i] - minLength[i]) / 2.0f;
+  }
+
+  box.center += (box.axis[0] * centerOffset[0]);
+  box.center += (box.axis[1] * centerOffset[1]);
+  box.center += (box.axis[2] * centerOffset[2]);
+
 
   PRINTF(3)("\n");