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

diff --git a/src/Moof/Math.hh b/src/Moof/Math.hh
index 26c4b51..a38af8b 100644
--- a/src/Moof/Math.hh
+++ b/src/Moof/Math.hh
@@ -68,12 +68,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;
 }