Changeset 516Tweet

Timestamp:

Apr 20, 2011, 9:02:25 PM (6 years ago)

Author:

sam

Message:

lol: import newer matrix.h from Lol Engine.

File:

• abuse/trunk/src/lol/matrix.h (modified) (2 diffs)

abuse/trunk/src/lol/matrix.h

@@ -38 +38 @@
     }
 
-#define BOOL_OP(elems, op, ret) \
+#define BOOL_OP(elems, op, op2, ret) \
     inline bool operator op(Vec##elems<T> const &val) const \
     { \
         for (int n = 0; n < elems; n++) \
-            if ((*this)[n] != val[n]) \
-                return ret; \
-        return !ret; \
+            if (!((*this)[n] op2 val[n])) \
+                return !ret; \
+        return ret; \
     }
 
@@ -79 +79 @@
     VECTOR_OP(elems, /) \
     \
-    BOOL_OP(elems, ==, false) \
-    BOOL_OP(elems, !=, true) \
+    BOOL_OP(elems, ==, ==, true) \
+    BOOL_OP(elems, !=, ==, false) \
+    BOOL_OP(elems, <=, <=, true) \
+    BOOL_OP(elems, >=, >=, true) \
+    BOOL_OP(elems, <, <, true) \
+    BOOL_OP(elems, >, >, true) \
     \
     SCALAR_OP(elems, -) \