From 4754359a2160922e0b1b6c387facb0ded25402dd Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 15 Dec 2024 01:26:10 -0600 Subject: [PATCH] [ox/std] Cleanup Vec2 --- deps/ox/src/ox/std/vec.cpp | 4 +--- deps/ox/src/ox/std/vec.hpp | 15 +-------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/deps/ox/src/ox/std/vec.cpp b/deps/ox/src/ox/std/vec.cpp index 8220cec6..deac106b 100644 --- a/deps/ox/src/ox/std/vec.cpp +++ b/deps/ox/src/ox/std/vec.cpp @@ -6,15 +6,13 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include - #include "vec.hpp" namespace ox { static_assert([] { Vec2 v(1, 2); - return v.x == 1 && v.y == 2 && v.size() == 2; + return v.x == 1 && v.y == 2; }()); } diff --git a/deps/ox/src/ox/std/vec.hpp b/deps/ox/src/ox/std/vec.hpp index 8b44ce02..027b599e 100644 --- a/deps/ox/src/ox/std/vec.hpp +++ b/deps/ox/src/ox/std/vec.hpp @@ -12,13 +12,9 @@ #include #endif -#include -#include -#include +#include #include #include -#include -#include #include namespace ox { @@ -61,15 +57,6 @@ class Vec2 { return !operator==(v); } - explicit constexpr operator class Point() const noexcept; - - explicit constexpr operator class Size() const noexcept; - - [[nodiscard]] - constexpr std::size_t size() const noexcept { - return 2; - } - constexpr Vec2 operator+(float i) const noexcept { return {x + i, y + i}; }