Changeset 4661 in orxonox.OLD for orxonox

Timestamp:

Jun 20, 2005, 6:47:54 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: center is calculated more precisly now

Location:

orxonox/trunk/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (5 diffs)
• subprojects/collision_detection/collision_detection.cc (modified) (1 diff)

orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -392 +392 @@
   for(int j = 0; j < length; ++j)
     {
-      tmpLength = fabs(p1.distancePoint(vertices[j]));
+      tmpLength = fabs(p0.distancePoint(vertices[j]));
       if( tmpLength > halfLength[0])
         halfLength[0] = tmpLength;
@@ -408 +408 @@
   for(int j = 0; j < length; ++j)
     {
-      tmpLength = fabs(p1.distancePoint(vertices[j]));
+      tmpLength = fabs(p2.distancePoint(vertices[j]));
       if( tmpLength > halfLength[2])
         halfLength[2] = tmpLength;
@@ -431 +431 @@
    for(int j = 0; j < length; ++j)
    {
-     tmpLength = p0.distancePoint(vertices[j]);
+     tmpLength = p1.distancePoint(vertices[j]);
      if( tmpLength > maxLength[1])
        maxLength[1] = tmpLength;
@@ -442 +442 @@
    for(int j = 0; j < length; ++j)
    {
-     tmpLength = p0.distancePoint(vertices[j]);
+     tmpLength = p2.distancePoint(vertices[j]);
      if( tmpLength > maxLength[2])
        maxLength[2] = tmpLength;
@@ -455 +455 @@
    for(int i = 0; i < 3; ++i)
      {
+       PRINTF(0)("max: %f, min: %f \n", maxLength[i], minLength[i]);
        center[i] = (maxLength[i] - minLength[i]) / 2.0f; // min length is negative
        offset[i] = halfLength[i] - center[i];

orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

@@ -45 +45 @@
   model->tick(0.1f);
 
-//   int const length = 6;
-//   sVec3D* vertList = new sVec3D[length];
-//   sVec3D data[length]  = {{5.0, 0.0, 0.0},{2.0, 0.0, 5.0},{14.0, 0.0, 0.0}, {5.0, 0.0, 1.0}, {12.0, 0.0, 8.0}, {3.0, 5.0, 4.9}};
-//
-//   for(int i = 0; i < length; ++i)
-//   {
-//     vertList[i][0] = data[i][0];
-//     vertList[i][1] = data[i][1];
-//     vertList[i][2] = data[i][2];
-//   }
 
   CDEngine::getInstance()->debugSpawnTree(9, model->data->pVertices, model->data->numVertices);