Changeset 1150Tweet

Timestamp:

Mar 2, 2012, 6:48:55 PM (11 years ago)

Author:

sam

Message:

math: add missing operators (==, !, <= etc.) to the "half" class so that
it can at last be put into a vector.

Location:

trunk/src

Files:

• half.h (modified) (1 diff)
• lol/math/vector.h (modified) (1 diff)

trunk/src/half.h

@@ -67 +67 @@
 
     /* Operations */
-    inline half operator -() { return makebits(bits ^ 0x8000u); }
+    bool operator ==(half x) const { return (float)*this == (float)x; }
+    bool operator !=(half x) const { return (float)*this != (float)x; }
+    bool operator <(half x) const { return (float)*this < (float)x; }
+    bool operator >(half x) const { return (float)*this > (float)x; }
+    bool operator <=(half x) const { return (float)*this <= (float)x; }
+    bool operator >=(half x) const { return (float)*this >= (float)x; }
+
+    bool operator !() const { return !(bool)*this; }
+    operator bool() const { return bits & 0x7fffu; }
+
+    inline half operator -() const { return makebits(bits ^ 0x8000u); }
+    inline half operator +() const { return *this; }
     inline half &operator +=(float f) { return (*this = (half)(*this + f)); }
     inline half &operator -=(float f) { return (*this = (half)(*this - f)); }

trunk/src/lol/math/vector.h

@@ -1053 +1053 @@
     DECLARE_BOOL_OP(tname, >, >, true, tprefix, T)
 
-/* FIXME: a few problems need to be fixed before we can use "half" here. It
- * will probably never work until we switch to C++11 because it's not really
- * a POD class. */
 #define DECLARE_GLOBAL_TYPED_OPS(tname) \
+    DECLARE_ALL_GLOBAL_OPS(tname, /* empty */, half) \
     DECLARE_ALL_GLOBAL_OPS(tname, /* empty */, float) \
     DECLARE_ALL_GLOBAL_OPS(tname, /* empty */, double) \