diff options
Diffstat (limited to 'Source/Math/vec2math.h')
-rw-r--r-- | Source/Math/vec2math.h | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/Source/Math/vec2math.h b/Source/Math/vec2math.h index d06c975d..a14a9b58 100644 --- a/Source/Math/vec2math.h +++ b/Source/Math/vec2math.h @@ -24,51 +24,51 @@ #include <Math/vec2.h> -inline vec2 operator+(const vec2 &vec, const vec2 & param) { +inline vec2 operator+(const vec2 &vec, const vec2 ¶m) { return vec2(vec.entries[0] + param.entries[0], - vec.entries[1] + param.entries[1]); + vec.entries[1] + param.entries[1]); } -inline vec2 operator-(const vec2 &vec, const vec2 & param) { +inline vec2 operator-(const vec2 &vec, const vec2 ¶m) { return vec2(vec.entries[0] - param.entries[0], - vec.entries[1] - param.entries[1]); + vec.entries[1] - param.entries[1]); } inline vec2 operator*(const vec2 &vec, float param) { return vec2(vec.entries[0] * param, - vec.entries[1] * param); + vec.entries[1] * param); } inline vec2 operator/(const vec2 &vec, float param) { return vec2(vec.entries[0] / param, - vec.entries[1] / param); + vec.entries[1] / param); } -inline vec2& operator+=(vec2 &vec, const vec2 & param) { +inline vec2 &operator+=(vec2 &vec, const vec2 ¶m) { vec.entries[0] += param.entries[0]; vec.entries[1] += param.entries[1]; return vec; } -inline vec2& operator-=(vec2 &vec, const vec2 & param){ +inline vec2 &operator-=(vec2 &vec, const vec2 ¶m) { vec.entries[0] -= param.entries[0]; vec.entries[1] -= param.entries[1]; return vec; } -inline vec2& operator*=(vec2 &vec, float param){ +inline vec2 &operator*=(vec2 &vec, float param) { vec.entries[0] *= param; vec.entries[1] *= param; return vec; } -inline vec2& operator*=(vec2 &vec, const vec2 & param){ +inline vec2 &operator*=(vec2 &vec, const vec2 ¶m) { vec.entries[0] *= param.entries[0]; vec.entries[1] *= param.entries[1]; return vec; } -inline vec2& operator/=(vec2 &vec, float param){ +inline vec2 &operator/=(vec2 &vec, float param) { vec.entries[0] /= param; vec.entries[1] /= param; return vec; @@ -76,12 +76,12 @@ inline vec2& operator/=(vec2 &vec, float param){ inline bool operator==(const vec2 &vec, const vec2 ¶m) { return (vec.entries[0] == param.entries[0] && - vec.entries[1] == param.entries[1]); + vec.entries[1] == param.entries[1]); } inline bool operator!=(const vec2 &vec, const vec2 ¶m) { - return(vec.entries[0] != param.entries[0] || - vec.entries[1] != param.entries[1]); + return (vec.entries[0] != param.entries[0] || + vec.entries[1] != param.entries[1]); } float length(const vec2 &vec); @@ -91,35 +91,35 @@ vec2 components_min2(const vec2 &a, const vec2 &b); vec2 components_max2(const vec2 &a, const vec2 &b); inline float length_squared(const vec2 &vec) { - return vec[0]*vec[0] + vec[1]*vec[1]; + return vec[0] * vec[0] + vec[1] * vec[1]; } inline float dot(const vec2 &vec_a, const vec2 &vec_b) { - return vec_a[0]*vec_b[0] + vec_a[1]*vec_b[1]; + return vec_a[0] * vec_b[0] + vec_a[1] * vec_b[1]; } inline float distance(const vec2 &vec_a, const vec2 &vec_b) { - return length(vec_a-vec_b); + return length(vec_a - vec_b); } inline float distance_squared(const vec2 &vec_a, const vec2 &vec_b) { - return length_squared(vec_a-vec_b); + return length_squared(vec_a - vec_b); } inline vec2 normalize(const vec2 &vec) { - if(vec[0]==0.0f && vec[1]==0.0f && vec[2]==0.0f){ + if (vec[0] == 0.0f && vec[1] == 0.0f && vec[2] == 0.0f) { return vec2(0.0); } - return vec/length(vec); + return vec / length(vec); } inline vec2 operator*(const vec2 &vec_a, const vec2 &vec_b) { - return vec2(vec_a[0]*vec_b[0], - vec_a[1]*vec_b[1]); + return vec2(vec_a[0] * vec_b[0], + vec_a[1] * vec_b[1]); } inline vec2 reflect(const vec2 &vec, const vec2 &normal) { - return vec - normal*(2.0f*dot(vec, normal)); + return vec - normal * (2.0f * dot(vec, normal)); } inline vec2 operator-(const vec2 &vec) { @@ -127,6 +127,5 @@ inline vec2 operator-(const vec2 &vec) { } inline vec2 operator*(float param, const vec2 &vec_b) { - return vec_b*param; + return vec_b * param; } - |