cade lab fixes

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

diff --git a/src/Moof/Math.hh b/src/Moof/Math.hh
index c63cfe7db1bddace21e4a4fa8e8b04a460122a19..45c6e90b7ee02543df9bed379ac519291529aaaa 100644 (file)
--- a/src/Moof/Math.hh
+++ b/src/Moof/Math.hh
@@ -37,7 +37,26 @@
 #include <cmath>
 #include <cml/cml.h>
 
-#include <Moof/OpenGL.hh>              // GLscalar
+#include <SDL/SDL_opengl.h>
+
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+
+#if USE_DOUBLE_PRECISION
+
+typedef GLdouble       GLscalar;
+#define GL_SCALAR      GL_DOUBLE
+#define SCALAR(D)      (D)
+
+#else
+
+typedef GLfloat                GLscalar;
+#define GL_SCALAR      GL_FLOAT
+#define SCALAR(F)      (F##f)
+
+#endif
 
 
 namespace Mf {
@@ -72,17 +91,58 @@ inline Vector2 demote(const Vector3& vec)
        return Vector2(vec[0], vec[1]);
 }
 
-inline Vector4 promote(const Vector3& vec, Scalar extra = 1.0)
+inline Vector4 promote(const Vector3& vec, Scalar extra = 0.0)
 {
        return Vector4(vec[0], vec[1], vec[2], extra);
 }
 
-inline Vector3 promote(const Vector2& vec, Scalar extra = 1.0)
+inline Vector3 promote(const Vector2& vec, Scalar extra = 0.0)
 {
        return Vector3(vec[0], vec[1], extra);
 }
 
 
+template <typename R, typename P>
+inline R convert(const P& p)
+{
+       return R(p);
+}
+
+template <>
+inline Vector3 convert<Vector3,Vector4>(const Vector4& vec)
+{
+       return Vector3(vec[0], vec[1], vec[2]);
+}
+
+template <>
+inline Vector2 convert<Vector2,Vector3>(const Vector3& vec)
+{
+       return Vector2(vec[0], vec[1]);
+}
+
+template <>
+inline Vector4 convert<Vector4,Vector3>(const Vector3& vec)
+{
+       return Vector4(vec[0], vec[1], vec[2], SCALAR(0.0));
+}
+
+template <>
+inline Vector3 convert<Vector3,Vector2>(const Vector2& vec)
+{
+       return Vector3(vec[0], vec[1], SCALAR(0.0));
+}
+
+template <typename P>
+struct cast
+{
+       cast(const P& p) : param(p) {}
+       template <typename R>
+       operator R() { return convert<R,P>(param); }
+private:
+       const P& param;
+};
+
+
 
 const Scalar EPSILON = SCALAR(0.000001);