Changeset 5663 in orxonox.OLD for trunk

Timestamp:

Nov 21, 2005, 3:25:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more oo-style matrix

Location:

trunk/src/lib/math

Files:

• matrix.cc (modified) (1 diff)
• matrix.h (modified) (2 diffs)

trunk/src/lib/math/matrix.cc

@@ -79 +79 @@
   }
 
-  Matrix M;
+  Matrix M = *this -  Matrix::identity() * eigValue[0];
 
   float u11, u12, u13, u22, u23, u33;

trunk/src/lib/math/matrix.h

@@ -4 +4 @@
 class Matrix
 {
+
+  public:
+    Matrix ( float m11, float m12, float m13,
+             float m21, float m22, float m23,
+             float m31, float m32, float m33 )
+    {
+      this->m11 = m11; this->m12 = m12; this->m13 = m13;
+      this->m21 = m21; this->m22 = m22; this->m23 = m23;
+      this->m31 = m31; this->m32 = m32; this->m33 = m33;
+    }
+
+    Matrix operator+ (const Matrix& m)
+    {
+      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,
+                     this->m31 + m.m31, this->m32 + m.m32, this->m33 + m.m33);
+    }
+
+    Matrix operator- (const Matrix& m)
+    {
+      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,
+                     this->m31 - m.m31, this->m32 - m.m32, this->m33 - m.m33);
+    }
+
+    Matrix operator* (float k)
+    {
+      return Matrix(this->m11 - k, this->m12 - k, this->m13 - k,
+                    this->m21 - k, this->m22 - k, this->m23 - k,
+                    this->m31 - k, this->m32 - k, this->m33 - k);
+    }
+
+    static Matrix identity() {  return Matrix (1,0,0, 0,1,0, 0,0,1);    }
+
+    void eigVl(const Matrix& matrix);
+    void debug() const;
+
+
   public:
     float m11;    float m12;     float m13;
@@ -9 +47 @@
     float m31;    float m32;     float m33;
 
-    void eigVl(const Matrix& matrix);
-    void debug() const;
 };