Changeset 9406 in orxonox.OLD for trunk/src/lib/collision_detection/aabb_tree_node.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/lib/collision_detection/aabb_tree_node.cc (modified) (3 diffs)

trunk/src/lib/collision_detection/aabb_tree_node.cc

@@ -34 +34 @@
 
 
-using namespace std;
+
 
 
@@ -262 +262 @@
     const int* triangleIndexes, int length)
 {
-
-  Vector         axis[3];                            //!< the references to the obb axis
   Matrix         covMat(  box.covarianceMatrix  );   //!< covariance matrix (in the matrix dataform)
 
@@ -501 +499 @@
   if( this->overlapTest(this->bvElement, treeNode->bvElement, nodeA, nodeB))
   {
-    PRINTF(5)("collision @ lvl %i, object %s vs. %s, (%p, %p)\n", this->depth, nodeA->getClassName(), nodeB->getClassName(), this->nodeLeft, this->nodeRight);
+    PRINTF(5)("collision @ lvl %i, object %s::%s vs. %s::%s, (%p, %p)\n", this->depth, nodeA->getClassCName(), nodeA->getCName(), nodeB->getClassCName(), nodeA->getCName(), this->nodeLeft, this->nodeRight);