Changeset 4586 in orxonox.OLD

Timestamp:

Jun 10, 2005, 4:25:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now the axis get drawn correctly:)

Location:

orxonox/trunk/src/lib/collision_detection

Files:

• obb_tree.cc (modified) (1 diff)
• obb_tree_node.cc (modified) (3 diffs)

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

@@ -97 +97 @@
   /* generate some test vertices */
   sVec3D* vertList = new sVec3D[3];
-  sVec3D data[]  = {{0.0, 0.0, 0.0},{10.0, -5.0, 0.0},{10.0, 5.0, 0.0}};
+  sVec3D data[]  = {{0.0, 0.0, 0.0},{10.0, -5.0, 5.0},{10.0, 5.0, 0.0}};
 
   for(int i = 0; i < 3; ++i)

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

@@ -205 +205 @@
   box->axis = axis;
   
-  printf("eigenvector: %f, %f, %f\n", V(1, 1), V(2, 1), V(3, 1));
-  printf("eigenvector: %f, %f, %f\n", V(1, 2), V(2, 2), V(3, 2));
-  printf("eigenvector: %f, %f, %f\n", V(1, 3), V(2, 3), V(3, 3));
-
-  box->axis = axis;
-
+  printf("eigenvector: %f, %f, %f\n", box->axis[0]->x, box->axis[0]->y, box->axis[0]->z);
+  printf("eigenvector: %f, %f, %f\n", box->axis[1]->x, box->axis[1]->y, box->axis[1]->z);
+  printf("eigenvector: %f, %f, %f\n", box->axis[2]->x, box->axis[2]->y, box->axis[2]->z);
+
+  
   /* now get the axis length */
   Line                ax[3];                                 //!< the axis
@@ -251 +250 @@
   }
 
-
-
-    
-//   for(int i = 0; i < 3; ++i)
-//   {
-//     halfLength[i] = 0.0f;
-//     for(int j = 0; j < length; ++j)
-//     {
-//       tmpLength = ax[i].distancePoint(vertices[j]);
-//       if( tmpLength > halfLength[i])
-//         halfLength[i] = tmpLength; 
-//     }
-//   }
-
   box->halfLength = halfLength;
+
+  
   
   printf("we got length: \n");
   for(int i = 0; i < 3; ++i)
-    printf("length[%i] = %f\n", i, halfLength[i]);
+    printf("length[%i] = %f\n", i, box->halfLength[i]);
 }
 
@@ -314 +301 @@
   glColor3f(0.0, 0.4, 0.3);
   glVertex3f(this->bvElement->center->x, this->bvElement->center->y, this->bvElement->center->z);
-  glVertex3f(this->bvElement->axis[0]->x * this->bvElement->halfLength[0], this->bvElement->axis[0]->y * this->bvElement->halfLength[0], this->bvElement->axis[0]->z * this->bvElement->halfLength[0]);
-
+  glVertex3f(this->bvElement->center->x + this->bvElement->axis[0]->x * this->bvElement->halfLength[0],
+             this->bvElement->center->y + this->bvElement->axis[0]->y * this->bvElement->halfLength[0],
+             this->bvElement->center->z + this->bvElement->axis[0]->z * this->bvElement->halfLength[0]);
+/*
+  printf("from center: %f, %f, %f\n", this->bvElement->center->x, this->bvElement->center->y, this->bvElement->center->z);
+  printf("to: %f, %f, %f\n\n", this->bvElement->axis[0]->x * this->bvElement->halfLength[0], this->bvElement->axis[0]->y * this->bvElement->halfLength[0], this->bvElement->axis[0]->z * this->bvElement->halfLength[0]);*/
+  
   glVertex3f(this->bvElement->center->x, this->bvElement->center->y, this->bvElement->center->z);
-  glVertex3f(this->bvElement->axis[1]->x * this->bvElement->halfLength[1], this->bvElement->axis[1]->y * this->bvElement->halfLength[1], this->bvElement->axis[1]->z * this->bvElement->halfLength[1]);
+  glVertex3f(this->bvElement->center->x + this->bvElement->axis[1]->x * this->bvElement->halfLength[1],
+             this->bvElement->center->y + this->bvElement->axis[1]->y * this->bvElement->halfLength[1],
+             this->bvElement->center->z + this->bvElement->axis[1]->z * this->bvElement->halfLength[1]);
 
   glVertex3f(this->bvElement->center->x, this->bvElement->center->y, this->bvElement->center->z);
-  glVertex3f(this->bvElement->axis[2]->x * this->bvElement->halfLength[2], this->bvElement->axis[2]->y * this->bvElement->halfLength[2], this->bvElement->axis[2]->z * this->bvElement->halfLength[2]);
+  glVertex3f(this->bvElement->center->x + this->bvElement->axis[2]->x * this->bvElement->halfLength[2],
+             this->bvElement->center->y + this->bvElement->axis[2]->y * this->bvElement->halfLength[2],
+             this->bvElement->center->z + this->bvElement->axis[2]->z * this->bvElement->halfLength[2]);
   
   glEnd();