H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #366 from lioncash/vec

Browse Source 
vector_math: Remove AsArray() and Write() functions from Vec[2,3,4]
This commit is contained in:
bunnei 2018-04-20 09:42:41 -04:00 committed by GitHub
commit 79c1ed80e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/vector_math.h
View File

@ -55,10 +55,6 @@ public:
T x; T x;
T y; T y;
T* AsArray() {
return &x;
}
Vec2() = default; Vec2() = default;
Vec2(const T& _x, const T& _y) : x(_x), y(_y) {} Vec2(const T& _x, const T& _y) : x(_x), y(_y) {}
@ -71,11 +67,6 @@ public:
return Vec2<T>(f, f); return Vec2<T>(f, f);
} }
void Write(T a[2]) {
a[0] = x;
a[1] = y;
}
Vec2<decltype(T{} + T{})> operator+(const Vec2& other) const { Vec2<decltype(T{} + T{})> operator+(const Vec2& other) const {
return MakeVec(x + other.x, y + other.y); return MakeVec(x + other.x, y + other.y);
} }
@ -205,10 +196,6 @@ public:
T y; T y;
T z; T z;
T* AsArray() {
return &x;
}
Vec3() = default; Vec3() = default;
Vec3(const T& _x, const T& _y, const T& _z) : x(_x), y(_y), z(_z) {} Vec3(const T& _x, const T& _y, const T& _z) : x(_x), y(_y), z(_z) {}
@ -225,12 +212,6 @@ public:
return MakeVec(f, f, f); return MakeVec(f, f, f);
} }
void Write(T a[3]) {
a[0] = x;
a[1] = y;
a[2] = z;
}
Vec3<decltype(T{} + T{})> operator+(const Vec3& other) const { Vec3<decltype(T{} + T{})> operator+(const Vec3& other) const {
return MakeVec(x + other.x, y + other.y, z + other.z); return MakeVec(x + other.x, y + other.y, z + other.z);
} }
@ -416,10 +397,6 @@ public:
T z; T z;
T w; T w;
T* AsArray() {
return &x;
}
Vec4() = default; Vec4() = default;
Vec4(const T& _x, const T& _y, const T& _z, const T& _w) : x(_x), y(_y), z(_z), w(_w) {} Vec4(const T& _x, const T& _y, const T& _z, const T& _w) : x(_x), y(_y), z(_z), w(_w) {}
@ -436,13 +413,6 @@ public:
return Vec4<T>(f, f, f, f); return Vec4<T>(f, f, f, f);
} }
void Write(T a[4]) {
a[0] = x;
a[1] = y;
a[2] = z;
a[3] = w;
}
Vec4<decltype(T{} + T{})> operator+(const Vec4& other) const { Vec4<decltype(T{} + T{})> operator+(const Vec4& other) const {
return MakeVec(x + other.x, y + other.y, z + other.z, w + other.w); return MakeVec(x + other.x, y + other.y, z + other.z, w + other.w);
} }