Changeset 4587 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 10, 2005, 4:30:00 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: to show, that the algorithm works also with more than 3 vertices:), code renicer

Location:

orxonox/trunk/src/lib/collision_detection

Files:

• obb_tree.cc (modified) (2 diffs)
• obb_tree_node.cc (modified) (2 diffs)

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

@@ -96 +96 @@
 
   /* generate some test vertices */
-  sVec3D* vertList = new sVec3D[3];
-  sVec3D data[]  = {{0.0, 0.0, 0.0},{10.0, -5.0, 5.0},{10.0, 5.0, 0.0}};
+  sVec3D* vertList = new sVec3D[4];
+  sVec3D data[]  = {{0.0, 0.0, 0.0},{10.0, -5.0, 5.0},{10.0, 5.0, 0.0}, {5.0, 4.0, 1.0}};
 
   for(int i = 0; i < 3; ++i)
@@ -106 +106 @@
     }
 
-  this->spawnBVTree(1, vertList, 3);
+  this->spawnBVTree(1, vertList, 4);
 
   PRINT(0)("=  Spawning Tree: Finished\n");

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

@@ -304 +304 @@
              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);
@@ -317 +314 @@
              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();
 }