preliminary cleanup of character class

[chaz/yoink] / src / Moof / Math.hh

diff --git a/src/Moof/Math.hh b/src/Moof/Math.hh
index 563746e380e5b38fc347f856b3cebd6b3b63c2bd..6665a195bc0341f0acb629d4e036bea95efd0c19 100644 (file)
--- a/src/Moof/Math.hh
+++ b/src/Moof/Math.hh
@@ -37,33 +37,60 @@
 #include <cmath>
 #include <cml/cml.h>
 
+#include <Moof/OpenGL.hh>              // GLscalar
+
 
 namespace Mf {
 
 
-// Basic types.
+typedef GLscalar                                                               Scalar;
+
+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>,
+               cml::col_basis, cml::col_major >                Matrix4;
+
+typedef cml::quaternion< Scalar, cml::fixed<>, cml::vector_first,
+               cml::positive_cross >                                   Quaternion;
 
-typedef float                          Scalar;                         ///< Scalar type.
+typedef cml::constants<Scalar>                                 Constants;
+
+
+inline Vector3 demote(const Vector4& vec)
+{
+       return Vector3(vec[0], vec[1], vec[2]);
+}
 
-typedef cml::vector2f          Vector2;
-typedef cml::vector3f          Vector3;
-typedef cml::vector4f          Vector4;
+inline Vector2 demote(const Vector3& vec)
+{
+       return Vector2(vec[0], vec[1]);
+}
 
-typedef cml::matrix33f_c       Matrix3;
-typedef cml::matrix44f_c       Matrix4;
+inline Vector4 promote(const Vector3& vec, Scalar extra = 1.0)
+{
+       return Vector4(vec[0], vec[1], vec[2], extra);
+}
 
-typedef cml::quaternionf_p     Quaternion;
+inline Vector3 promote(const Vector2& vec, Scalar extra = 1.0)
+{
+       return Vector3(vec[0], vec[1], extra);
+}
 
-typedef Vector4                                Color;
 
 
-const Scalar EPSILON = 0.000001f;
+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;
 }