Changeset 5867 in orxonox.OLD

Timestamp:

Dec 2, 2005, 11:39:18 AM (18 years ago)

Author:

patrick

Message:

collision_detection: further rewrite of some function

File:

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

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

@@ -222 +222 @@
 
 
-void OBBTreeNode::calculateBoxCovariance(OBB& box, const modelInfo& modelInf,
-    const int* triangleIndexes, unsigned int length)
+void OBBTreeNode::calculateBoxCovariance(OBB& box, const modelInfo& modelInf, const int* triangleIndexes, unsigned int length)
 {
 
@@ -238 +237 @@
 
 
-
   /* fist compute all the convex hull face/facelets and centroids */
   for( int i = 0; i < length ; ++i)
@@ -309 +307 @@
 
 
-void OBBTreeNode::calculateBoxEigenvectors(OBB& box, const modelInfo& modInfo,
+
+/**
+ *  calculate the eigenvectors for the object oriented box
+ * @param box: reference to the box
+ * @param modelInf: the model info structure of the model
+ * @param tirangleIndexes: an array with the indexes of the triangles inside this
+ * @param length: the length of the indexes array
+ */
+void OBBTreeNode::calculateBoxEigenvectors(OBB& box, const modelInfo& modelInf,
     const int* triangleIndexes, unsigned int length)
 {
@@ -315 +321 @@
   PRINTF(3)("Calculate the Box Eigenvectors\n");
 
-  const sVec3D*  verticesList;
   Vector         axis[3];                            //!< the references to the obb axis
   Matrix         covMat(  box.covarianceMatrix  );   //!< covariance matrix (in the matrix dataform)
@@ -340 +345 @@
 
 
+
+
+/**
+ *  calculate the eigenvectors for the object oriented box
+ * @param box: reference to the box
+ * @param modelInf: the model info structure of the model
+ * @param tirangleIndexes: an array with the indexes of the triangles inside this
+ * @param length: the length of the indexes array
+ */
 void OBBTreeNode::calculateBoxAxis(OBB& box, const modelInfo& modInfo, const int* triangleIndexes, unsigned int length)
 {
-  //this->calculateBoxAxis(box, (const sVec3D*)modInfo.pVertices, modInfo.numVertices);
-}
-
-
-
-void OBBTreeNode::calculateBoxAxis(OBB& box, const sVec3D* verticesList, unsigned int length)
-{
+
+  sVec3D* verticesList;
+
+
   PRINTF(3)("Calculated attributes3\n");
   /* now get the axis length */