Changeset 239Tweet

Timestamp:

Jan 19, 2011, 9:33:36 PM (9 years ago)

Author:

sam

Message:

Implement vector addition, subtraction etc. as well as euclidian distance.

File:

• trunk/src/matrix.h (modified) (3 diffs)

trunk/src/matrix.h

@@ -17 +17 @@
 #define __DH_MATRIX_H__
 
-#define OPERATORS(elems) \
-    inline Vec##elems<T> operator+(Vec##elems<T> const &op) const \
+#include <cmath>
+
+#define VECTOR_OP(elems, op) \
+    inline Vec##elems<T> operator op(Vec##elems<T> const &val) const \
     { \
         Vec##elems<T> ret; \
         for (int n = 0; n < elems; n++) \
-            ret[n] = (*this)[n] + op[n]; \
+            ret[n] = (*this)[n] op val[n]; \
         return ret; \
-    } \
- \
-    inline Vec##elems<T> operator-(Vec##elems<T> const &op) const \
+    }
+
+#define SCALAR_OP(elems, op) \
+    inline Vec##elems<T> operator op(T const &val) const \
     { \
         Vec##elems<T> ret; \
         for (int n = 0; n < elems; n++) \
-            ret[n] = (*this)[n] - op[n]; \
+            ret[n] = (*this)[n] op val; \
         return ret; \
+    }
+
+#define OPERATORS(elems) \
+    T& operator[](int n) { return *(&x + n); } \
+    T const& operator[](int n) const { return *(&x + n); } \
+    \
+    VECTOR_OP(elems, -) \
+    VECTOR_OP(elems, +) \
+    VECTOR_OP(elems, *) \
+    VECTOR_OP(elems, /) \
+    \
+    SCALAR_OP(elems, -) \
+    SCALAR_OP(elems, +) \
+    SCALAR_OP(elems, *) \
+    SCALAR_OP(elems, /) \
+    \
+    inline float len() const \
+    { \
+        T acc = 0; \
+        for (int n = 0; n < elems; n++) \
+            acc += (*this)[n] * (*this)[n]; \
+        return sqrtf((float)acc); \
     }
 
@@ -38 +63 @@
     Vec2() { x = y = 0; }
     Vec2(T _x, T _y) { x = _x; y = _y; }
-    T& operator[](int n) { return *(&x + n); }
-    T const& operator[](int n) const { return *(&x + n); }
 
     OPERATORS(2)
@@ -54 +77 @@
     Vec3() { x = y = z = 0; }
     Vec3(T _x, T _y, T _z) { x = _x; y = _y; z = _z; }
-    T& operator[](int n) { return *(&x + n); }
 
     OPERATORS(3)