big batch of progress

[chaz/yoink] / src / math.hh

diff --git a/src/math.hh b/src/math.hh
index 313ecc1c09fa8b036821cc4871d31f6b06b8957a..ab80dcc35af94cf3677ffa9d4e83224eb3824045 100644 (file)
--- a/src/math.hh
+++ b/src/math.hh
@@ -37,29 +37,29 @@
 #include <cmath>
 #include <cml/cml.h>
 
+#include <iostream>
 
-namespace dc {
 
+namespace dc {
 
-typedef double                         scalar;                         ///< Scalar variable.
 
-typedef cml::vector2d          vector2;
-typedef cml::vector3d          vector3;
-typedef cml::vector4d          vector4;
+// Basic types.
 
-typedef cml::matrix33d_c       matrix3;
-typedef cml::matrix44d_c       matrix4;
+typedef float                          scalar;                         ///< Scalar type.
 
-typedef cml::quaterniond_p     quaternion;
+typedef cml::vector2f          vector2;
+typedef cml::vector3f          vector3;
+typedef cml::vector4f          vector4;
 
-typedef cml::vector4f          color;
+typedef cml::matrix33f_c       matrix3;
+typedef cml::matrix44f_c       matrix4;
 
+typedef cml::quaternionf_p     quaternion;
 
-// Here's a simple way to check the equality of floating-point variables more
-// reliably using approximation.
+typedef vector4                                color;
 
-const scalar default_epsilon = 0.00001;                ///< @see equals()
 
+const scalar default_epsilon = 0.00001;
 
 /**
  * Check the equality of scalars with a certain degree of error allowed.
@@ -75,3 +75,5 @@ inline bool equals(scalar a, scalar b, scalar epsilon = default_epsilon)
 
 #endif // _MATH_HH_
 
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+