Pointクラスに剰余演算子「%」と「%=」を追加 (#1058)

#1055
Siv3D · Aug 17, 2023 · 499aae9 · 499aae9
1 parent 5694668
commit 499aae9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/Siv3D/include/Siv3D/Point.hpp b/Siv3D/include/Siv3D/Point.hpp
@@ -139,6 +139,12 @@ namespace s3d
 		[[nodiscard]]
 		constexpr Point operator /(Point p) const noexcept;
 
+		[[nodiscard]]
+		constexpr Point operator %(int32 s) const noexcept;
+
+		[[nodiscard]]
+		constexpr Point operator %(Point p) const noexcept;
+
 		template <class Type>
 		[[nodiscard]]
 		constexpr Vector2D<Type> operator /(Vector2D<Type> v) const noexcept;
@@ -151,6 +157,8 @@ namespace s3d
 
 		constexpr Point& operator /=(int32 s) noexcept;
 
+		constexpr Point& operator %=(int32 s) noexcept;
+
 		[[nodiscard]]
 		friend constexpr bool operator ==(Point lhs, Point rhs) noexcept
 		{

diff --git a/Siv3D/include/Siv3D/detail/Point.ipp b/Siv3D/include/Siv3D/detail/Point.ipp
@@ -178,6 +178,16 @@ namespace s3d
 		return{ x / p.x, y / p.y };
 	}
 
+	inline constexpr Point Point::operator %(const int32 s) const noexcept
+	{
+		return{ x % s, y % s };
+	}
+
+	inline constexpr Point Point::operator %(const Point p) const noexcept
+	{
+		return{ x % p.x, y % p.y };
+	}
+
 	template <class Type>
 	inline constexpr Vector2D<Type> Point::operator /(const Vector2D<Type> v) const noexcept
 	{
@@ -209,6 +219,13 @@ namespace s3d
 		return *this;
 	}
 
+	inline constexpr Point& Point::operator %=(const int32 s) noexcept
+	{
+		assert(s != 0);
+		x %= s; y %= s;
+		return *this;
+	}
+
 	inline constexpr bool Point::isZero() const noexcept
 	{
 		return ((x == 0) && (y == 0));