diff options
author | Lioncash <mathew1800@gmail.com> | 2019-02-26 22:38:34 -0500 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-02-26 22:38:36 -0500 |
commit | 1b855efd5eb21ef802d15f6a531878754904ad4d (patch) | |
tree | ae6fe25b9e889790b1770bbc77d67e4819d5f572 /src/common/quaternion.h | |
parent | a1574aabd510d5fdc3842780b1d833aa2fb8eac6 (diff) |
common/vector_math: Move Vec[x] types into the Common namespace
These types are within the common library, so they should be using the
Common namespace.
Diffstat (limited to 'src/common/quaternion.h')
-rw-r--r-- | src/common/quaternion.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/quaternion.h b/src/common/quaternion.h index 1c304b048..370198ae0 100644 --- a/src/common/quaternion.h +++ b/src/common/quaternion.h @@ -11,7 +11,7 @@ namespace Common { template <typename T> class Quaternion { public: - Math::Vec3<T> xyz; + Vec3<T> xyz; T w{}; Quaternion<decltype(-T{})> Inverse() const { @@ -38,11 +38,11 @@ public: }; template <typename T> -auto QuaternionRotate(const Quaternion<T>& q, const Math::Vec3<T>& v) { +auto QuaternionRotate(const Quaternion<T>& q, const Vec3<T>& v) { return v + 2 * Cross(q.xyz, Cross(q.xyz, v) + v * q.w); } -inline Quaternion<float> MakeQuaternion(const Math::Vec3<float>& axis, float angle) { +inline Quaternion<float> MakeQuaternion(const Vec3<float>& axis, float angle) { return {axis * std::sin(angle / 2), std::cos(angle / 2)}; } |