Changeset 5665 in orxonox.OLD for trunk/src/lib/math/matrix.h

Timestamp:

Nov 21, 2005, 10:17:56 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: optimized matrix

File:

• trunk/src/lib/math/matrix.h (modified) (7 diffs)

trunk/src/lib/math/matrix.h

@@ -29 +29 @@
     };
 
-    Matrix operator+ (const Matrix& m) {
+    Matrix operator+ (const Matrix& m) const {
       return Matrix (this->m11 + m.m11, this->m12 + m.m12, this->m13 + m.m13,
                      this->m21 + m.m21, this->m22 + m.m22, this->m23 + m.m23,
@@ -35 +35 @@
     }
 
-    Matrix operator- (const Matrix& m) {
+    Matrix operator- (const Matrix& m) const {
       return Matrix (this->m11 - m.m11, this->m12 - m.m12, this->m13 - m.m13,
                      this->m21 - m.m21, this->m22 - m.m22, this->m23 - m.m23,
@@ -41 +41 @@
     }
 
-    Matrix operator* (float k) {
+    Matrix operator* (float k) const {
       return Matrix(this->m11 - k, this->m12 - k, this->m13 - k,
                     this->m21 - k, this->m22 - k, this->m23 - k,
@@ -47 +47 @@
     }
 
-    Vector operator* (const Vector& v) {
+    Vector operator* (const Vector& v) const {
       return Vector (this->m11*v.x + this->m12*v.y + this->m13*v.z,
                      this->m21*v.x + this->m22*v.y + this->m23*v.z,
@@ -55 +55 @@
 
 
-    Matrix getTransposed() {
+    Matrix getTransposed() const {
       return Matrix( this->m11, this->m21, this->m31,
                      this->m12, this->m22, this->m32,
@@ -61 +61 @@
     }
 
-    void toVectors(Vector& m1, Vector& m2, Vector& m3) {
+    void toVectors(Vector& m1, Vector& m2, Vector& m3) const {
       m1 = Vector(this->m11, this->m12, this->m13);
       m2 = Vector(this->m21, this->m22, this->m23);
@@ -67 +67 @@
     }
 
+    Vector eigenValues() const;
+    void eigenVectors(Vector& a, Vector& b, Vector& c) const;
 
     /// @todo optimize
     static Matrix identity() { return Matrix (1,0,0, 0,1,0, 0,0,1); }
 
-    void eigVl(const Matrix& matrix);
     void debug() const;