[共通] Camera2D::getGrabbedPos() #1242

Siv3D · Jul 3, 2024 · 627c863 · 627c863
1 parent 5d0a497
commit 627c863
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/Siv3D/include/Siv3D/Camera2D.hpp b/Siv3D/include/Siv3D/Camera2D.hpp
@@ -82,6 +82,11 @@ namespace s3d
 		/// @param color UI の色
 		void draw(const ColorF& color = Palette::White) const;
 
+		/// @brief 右クリックによる移動の開始座標を返します。
+		/// @return 右クリックによる移動の開始座標。右クリックによる移動が開始されていない場合は none
+		[[nodiscard]]
+		const Optional<Vec2>& getGrabbedPos() const noexcept;
+
 	protected:
 
 		double m_targetScale = BasicCamera2D::m_scale;
@@ -92,9 +97,9 @@ namespace s3d
 
 		Vec2 m_positionChangeVelocity = Vec2::Zero();
 
-		Optional<Point> m_grabPos;
+		Optional<Vec2> m_grabbedPos;
 
-		Optional<std::pair<Point, Vec2>> m_pointedScale;
+		Optional<std::pair<Vec2, Vec2>> m_pointedScale;
 
 		Camera2DParameters m_parameters;
 

diff --git a/Siv3D/include/Siv3D/detail/Camera2D.ipp b/Siv3D/include/Siv3D/detail/Camera2D.ipp
@@ -32,7 +32,7 @@ namespace s3d
 
 	inline void Camera2D::setTargetCenter(const Vec2 targetCenter) noexcept
 	{
-		m_grabPos.reset();
+		m_grabbedPos.reset();
 		m_pointedScale.reset();
 		m_targetCenter = targetCenter;
 	}
@@ -44,7 +44,7 @@ namespace s3d
 
 	inline void Camera2D::setTargetScale(const double targetScale) noexcept
 	{
-		m_grabPos.reset();
+		m_grabbedPos.reset();
 		m_pointedScale.reset();
 		m_targetScale = targetScale;
 	}
@@ -56,11 +56,16 @@ namespace s3d
 
 	inline void Camera2D::jumpTo(const Vec2 center, const double scale) noexcept
 	{
-		m_grabPos.reset();
+		m_grabbedPos.reset();
 		m_pointedScale.reset();
 		m_targetCenter = m_center = center;
 		m_targetScale = m_scale = scale;
 		m_positionChangeVelocity = Vec2::Zero();
 		m_scaleChangeVelocity = 0.0;
 	}
+
+	inline const Optional<Vec2>& Camera2D::getGrabbedPos() const noexcept
+	{
+		return m_grabbedPos;
+	}
 }
diff --git a/Siv3D/src/Siv3D/Camera2D/SivCamera2D.cpp b/Siv3D/src/Siv3D/Camera2D/SivCamera2D.cpp
@@ -51,7 +51,7 @@ namespace s3d
 
 	void Camera2D::draw(const ColorF& color) const
 	{
-		if ((not m_grabPos)
+		if ((not m_grabbedPos)
 			|| m_pointedScale)
 		{
 			return;
@@ -60,11 +60,12 @@ namespace s3d
 		const auto t1 = Transformer2D{ Mat3x2::Identity(), TransformCursor::Yes, Transformer2D::Target::SetLocal };
 		const auto t2 = Transformer2D{ Mat3x2::Identity(), TransformCursor::Yes, Transformer2D::Target::SetCamera };
 
+		const Vec2 grabbedPos = *m_grabbedPos;
 		const double radius = 12.0;
-		const Point delta = (Cursor::Pos() - m_grabPos.value());
+		const Vec2 delta = (Cursor::PosF() - grabbedPos);
 		const double length = delta.length();
 
-		Circle{ m_grabPos.value(), radius }.drawFrame(4.0, 2.0, color);
+		Circle{ grabbedPos, radius }.drawFrame(4.0, 2.0, color);
 
 		if ((radius * 2) <= length)
 		{
@@ -77,7 +78,7 @@ namespace s3d
 			const Vec2 p2 = direction.withLength(radius * 1.8);
 			const Vec2 p3 = direction.withLength(radius * 1.2) + leftOffset;
 
-			Quad{ p1, p2, p3, p0 }.moveBy(m_grabPos.value()).draw(color);
+			Quad{ p1, p2, p3, p0 }.moveBy(grabbedPos).draw(color);
 		}
 	}
 
@@ -106,7 +107,7 @@ namespace s3d
 		const auto t1 = Transformer2D{ Mat3x2::Identity(), TransformCursor::Yes, Transformer2D::Target::SetLocal };
 		const auto t2 = Transformer2D{ Mat3x2::Identity(), TransformCursor::Yes, Transformer2D::Target::SetCamera };
 
-		const Point cursorPos = Cursor::Pos();
+		const Vec2 cursorPos = Cursor::PosF();
 		const Vec2 point = (m_center + (cursorPos - (sceneSize * 0.5)) / m_scale);
 		m_pointedScale.emplace(cursorPos, point);
 	}
@@ -172,17 +173,17 @@ namespace s3d
 
 		if (MouseR.down())
 		{
-			m_grabPos = Cursor::Pos();
+			m_grabbedPos = Cursor::PosF();
 			m_pointedScale.reset();
 		}
-		else if (m_grabPos)
+		else if (m_grabbedPos)
 		{
-			const Point delta = (Cursor::Pos() - m_grabPos.value());
+			const Vec2 delta = (Cursor::PosF() - *m_grabbedPos);
 			m_targetCenter += m_parameters.grabSpeedFactor * (deltaTime / 1.0) * (delta / m_targetScale);
 
 			if (MouseR.up())
 			{
-				m_grabPos = none;
+				m_grabbedPos = none;
 			}
 		}
 	}