updated Makefile, tests.cc, util/Matrix

git-svn-id: svn://anubis/fart/trunk@16 7f9b0f55-74a9-4bce-be96-3c2cd072584d

Makefile

@@ -15,6 +15,7 @@ $(TARGET):
 	make -C main
 	$(CXX) -o $@ main/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS)
 
+.PHONY: tests
 tests:
 	make -C test
 	$(CXX) -o $@ test/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS)

test/tests.cc

@@ -1,8 +1,29 @@
 
 #include <iostream>
 #include <cassert>
+#include "util/Matrix.h"
 using namespace std;
 
 int main()
 {
+    Matrix m;
+    int v = 1;
+    for (int i = 0; i < 4; i++)
+    {
+        for (int j = 0; j < 4; j++)
+        {
+            m[i][j] = v++;
+        }
+    }
+
+    cout << "m:" << endl << m;
+
+    Matrix i = m.getInverse();
+
+    cout << "i:" << endl << i;
+
+    Matrix mult = m * i;
+    cout << "mult:" << endl << mult;
+
+    return 0;
 }

util/Matrix.cc

@@ -59,6 +59,8 @@ double Matrix::determinant()
 
 void Matrix::calculateInverse()
 {
+    if (m_inverse_calculated)
+        return;
     m_inverse_calculated = true;
     m_inverse_valid = false;
     double det = determinant();
@@ -170,6 +172,23 @@ void Matrix::calculateInverse()
     m_inverse_valid = true;
 }
 
+Matrix Matrix::getInverse()
+{
+    calculateInverse();
+    Matrix m;
+    for (int i = 0; i < 4; i++)
+    {
+        for (int j = 0; j < 4; j++)
+        {
+            m.m_matrix[i][j] = m_inverse[i][j];
+            m.m_inverse[i][j] = m_matrix[i][j];
+        }
+    }
+    m.m_inverse_calculated = true;
+    m.m_inverse_valid = m_inverse_valid;
+    return m;
+}
+
 Matrix operator*(const Matrix & m1, const Matrix & m2)
 {
     Matrix res;
@@ -225,7 +244,10 @@ std::ostream & operator<<(std::ostream & out, const Matrix & m)
             if (j < 3)
                 out << ", ";
         }
-        out << "]" << std::endl;
+        out << "]";
+        if (i == 3)
+            out << " ]";
+        out << std::endl;
     }
     return out;
 }

util/Matrix.h

@@ -14,6 +14,7 @@ class Matrix
         const Matrix_row_t & operator[](int idx) const { return m_matrix[idx]; }
         static Matrix identity();
         double determinant();
+        Matrix getInverse();
 
     protected:
         double m_matrix[4][4];