Changeset 7597 in orxonox.OLD for branches

Timestamp:

May 11, 2006, 5:34:14 PM (18 years ago)

Author:

patrick

Message:

cd: plane forumula reformulated since there was a small bug in it.

Location:

branches/cd/src

Files:

• lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)
• lib/math/plane.cc (modified) (5 diffs)
• subprojects/collision_detection/collision_test_entity.cc (modified) (1 diff)

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

@@ -120 +120 @@
   this->calculateBoxCovariance(*this->bvElement, modelInf, triangleIndexes, length);
   this->calculateBoxEigenvectors(*this->bvElement, modelInf, triangleIndexes, length);
-  this->calculateBoxAxis(*this->bvElement, modelInf, triangleIndexes, length);
-  this->calculateBoxAxis(*this->bvElement, modelInf, triangleIndexes, length);
+//   this->calculateBoxAxis(*this->bvElement, modelInf, triangleIndexes, length);
+//   this->calculateBoxAxis(*this->bvElement, modelInf, triangleIndexes, length);
   this->calculateBoxAxis(*this->bvElement, modelInf, triangleIndexes, length);
 
@@ -365 +365 @@
     box.halfLength[i] = (maxLength[i] - minLength[i]) / 2.0f;                 // min length is negative
   }
+
   // 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/lib/math/plane.cc

@@ -268 +268 @@
 {
   n = (a-b).cross(c-b);
-  k = -(n.x*b.x+n.y*b.y+n.z*b.z);
+  k = n.dot(a) / n.len();
 }
 
@@ -279 +279 @@
 {
   n = norm;
-  k = -(n.x*p.x+n.y*p.y+n.z*p.z);
+  k = n.dot(p) / n.len();
 }
 
@@ -292 +292 @@
   Vector p(g[0], g[1], g[2]);
   n = norm;
-  k = -(n.x*p.x+n.y*p.y+n.z*p.z);
+  k = n.dot(p) / n.len();
 }
 
@@ -316 +316 @@
   float l = n.len();
   if( l == 0.0) return 0.0;
-  return (n.dot(p) + k) / n.len();
+  return (n.dot(p) / n.len() - k);
 }
 
@@ -342 +342 @@
 {
   Vector s(p[0], p[1], p[2]);
+
   float l = n.len();
   if( l == 0.0) return 0.0;
-  return (n.dot(s) /*+ k*/) / n.len();
+  return (n.dot(s) / n.len() - k);
 }
 

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

@@ -34 +34 @@
 {
   this->init();
-  this->loadModel(modelName, 1.0f, 0, 3);
+  this->loadModel(modelName, 1.0f, 0, 1);
 /*  this->buildObbTree(0);*/