Move 2x2 and 4x4 matrices into their own modules

modules/mat2x2.lobster

@@ -0,0 +1,33 @@
+import vec
+
+// A 2x2 matrix representated as a 4 length vector of x,y,z,w so that
+// |x y|
+// |z w|
+
+struct mat2x2 : float4
+
+    def operator*(o:mat2x2):
+        return mat2x2 { dot(o.xz, this),    dot(o.yw, this),
+                        dot(o.xz, this.zw), dot(o.yw, this.zw) }
+
+    def operator*(o:float2):
+        return float2 { dot(o, this),
+                        dot(o, this.zw) }
+
+    def determinant():
+        return x*w - y*z
+
+    def adjugate():
+        return mat2x2 { w, -y, -z, x }
+
+    def inverse():
+        return adjugate() / determinant()
+
+    def trace():
+        return x*w
+
+
+// The identity matrix:
+// |1 0|
+// |0 1|
+let mat2x2_identity = mat2x2 { 1.0, 0.0, 0.0, 1.0 }

modules/matrix.lobster → modules/mat4x4.lobster

@@ -1,39 +1,6 @@
 import vec
 
-// A 2x2 matrix representated as a 4 length vector of x,y,z,w so that
-// |x y|
-// |z w|
-
-struct mat2x2 : float4
-
-    def operator*(o:mat2x2):
-        return mat2x2 { dot(o.xz, this),    dot(o.yw, this),
-                        dot(o.xz, this.zw), dot(o.yw, this.zw) }
-
-    def operator*(o:float2):
-        return float2 { dot(o, this),
-                        dot(o, this.zw) }
-
-    def determinant():
-        return x*w - y*z
-
-    def adjugate():
-        return mat2x2 { w, -y, -z, x }
-
-    def inverse():
-        return adjugate() / determinant()
-
-    def trace():
-        return x*w
-
-
-// The identity matrix:
-// |1 0|
-// |0 1|
-let mat2x2_identity = mat2x2 { 1.0, 0.0, 0.0, 1.0 }
-
-
-// Unlike a smaller matrix like the one above, the 4x4 one is intended to be used with the gl. and matrix. functions,
+// Unlike a smaller mat2x2, the 4x4 one is intended to be used with the gl. and matrix. functions,
 // so stores the elements as a vector. Even though a [float] can support other matrix dimensions, all these
 // built-in functions currently work with exactly 16 elements, hence the name.
 

tests/matrixtest.lobster

@@ -1,5 +1,5 @@
 import testing
-import matrix
+import mat2x2
 
 run_test("matrix"):
 

tests/structtest.lobster

@@ -91,7 +91,6 @@ run_test("struct"):
         // With indexing as parent.
         let v = [ int2_0 ]
         v[0].y = 1
-        print v[0]
         assert v[0] == int2_y
 
     // Control structures.