Changeset 7660 in orxonox.OLD for branches/cd

Timestamp:

May 18, 2006, 12:15:48 AM (19 years ago)

Author:

patrick

Message:

cd: collision boxes getting better. but still not centered correctly

Location:

branches/cd/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (4 diffs)
• subprojects/collision_detection/collision_detection.cc (modified) (2 diffs)

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

@@ -131 +131 @@
     for(int j = 0; j < 3; ++j)
     {
-      PRINTF(2)("  vertex[%i]: %f, %f, %f\n", j, modelInf.pVertices[modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j]]);
+      PRINTF(2)("  vertex[%i]: %f, %f, %f\n", j, (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j]])[0],
+      (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j]])[1],
+      (&modelInf.pVertices[modelInf.pTriangles[triangleIndexes[i]].indexToVertices[j]])[2]);
     }
   }
@@ -231 +233 @@
   }
   //box.center = center;
+  //FIXME setting center to 0,0,0
   box.center = Vector();
 
@@ -281 +284 @@
   box.axis[2] = axis[2];
 
-//   box.axis[0] = Vector(1,0,0);
-//   box.axis[1] = Vector(0,1,0);
-//   box.axis[2] = Vector(0,0,1);
+  box.axis[0] = Vector(1,0,0);
+  box.axis[1] = Vector(0,1,0);
+  box.axis[2] = Vector(0,0,1);
 
   PRINTF(3)("Eigenvectors:\n");
@@ -391 +394 @@
 
   // FIXME: += anstatt -= ????????? verwirr
-  box.center.x -= centerOffset[0];
-  box.center.y -= centerOffset[1];
-  box.center.z -= centerOffset[2];
+  box.center.x += centerOffset[0];
+  box.center.y += centerOffset[1];
+  box.center.z += centerOffset[2];
 
   PRINTF(3)("\n");

branches/cd/src/subprojects/collision_detection/collision_detection.cc

@@ -90 +90 @@
      printf("no path specified, using default model: models/ships/fighter.obj\n\n");
      printf("----------------------- WARNING ---------------------\n");
-     b = new CollisionTestEntity("models/test/cd_test_1.obj"); b->setName("Jaeger");
+     b = new CollisionTestEntity("models/test/cd_test_0.obj"); b->setName("Jaeger");
    }
 //   b->setRelCoor(0.0, 0.0, -20.0);
@@ -267 +267 @@
   while( entity != NULL)
   {
-    if( likely(drawModel))
+    //if( likely(drawModel))
       entity->draw();
     entity->drawBVTree(depth, drawMode);