X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FMath.hh;h=a38af8b049dd77357c175aa79ecb2c5d5969c810;hp=c4e3484ebebc56b5bad7e05cee6c13f9ef657557;hb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4;hpb=16d1a05b0777e97a45c48e2874aa4e5cc791282e

diff --git a/src/Moof/Math.hh b/src/Moof/Math.hh
index c4e3484..a38af8b 100644
--- a/src/Moof/Math.hh
+++ b/src/Moof/Math.hh
@@ -57,6 +57,42 @@ typedef cml::matrix< Scalar, cml::fixed<4,4>,
 typedef cml::quaternion< Scalar, cml::fixed<>, cml::vector_first,
 		cml::positive_cross >					Quaternion;
 
+typedef cml::constants<Scalar>					Constants;
+
+
+inline Vector3& demoteVector(Vector3& left, const Vector4& right)
+{
+	left[0] = right[0];
+	left[1] = right[1];
+	left[2] = right[2];
+	return left;
+}
+
+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] = 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;
+}
+
+
 
 const Scalar EPSILON = 0.000001;
 
@@ -64,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;
 }