summaryrefslogtreecommitdiffstats
path: root/src/Vector.hpp
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-08-12 17:09:16 +0200
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2017-08-12 17:09:16 +0200
commit45de7d0537d2caec7d0a7ede48e2b72301bc9da9 (patch)
treeaf17dd093da09dc77a3a07a3d4835a1b5e5b85f6 /src/Vector.hpp
parent2017-08-07 (diff)
downloadAltCraft-45de7d0537d2caec7d0a7ede48e2b72301bc9da9.tar
AltCraft-45de7d0537d2caec7d0a7ede48e2b72301bc9da9.tar.gz
AltCraft-45de7d0537d2caec7d0a7ede48e2b72301bc9da9.tar.bz2
AltCraft-45de7d0537d2caec7d0a7ede48e2b72301bc9da9.tar.lz
AltCraft-45de7d0537d2caec7d0a7ede48e2b72301bc9da9.tar.xz
AltCraft-45de7d0537d2caec7d0a7ede48e2b72301bc9da9.tar.zst
AltCraft-45de7d0537d2caec7d0a7ede48e2b72301bc9da9.zip
Diffstat (limited to '')
-rw-r--r--src/Vector.hpp32
1 files changed, 12 insertions, 20 deletions
diff --git a/src/Vector.hpp b/src/Vector.hpp
index a2d5c6a..c89154f 100644
--- a/src/Vector.hpp
+++ b/src/Vector.hpp
@@ -7,40 +7,32 @@
#include <glm/vec3.hpp>
template<class T>
-class Vector3 {
+struct Vector3 {
T x, y, z;
-public:
+
Vector3(T X = 0, T Y = 0, T Z = 0) : x(X), y(Y), z(Z) {}
Vector3(const Vector3 &rhs) : x(rhs.x), y(rhs.y), z(rhs.z) {}
~Vector3() = default;
- void SetX(T X) { x = X; }
-
- void SetY(T Y) { y = Y; }
-
- void SetZ(T Z) { z = Z; }
-
- T GetX() const { return x; }
-
- T GetY() const { return y; }
-
- T GetZ() const { return z; }
-
- double GetMagnitude() const { return std::sqrt(std::pow(x, 2) + std::pow(y, 2) + std::pow(z, 2)); }
+ double GetLength() const { return std::sqrt(std::pow(x, 2) + std::pow(y, 2) + std::pow(z, 2)); }
operator glm::vec3() const {
return glm::vec3(x, y, z);
}
- void swap(Vector3 &rhs) {
+ glm::vec3 glm() const {
+ return (glm::vec3)(*this);
+ }
+
+ void swap(Vector3 &rhs) noexcept {
std::swap(x, rhs.x);
std::swap(y, rhs.y);
std::swap(z, rhs.z);
}
- Vector3 &operator=(Vector3 rhs) {
+ Vector3 &operator=(Vector3 rhs) noexcept {
rhs.swap(*this);
return *this;
}
@@ -104,7 +96,7 @@ public:
bool operator<(const Vector3 &rhs) const {
return std::tie(x, y, z) < std::tie(rhs.x, rhs.y, rhs.z);
}
-
+
friend std::ostream &operator<<(std::ostream &os, const Vector3 &vector3) {
os << vector3.x << ", " << vector3.y << ", " << vector3.z;
@@ -112,5 +104,5 @@ public:
}
};
-typedef Vector3<double> VectorF;
-typedef Vector3<signed long long> Vector; \ No newline at end of file
+using VectorF = Vector3<double>;
+using Vector = Vector3<signed long long>; \ No newline at end of file