diff options
Diffstat (limited to 'src/global-coords.hpp')
| -rw-r--r-- | src/global-coords.hpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/global-coords.hpp b/src/global-coords.hpp index 6ae3a37c..017d7c90 100644 --- a/src/global-coords.hpp +++ b/src/global-coords.hpp @@ -1,7 +1,6 @@ #pragma once #include "local-coords.hpp" #include "compat/assert.hpp" -#include <compare> #include <concepts> #include <Magnum/Magnum.h> #include <Magnum/Math/Vector2.h> @@ -116,15 +115,6 @@ public: constexpr Vector2i operator-(global_coords other) const noexcept; }; -struct point -{ - global_coords coord; - Vector2b offset; - - constexpr bool operator==(const point&) const = default; - friend constexpr std::strong_ordering operator<=>(const point& a, const point& b) noexcept; -}; - constexpr local_coords global_coords::local() const noexcept { return { uint8_t(x & 0x0f), uint8_t(y & 0x0f), }; @@ -187,22 +177,4 @@ constexpr Vector2i global_coords::operator-(global_coords other) const noexcept return to_signed() - other.to_signed(); } -constexpr std::strong_ordering operator<=>(const point& p1, const point& p2) noexcept -{ - auto c1 = p1.coord.to_signed3(), c2 = p2.coord.to_signed3(); - - if (auto val = c1.z() <=> c2.z(); val != std::strong_ordering::equal) - return val; - if (auto val = c1.y() <=> c2.y(); val != std::strong_ordering::equal) - return val; - if (auto val = c1.x() <=> c2.x(); val != std::strong_ordering::equal) - return val; - if (auto val = p1.offset.y() <=> p2.offset.y(); val != std::strong_ordering::equal) - return val; - if (auto val = p1.offset.x() <=> p2.offset.x(); val != std::strong_ordering::equal) - return val; - - return std::strong_ordering::equal; -} - } // namespace floormat |