changed to using c++ operator overloading for vec math funcs

diff --git a/include/vecmath.h b/include/vecmath.h
index e3be4c3cf95ff35254f3e05abd7cac9c257f889c..4449d45ae2f9bf5e7580d3faaf4cf2c547fa7a80 100644 (file)
--- a/include/vecmath.h
+++ b/include/vecmath.h
@@ -8,9 +8,9 @@ struct V2f
     f32 x, y;
 };
 
-V2f v2f_add (V2f a, V2f b);
-V2f v2f_sub (V2f a, V2f b);
-V2f v2f_mul (V2f a, f32 scalar);
+V2f operator+(V2f a, V2f b);
+V2f operator-(V2f a, V2f b);
+V2f operator*(V2f a, f32 scalar);
 f32 v2f_dot (V2f a, V2f b);
 f32 v2f_smag(V2f a);
 f32 v2f_mag (V2f a);

diff --git a/src/vecmath.cpp b/src/vecmath.cpp
index 985da6a0335576487a325fb7233327c4e499b1e9..4d653be1148a468368643e7ce2947b5b0bb2015e 100644 (file)
--- a/src/vecmath.cpp
+++ b/src/vecmath.cpp
@@ -4,19 +4,19 @@
 #include "utils.h"
 
 V2f
-v2f_add(V2f a, V2f b)
+operator+(V2f a, V2f b)
 {
     return (V2f) { .x = a.x + b.x, .y = a.y + b.y };
 }
 
 V2f
-v2f_sub(V2f a, V2f b)
+operator-(V2f a, V2f b)
 {
     return (V2f) { .x = a.x - b.x, .y = a.y - b.y };
 }
 
 V2f
-v2f_mul(V2f a, f32 scalar)
+operator*(V2f a, f32 scalar)
 {
     return (V2f) { .x = a.x * scalar, .y = a.y * scalar };
 }
@@ -43,14 +43,14 @@ V2f
 v2f_norm(V2f a)
 {
     const f32 mag = v2f_mag(a);
-    return v2f_mul(a, 1.0f / mag);
+    return a * (1.0f / mag);
 }
 
 V2f
 v2f_proj(V2f a, V2f onto)
 {
     const f32 dp = v2f_dot(a, onto) / v2f_mag(onto);
-    return v2f_mul(onto, dp);
+    return onto * dp;
 }
 
 
@@ -92,7 +92,7 @@ mat4_mul(mat4 a, mat4 b, mat4* out)
             (*out)[row * 4 + col] = 0.0f;
             
             foreach(i, 0, 4) {
-                (*out)[row * 4 + col] += a[row * 4 + i] + b[i * 4 + col];
+                (*out)[row * 4 + col] += a[row * 4 + i] * b[i * 4 + col];
             }
         }
     }