Changeset 7713 in orxonox.OLD for trunk/src/lib

Timestamp:

May 19, 2006, 12:44:16 AM (19 years ago)

Author:

patrick

Message:

trunk: removed some valgrind errors, but no serious ones. Thunder sound now works, found a bug in my old class. its absolete anyway with the atmoshperic engine

Location:

trunk/src/lib/collision_detection

Files:

• cd_engine.h (modified) (1 diff)
• obb_tree_node.cc (modified) (2 diffs)

trunk/src/lib/collision_detection/cd_engine.h

@@ -56 +56 @@
   void debug();
 
+  /** @returns true if cd alg returns after detecting first error (default behavour) */
+  inline bool isAbordOnFirstCollision() const { return this->bAbordOnFirstCollision; }
+  /** sets @param flag true if the alg should return after detection of the first error */
+  inline void setAbordOnFirstCollision(bool flag) { this->bAbordOnFirstCollision = flag; }
+
 
  private:

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -522 +522 @@
     /* so there is a collision and this is the last box in the tree (i.e. leaf) */
     /* FIXME: If we would choose || insead of && there would also be asymmetrical cases supported */
-    if( unlikely(this->nodeRight == NULL && this->nodeLeft == NULL))
+    if( unlikely(this->nodeRight == NULL || this->nodeLeft == NULL))
     {
       nodeA->collidesWith(nodeB, (((const OBBTreeNode*)&treeNode)->bvElement->center));
@@ -542 +542 @@
 
   /* first check all axis */
-  Vector t;
-  float rA = 0.0f;
-  float rB = 0.0f;
-  Vector l;
-  Vector rotAxisA[3];
-  Vector rotAxisB[3];
+  Vector      t;
+  float       rA = 0.0f;
+  float       rB = 0.0f;
+  Vector      l;
+  Vector      rotAxisA[3];
+  Vector      rotAxisB[3];
 
   rotAxisA[0] =  nodeA->getAbsDir().apply(boxA.axis[0]);