Changeset 5927 in orxonox.OLD

Timestamp:

Dec 4, 2005, 11:52:11 PM (18 years ago)

Author:

patrick

Message:

collision_deteciton: works again! but much more massivesvn diff now realy looks good

File:

• branches/collision_detection/src/lib/collision_detection/obb_tree_node.cc (modified) (2 diffs)

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

@@ -483 +483 @@
   std::list<int>           partition1;                           //!< the vertex partition 1
   std::list<int>           partition2;                           //!< the vertex partition 2
-  float*                   triangleCenter;                       //!< the center of the triangle
+  float*                   triangleCenter = new float[3];        //!< the center of the triangle
   const float*             a;                                    //!< triangle  edge a
   const float*             b;                                    //!< triangle  edge b
@@ -504 +504 @@
     c = &box.modelInf->pVertices[box.modelInf->pTriangles[box.triangleIndexes[i]].indexToVertices[2]];
 
-    triangleCenter[0] = (a[0] + b[0] + c[0])/3.0f;
-    triangleCenter[1] = (a[1] + b[1] + c[1])/3.0f;
-    triangleCenter[2] = (a[2] + b[2] + c[2])/3.0f;
-
+    triangleCenter[0] = (a[0] + b[0] + c[0]) / 3.0f;
+    triangleCenter[1] = (a[1] + b[1] + c[1]) / 3.0f;
+    triangleCenter[2] = (a[2] + b[2] + c[2]) / 3.0f;
     tmpDist = this->separationPlane.distancePoint(*((sVec3D*)triangleCenter));
+
     if( tmpDist > 0.0f)
-      partition1.push_back(i); /* positive numbers plus zero */
+      partition1.push_back(box.triangleIndexes[i]); /* positive numbers plus zero */
     else
-      partition2.push_back(i); /* negatice numbers */
+      partition2.push_back(box.triangleIndexes[i]); /* negatice numbers */
   }
   PRINTF(3)("\nPartition1: got \t%i Vertices \nPartition2: got \t%i Vertices\n", partition1.size(), partition2.size());