mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 07:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove sf::Vector2<T>::Unit[XY]

Browse Source
This commit is contained in:
vittorioromeo 2024-10-03 17:46:43 +02:00 committed by Chris Thrasher
parent a9298df466
commit 816855d13f
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/SFML/System/Vector2.hpp
View File

@ -202,15 +202,6 @@ public:
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
T x{}; //!< X coordinate of the vector T x{}; //!< X coordinate of the vector
T y{}; //!< Y coordinate of the vector T y{}; //!< Y coordinate of the vector
////////////////////////////////////////////////////////////
// Static member data
////////////////////////////////////////////////////////////
// NOLINTBEGIN(readability-identifier-naming)
static const Vector2 UnitX; //!< The X unit vector (1, 0), usually facing right
static const Vector2 UnitY; //!< The Y unit vector (0, 1), usually facing down
// NOLINTEND(readability-identifier-naming)
}; };
// Define the most common types // Define the most common types

11
include/SFML/System/Vector2.inl
View File

@ -214,15 +214,4 @@ constexpr bool operator!=(Vector2<T> left, Vector2<T> right)
return !(left == right); return !(left == right);
} }
////////////////////////////////////////////////////////////
// Static member data
////////////////////////////////////////////////////////////
template <typename T>
const Vector2<T> Vector2<T>::UnitX(static_cast<T>(1), static_cast<T>(0));
template <typename T>
const Vector2<T> Vector2<T>::UnitY(static_cast<T>(0), static_cast<T>(1));
} // namespace sf } // namespace sf

12
test/System/Vector2.test.cpp
View File

@ -271,14 +271,14 @@ TEMPLATE_TEST_CASE("[System] sf::Vector2", "", int, float)
constexpr sf::Vector2f v(2.4f, 3.0f); constexpr sf::Vector2f v(2.4f, 3.0f);
CHECK(v.angle() == Approx(51.3402_deg)); CHECK(v.angle() == Approx(51.3402_deg));
CHECK(sf::Vector2f::UnitX.angleTo(v) == Approx(51.3402_deg)); CHECK(sf::Vector2f(1.f, 0.f).angleTo(v) == Approx(51.3402_deg));
CHECK(sf::Vector2f::UnitY.angleTo(v) == Approx(-38.6598_deg)); CHECK(sf::Vector2f(0.f, 1.f).angleTo(v) == Approx(-38.6598_deg));
constexpr sf::Vector2f w(-0.7f, -2.2f); constexpr sf::Vector2f w(-0.7f, -2.2f);
CHECK(w.angle() == Approx(-107.65_deg)); CHECK(w.angle() == Approx(-107.65_deg));
CHECK(sf::Vector2f::UnitX.angleTo(w) == Approx(-107.65_deg)); CHECK(sf::Vector2f(1.f, 0.f).angleTo(w) == Approx(-107.65_deg));
CHECK(sf::Vector2f::UnitY.angleTo(w) == Approx(162.35_deg)); CHECK(sf::Vector2f(0.f, 1.f).angleTo(w) == Approx(162.35_deg));
CHECK(v.angleTo(w) == Approx(-158.9902_deg)); CHECK(v.angleTo(w) == Approx(-158.9902_deg));
CHECK(w.angleTo(v) == Approx(158.9902_deg)); CHECK(w.angleTo(v) == Approx(158.9902_deg));
@ -323,8 +323,8 @@ TEMPLATE_TEST_CASE("[System] sf::Vector2", "", int, float)
CHECK(w.projectedOnto(v) == Approx(sf::Vector2f(-1.346342f, -1.682927f))); CHECK(w.projectedOnto(v) == Approx(sf::Vector2f(-1.346342f, -1.682927f)));
CHECK(w.projectedOnto(v) == Approx(-0.560976f * v)); CHECK(w.projectedOnto(v) == Approx(-0.560976f * v));
CHECK(v.projectedOnto(sf::Vector2f::UnitX) == Approx(sf::Vector2f(2.4f, 0.0f))); CHECK(v.projectedOnto(sf::Vector2f(1.f, 0.f)) == Approx(sf::Vector2f(2.4f, 0.0f)));
CHECK(v.projectedOnto(sf::Vector2f::UnitY) == Approx(sf::Vector2f(0.0f, 3.0f))); CHECK(v.projectedOnto(sf::Vector2f(0.f, 1.f)) == Approx(sf::Vector2f(0.0f, 3.0f)));
} }
SECTION("Constexpr support") SECTION("Constexpr support")