Merge pull request #59 from Extrawurst/patch-6

allow mat *= mat; (closes #58)
Dav1dde · Apr 9, 2015 · d7530a6 · d7530a6
2 parents 63c02d9 + ac061a0
commit d7530a6
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/gl3n/linalg.d b/gl3n/linalg.d
@@ -1858,6 +1858,10 @@ struct Matrix(type, int rows_, int cols_) if((rows_ > 0) && (cols_ > 0)) {
         masm!(op)(inp, this);
     }
 
+    void opOpAssign(string op)(Matrix inp) if(op == "*") {
+        this = this * inp;
+    }
+
     unittest {
         mat2 m2 = mat2(1.0f, 2.0f, 3.0f, 4.0f);
         vec2 v2 = vec2(2.0f, 2.0f);
@@ -1891,6 +1895,11 @@ struct Matrix(type, int rows_, int cols_) if((rows_ > 0) && (cols_ > 0)) {
         m3 -= m3;
         assert(m3.matrix == [[0.0f, 0.0f, 0.0f], [0.0f, 0.0f, 0.0f], [0.0f, 0.0f, 0.0f]]);
 
+        // test opOpAssign for matrix multiplication
+        auto m4 = mat4.translation(0,1,2);
+        m4 *= mat4.translation(0,-1,2);
+        assert(m4 == mat4.translation(0,0,4));
+
         //TODO: tests for mat4, mat34
     }