Changeset 1341Tweet

Timestamp:

May 5, 2012, 5:16:29 PM (11 years ago)

Author:

sam

Message:

math: allow to write 1.f / q to take a quaternion's inverse.

Location:

trunk

Files:

• src/lol/math/vector.h (modified) (7 diffs)
• test/unit/quat.cpp (modified) (1 diff)

trunk/src/lol/math/vector.h

@@ -1104 +1104 @@
 /*
  * vec *(vec, scalar)   (also complex & quaternion)
- * vec *(scalar, vec)   (also complex & quaternion)
  * vec /(vec, scalar)   (also complex & quaternion)
- * vec /(scalar, vec)   (also complex & quaternion)
  */
 #define DECLARE_VECTOR_SCALAR_COERCE_OP(tname, op, tprefix, t1, t2, tf) \
@@ -1116 +1114 @@
             ret[n] = a[n] op val; \
         return ret; \
-    } \
-    \
+    }
+
+/*
+ * vec *(scalar, vec)   (also complex & quaternion)
+ * vec /(scalar, vec)   (NOT for complex & quaternion!)
+ */
+#define DECLARE_SCALAR_VECTOR_COERCE_OP(tname, op, tprefix, t1, t2, tf) \
     tprefix \
     inline tname<tf> operator op(t1 const &val, tname<t2> const &a) \
@@ -1171 +1174 @@
     }
 
-#define DECLARE_BINARY_COERCE_OPS(tname, tprefix, t1, t2, tf) \
-    DECLARE_VECTOR_SCALAR_COERCE_OP(tname, *, tprefix, t1, t2, tf) \
-    DECLARE_VECTOR_SCALAR_COERCE_OP(tname, /, tprefix, t1, t2, tf) \
-    \
+#define DECLARE_BINARY_NONVECTOR_COERCE_OPS(tname, tprefix, t1, t2, tf) \
     DECLARE_VECTOR_VECTOR_COERCE_OP(tname, -, tprefix, t1, t2, tf) \
     DECLARE_VECTOR_VECTOR_COERCE_OP(tname, +, tprefix, t1, t2, tf) \
     \
+    DECLARE_VECTOR_SCALAR_COERCE_OP(tname, *, tprefix, t1, t2, tf) \
+    DECLARE_VECTOR_SCALAR_COERCE_OP(tname, /, tprefix, t1, t2, tf) \
+    DECLARE_SCALAR_VECTOR_COERCE_OP(tname, *, tprefix, t1, t2, tf) \
+    \
     DECLARE_VECTOR_VECTOR_BOOLOP(tname, ==, ==, true, tprefix, t1, t2) \
-    DECLARE_VECTOR_VECTOR_BOOLOP(tname, !=, ==, false, tprefix, t1, t2) \
+    DECLARE_VECTOR_VECTOR_BOOLOP(tname, !=, ==, false, tprefix, t1, t2)
+
+#define DECLARE_BINARY_VECTOR_COERCE_OPS(tname, tprefix, t1, t2, tf) \
+    DECLARE_SCALAR_VECTOR_COERCE_OP(tname, /, tprefix, t1, t2, tf) \
     \
     tprefix \
@@ -1199 +1206 @@
     }
 
-#define DECLARE_BINARY_OPS(tname, tprefix, type) \
-    DECLARE_BINARY_COERCE_OPS(tname, tprefix, type, type, type) \
-    \
-    DECLARE_VECTOR_SCALAR_OP(tname, *, tprefix, type) \
-    DECLARE_VECTOR_SCALAR_OP(tname, /, tprefix, type) \
+#define DECLARE_BINARY_NONVECTOR_OPS(tname, tprefix, type) \
+    DECLARE_BINARY_NONVECTOR_COERCE_OPS(tname, tprefix, type, type, type) \
     \
     DECLARE_VECTOR_VECTOR_OP(tname, -, tprefix, type) \
     DECLARE_VECTOR_VECTOR_OP(tname, +, tprefix, type) \
+    \
+    DECLARE_VECTOR_SCALAR_OP(tname, *, tprefix, type) \
+    DECLARE_VECTOR_SCALAR_OP(tname, /, tprefix, type)
+
+#define DECLARE_BINARY_VECTOR_OPS(tname, tprefix, type) \
+    DECLARE_BINARY_VECTOR_COERCE_OPS(tname, tprefix, type, type, type) \
     \
     DECLARE_VECTOR_MINMAX_OP(tname, min, tprefix, type) \
@@ -1228 +1238 @@
 
 #define DECLARE_ALL_NONVECTOR_OPS(tname) \
-    DECLARE_BINARY_OPS(tname, template<typename T> static, T) \
+    DECLARE_BINARY_NONVECTOR_OPS(tname, template<typename T> static, T) \
     DECLARE_UNARY_OPS(tname, template<typename T> static, T)
 
 #define DECLARE_ALL_VECTOR_OPS_INNER(tname, type) \
-    DECLARE_BINARY_OPS(tname, static, type) \
+    DECLARE_BINARY_VECTOR_OPS(tname, static, type) \
+    DECLARE_BINARY_NONVECTOR_OPS(tname, static, type) \
     DECLARE_UNARY_OPS(tname, static, type) \
     DECLARE_VECTOR_OPS(tname, static, type) \
@@ -1247 +1258 @@
 
 #define DECLARE_VEC_ANY_COERCE_OPS(tname, tlow, thigh) \
-    DECLARE_BINARY_COERCE_OPS(tname, static, tlow, thigh, thigh) \
-    DECLARE_BINARY_COERCE_OPS(tname, static, thigh, tlow, thigh) \
+    DECLARE_BINARY_NONVECTOR_COERCE_OPS(tname, static, tlow, thigh, thigh) \
+    DECLARE_BINARY_NONVECTOR_COERCE_OPS(tname, static, thigh, tlow, thigh) \
+    DECLARE_BINARY_VECTOR_COERCE_OPS(tname, static, tlow, thigh, thigh) \
+    DECLARE_BINARY_VECTOR_COERCE_OPS(tname, static, thigh, tlow, thigh) \
     \
     DECLARE_VECTOR_COERCE_OPS(tname, static, tlow, thigh, thigh) \
@@ -1467 +1480 @@
 #undef DECLARE_VECTOR_VECTOR_BOOLOP
 #undef DECLARE_VECTOR_SCALAR_OP
-#undef DECLARE_BINARY_OPS
+#undef DECLARE_BINARY_VECTOR_OPS
+#undef DECLARE_BINARY_NONVECTOR_OPS
 #undef DECLARE_UNARY_OPS
 #undef DECLARE_ALL_NONVECTOR_OPS

trunk/test/unit/quat.cpp

@@ -117 +117 @@
         quat a(2.f, -2.f, -8.f, 3.f);
         quat b = re(a);
+        quat c = 1.f / a;
+
+        LOLUNIT_ASSERT_DOUBLES_EQUAL(b.w, c.w, 1e-5);
+        LOLUNIT_ASSERT_DOUBLES_EQUAL(b.x, c.x, 1e-5);
+        LOLUNIT_ASSERT_DOUBLES_EQUAL(b.y, c.y, 1e-5);
+        LOLUNIT_ASSERT_DOUBLES_EQUAL(b.z, c.z, 1e-5);
 
         quat m1 = a * b;