Changeset 6450 in orxonox.OLD

Timestamp:

Jan 9, 2006, 2:14:00 PM (18 years ago)

Author:

bensch

Message:

cd: correctness

Location:

branches/collision_detection/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/math/matrix.cc (modified) (3 diffs)
• subprojects/collision_detection/collision_detection.cc (modified) (2 diffs)

branches/collision_detection/src/lib/collision_detection/cd_engine.cc

@@ -83 +83 @@
   WorldEntity* entity1 = iterator1->firstElement();
   WorldEntity* entity2 = iterator2->iteratorElement(iterator1);
-  PRINTF(3)("checking for collisions\n");
+  PRINTF(5)("checking for collisions\n");
   while( entity1 != NULL)
   {

branches/collision_detection/src/lib/math/matrix.cc

@@ -83 +83 @@
 }
 
+
+
+
 void Matrix::getEigenVectors(Vector& eigVc1, Vector& eigVc2, Vector& eigVc3) const
 {
@@ -110 +113 @@
 
     eigVc3 = eigVc1.cross(eigVc2);
+
+    eigVc2 = eigVc3.cross(eigVc1);
   }
   else if (eigenValuesCount == 1)
@@ -120 +125 @@
   eigVc2.normalize();
   eigVc3.normalize();
+
+  if (!(eigVc1.cross(eigVc3) == eigVc2))
+  {
+    eigVc3.cross(eigVc1).debug();
+    eigVc2.debug();
+  }
+  printf("ok\n");
 }
 

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

@@ -83 +83 @@
    if (argc > 1)
    {
-     printf("Loading model %s\n", argv[1]);
+     //printf("Loading model %s\n", argv[1]);
      b->loadModel(argv[1]);
    }
@@ -260 +260 @@
       entity->draw();
     entity->drawBVTree(depth, drawMode);
-    printf("%i, %i\n", depth, drawMode);
+   // printf("%i, %i\n", depth, drawMode);
     entity = iterator->nextElement();
   }