edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #681 from Ryozuki/pr_vmath

Browse source 
Fix a typo and refactor the normalize function
This commit is contained in:
necropotame 2017-03-16 08:19:39 +01:00 committed by GitHub
parent afce3c9d3d d0c317d7c7
commit 6c3ac82f31
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/base/vmath.h
View file

@ -26,7 +26,7 @@ public:
vector2_base operator +(const vector2_base &v) const { return vector2_base(x+v.x, y+v.y); }
vector2_base operator *(const T v) const { return vector2_base(x*v, y*v); }
vector2_base operator *(const vector2_base &v) const { return vector2_base(x*v.x, y*v.y); }
vector2_base operator /(const T v) const { return vector3_base(x/v, y/v); }
vector2_base operator /(const T v) const { return vector2_base(x/v, y/v); }
vector2_base operator /(const vector2_base &v) const { return vector2_base(x/v.x, y/v.y); }
const vector2_base &operator =(const vector2_base &v) { x = v.x; y = v.y; return *this; }
@ -66,8 +66,7 @@ inline T dot(const vector2_base<T> a, const vector2_base<T> &b)
template<typename T>
inline vector2_base<T> normalize(const vector2_base<T> &v)
{
T l = (T)(1.0f/sqrtf(v.x*v.x + v.y*v.y));
return vector2_base<T>(v.x*l, v.y*l);
return v / length(v);
}
typedef vector2_base<float> vec2;
@ -149,8 +148,7 @@ inline T dot(const vector3_base<T> &a, const vector3_base<T> &b)
template<typename T>
inline vector3_base<T> normalize(const vector3_base<T> &v)
{
T l = (T)(1.0f/sqrtf(v.x*v.x + v.y*v.y + v.z*v.z));
return vector3_base<T>(v.x*l, v.y*l, v.z*l);
return v / length(v);
}
template<typename T>