Changeset 5694 in orxonox.OLD

Timestamp:

Nov 22, 2005, 12:55:02 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new Matrix Constructor to create a Matrix out of a [3][3]-array

Location:

trunk/src/lib

Files:

• collision_detection/obb_tree_node.cc (modified) (1 diff)
• math/matrix.h (modified) (1 diff)

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -428 +428 @@
   Vector*              axis = new Vector[3];                //!< the references to the obb axis
 
-  Matrix covMat(  box->covarianceMatrix[0][0], box->covarianceMatrix[0][1], box->covarianceMatrix[0][2],
-                  box->covarianceMatrix[1][0], box->covarianceMatrix[1][1], box->covarianceMatrix[1][2],
-                  box->covarianceMatrix[2][0], box->covarianceMatrix[2][1], box->covarianceMatrix[2][2] );
+  Matrix covMat(  box->covarianceMatrix  );
   covMat.getEigenVectors(axis[0], axis[1], axis[2] );
 

trunk/src/lib/math/matrix.h

@@ -22 +22 @@
       this->m31 = m31; this->m32 = m32; this->m33 = m33;
     };
-    Matrix(const float m[9]) {};
+    Matrix(const float m[3][3]) {
+      this->m11 = m[0][0]; this->m12 = m[0][1]; this->m13 = m[0][2];
+      this->m21 = m[1][0]; this->m22 = m[1][1]; this->m23 = m[1][2];
+      this->m31 = m[2][0]; this->m32 = m[2][1]; this->m33 = m[2][2];
+    };
 
     Matrix operator+ (const Matrix& m) const {