X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FMath.hh;h=a38af8b049dd77357c175aa79ecb2c5d5969c810;hb=8ad81a8282ce6e9e488a453e6bcd05fbc09715dc;hp=4e1cda8c1a25f3a4f57cffe616a56564040f45f6;hpb=493ddb59a8620b49dfa0ff62ce93395ebfd02e86;p=chaz%2Fyoink

diff --git a/src/Moof/Math.hh b/src/Moof/Math.hh
index 4e1cda8..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;
 }
 
@@ -85,7 +100,7 @@ const Scalar EPSILON = 0.000001;
  * Check the equality of scalars with a certain degree of error allowed.
  */
 
-inline bool checkEquality(Scalar a, Scalar b, Scalar epsilon = EPSILON)
+inline bool isEqual(Scalar a, Scalar b, Scalar epsilon = EPSILON)
 {
 	return std::abs(a - b) < epsilon;
 }