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

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

Location:

trunk/src/lib/collision_detection

Files:

• aabb.cc (modified) (1 diff)
• aabb_tree_node.cc (modified) (3 diffs)
• bounding_sphere.cc (modified) (1 diff)
• bounding_volume.cc (modified) (1 diff)
• bv_tree.cc (modified) (1 diff)
• bv_tree_node.cc (modified) (1 diff)
• cd_engine.cc (modified) (4 diffs)
• obb.cc (modified) (1 diff)
• obb_tree.cc (modified) (1 diff)
• obb_tree_node.cc (modified) (5 diffs)

trunk/src/lib/collision_detection/aabb.cc

@@ -19 +19 @@
 #include "vector.h"
 
-using namespace std;
+
 
 

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);
 
 

trunk/src/lib/collision_detection/bounding_sphere.cc

@@ -18 +18 @@
 #include "bounding_sphere.h"
 
-using namespace std;
+
 
 

trunk/src/lib/collision_detection/bounding_volume.cc

@@ -18 +18 @@
 #include "bounding_volume.h"
 
-using namespace std;
+
 
 

trunk/src/lib/collision_detection/bv_tree.cc

@@ -18 +18 @@
 #include "bv_tree.h"
 
-using namespace std;
+
 
 

trunk/src/lib/collision_detection/bv_tree_node.cc

@@ -18 +18 @@
 #include "bv_tree_node.h"
 
-using namespace std;
+
 
 

trunk/src/lib/collision_detection/cd_engine.cc

@@ -34 +34 @@
 #include "bsp_entity.h"
 
-using namespace std;
+
 
 
@@ -45 +45 @@
 
   this->bAbordOnFirstCollision = false;
-  
+
   this->terrain = NULL;
 }
@@ -86 +86 @@
         if( likely((*entity2) != this->terrain))
         {
-          PRINTF(5)("checking object %s (%s) against %s (%s)\n", (*entity1)->getClassName(), (*entity1)->getName(), (*entity2)->getClassName(), (*entity2)->getName());
+          PRINTF(5)("checking object %s (%s) against %s (%s)\n",
+            (*entity1)->getClassCName(), (*entity1)->getCName(), (*entity2)->getClassCName(), (*entity2)->getCName());
           tree = (*entity1)->getOBBTree();
           if( likely(tree != NULL) && (*entity2)->getOBBTree() != NULL)
@@ -113 +114 @@
       for(entityIterator = list1.begin(); entityIterator != list1.end(); entityIterator++)
       {
-//         PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassName());
+//         PRINTF(0)("Checking: %s a %s\n", (*entityIterator)->getName(), (*entityIterator)->getClassCName());
         (dynamic_cast<BspEntity*>(*bspIterator)->getBspManager())->checkCollision(*entityIterator);
       }

trunk/src/lib/collision_detection/obb.cc

@@ -19 +19 @@
 #include "vector.h"
 
-using namespace std;
+
 
 

trunk/src/lib/collision_detection/obb_tree.cc

@@ -25 +25 @@
 #include "p_node.h"
 
-using namespace std;
+
 
 

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -33 +33 @@
 
 
-using namespace std;
+
 
 
@@ -434 +434 @@
     }
   }
+  delete [] triangleCenter;
   PRINTF(4)("\nPartition1: got \t%i Vertices \nPartition2: got \t%i Vertices\n", partition1.size(), partition2.size());
 
@@ -476 +477 @@
     return;
 
-  float distanceMax = this->bvElement->radius + ((OBBTreeNode*)treeNode)->bvElement->radius;
-  float distance = fabs((nodeA->getAbsCoor() - nodeB->getAbsCoor()).len());
+//   float distanceMax = this->bvElement->radius + ((OBBTreeNode*)treeNode)->bvElement->radius;
+//   float distance = fabs((nodeA->getAbsCoor() - nodeB->getAbsCoor()).len());
 
 
 //   if( distance < distanceMax)
-//     PRINTF(0)(" %s (%s: group %i) vs %s (%s: group %i): distanceMax: %f, distance: %f\n", nodeA->getClassName(), nodeA->getName(), nodeA->getOMListNumber(), nodeB->getClassName(),  nodeB->getName(), nodeB->getOMListNumber(), distanceMax, distance);
+//     PRINTF(0)(" %s (%s: group %i) vs %s (%s: group %i): distanceMax: %f, distance: %f\n", nodeA->getClassCName(), nodeA->getName(), nodeA->getOMListNumber(), nodeB->getClassCName(),  nodeB->getName(), nodeB->getOMListNumber(), distanceMax, distance);
 
 
@@ -504 +505 @@
   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 vs. %s, (%p, %p)\n", this->depth, nodeA->getClassCName(), nodeB->getClassCName(), this->nodeLeft, this->nodeRight);
 
 
@@ -806 +807 @@
       if( this->obbTree->getOwner() != NULL)
       {
-        PRINTF(4)("debug poly draw: depth: %i, mode: %i, entity-name: %s, class: %s\n", depth, drawMode, this->obbTree->getOwner()->getName(), this->obbTree->getOwner()->getClassName());
+        PRINTF(4)("debug poly draw: depth: %i, mode: %i, entity-name: %s, class: %s\n", depth, drawMode, this->obbTree->getOwner()->getCName(), this->obbTree->getOwner()->getClassCName());
       }
       else