Changeset 2054Tweet

Timestamp:

Nov 2, 2012, 12:22:00 AM (10 years ago)

Author:

sam

Message:

math: implement abs() and fmod() for vector types and the half class.

Location:

trunk/src/lol/math

Files:

• half.h (modified) (1 diff)
• vector.h (modified) (5 diffs)

trunk/src/lol/math/half.h

@@ -121 +121 @@
 static inline half min(half a, half b) { return a < b ? a : b; }
 static inline half max(half a, half b) { return a > b ? a : b; }
+static inline half fmod(half a, half b) { return (half)fmod((float)a, (float)b); }
+static inline half abs(half a) { return half::makebits(a.bits & 0x7fffu); }
 
 static inline half clamp(half x, half a, half b)

trunk/src/lol/math/vector.h

@@ -1066 +1066 @@
 
 /*
- * vec min(vec, vec)     (also max)
- * vec min(vec, scalar)  (also max)
- * vec min(scalar, vec)  (also max)
+ * vec min(vec, vec)     (also max, fmod)
+ * vec min(vec, scalar)  (also max, fmod)
+ * vec min(scalar, vec)  (also max, fmod)
  */
 #define DECLARE_VECTOR_MINMAX_OP(tname, op, tprefix, type) \
@@ -1105 +1105 @@
  * vec clamp(vec, vec, scalar)
  * vec clamp(vec, scalar, vec)
+ * vec clamp(vec, scalar, scalar)
  */
 #define DECLARE_VECTOR_CLAMP_OP(tname, tprefix, type) \
@@ -1124 +1125 @@
     inline tname<type> clamp(tname<type> const &x, \
                              tname<type> const &a, type const &b) \
+    { \
+        return max(min(x, b), a); \
+    } \
+    \
+    tprefix \
+    inline tname<type> clamp(tname<type> const &x, \
+                             type const &a, type const &b) \
     { \
         return max(min(x, b), a); \
@@ -1211 +1219 @@
     \
     tprefix \
-    inline tname<type> normalize(tname<type> const &val) \
-    { \
-        type norm = (type)length(val); \
-        return norm ? val / norm : val * (type)0; \
+    inline tname<type> normalize(tname<type> const &a) \
+    { \
+        type norm = (type)length(a); \
+        return norm ? a / norm : a * (type)0; \
+    } \
+    \
+    tprefix \
+    inline tname<type> abs(tname<type> const &a) \
+    { \
+        using std::abs; \
+        tname<type> ret; \
+        for (size_t n = 0; n < sizeof(a) / sizeof(type); n++) \
+            ret[n] = abs(a[n]); \
+        return ret; \
     }
 
@@ -1271 +1289 @@
     DECLARE_VECTOR_MINMAX_OP(tname, min, tprefix, type) \
     DECLARE_VECTOR_MINMAX_OP(tname, max, tprefix, type) \
+    DECLARE_VECTOR_MINMAX_OP(tname, fmod, tprefix, type) \
     DECLARE_VECTOR_CLAMP_OP(tname, tprefix, type)