X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FMath.hh;h=eb411e06d3299d90778117bafe81b08061c343ad;hb=d50942708db230dc5c43b8df89ede45525e1c394;hp=26c4b5180dc61395c97752bd133b606de9285b10;hpb=72d4af22710317acffab861421c4364b1780b6fe;p=chaz%2Fyoink

diff --git a/src/Moof/Math.hh b/src/Moof/Math.hh
index 26c4b51..eb411e0 100644
--- a/src/Moof/Math.hh
+++ b/src/Moof/Math.hh
@@ -49,6 +49,8 @@ typedef cml::vector< Scalar, cml::fixed<2> >	Vector2;
 typedef cml::vector< Scalar, cml::fixed<3> >	Vector3;
 typedef cml::vector< Scalar, cml::fixed<4> >	Vector4;
 
+typedef cml::matrix< Scalar, cml::fixed<2,2>,
+		cml::col_basis, cml::col_major >		Matrix2;
 typedef cml::matrix< Scalar, cml::fixed<3,3>,
 		cml::col_basis, cml::col_major >		Matrix3;
 typedef cml::matrix< Scalar, cml::fixed<4,4>,
@@ -68,12 +70,27 @@ inline Vector3& demoteVector(Vector3& left, const Vector4& right)
 	return left;
 }
 
-inline Vector4& promoteVector(Vector4& left, const Vector3& right)
+inline Vector2& demoteVector(Vector2& left, const Vector3& right)
+{
+	left[0] = right[0];
+	left[1] = right[1];
+	return left;
+}
+
+inline Vector4& promoteVector(Vector4& left, const Vector3& right, Scalar extra = 1.0)
 {
 	left[0] = right[0];
 	left[1] = right[1];
 	left[2] = right[2];
-	left[3] = 1.0;
+	left[3] = extra;
+	return left;
+}
+
+inline Vector3& promoteVector(Vector3& left, const Vector2& right, Scalar extra = 1.0)
+{
+	left[0] = right[0];
+	left[1] = right[1];
+	left[3] = extra;
 	return left;
 }