Circularにlerp関数を追加 (#1206)

zaligan · web-flow · commit 13e405d29782 · 2024-02-24T14:52:41.000+09:00
#1203
diff --git a/Siv3D/include/Siv3D/Circular.hpp b/Siv3D/include/Siv3D/Circular.hpp
@@ -14,6 +14,7 @@
 # include "PointVector.hpp"
 # include "FastMath.hpp"
 # include "PredefinedNamedParameter.hpp"
+# include "Interpolation.hpp"
 
 namespace s3d
 {
@@ -75,6 +76,9 @@ namespace s3d
 
 		constexpr CircularBase& rotate(value_type angle) noexcept;
 
+		[[nodiscard]]
+		CircularBase lerp(const CircularBase& other, double f) const noexcept;
+
 		[[nodiscard]]
 		Float2 toFloat2() const noexcept;
 
diff --git a/Siv3D/include/Siv3D/detail/Circular.ipp b/Siv3D/include/Siv3D/detail/Circular.ipp
@@ -83,6 +83,12 @@ namespace s3d
 		return *this;
 	}
 
+	template<class Float, int32 Oclock>
+	inline CircularBase<Float, Oclock> CircularBase<Float, Oclock>::lerp(const CircularBase& other, double f) const noexcept
+	{
+		return CircularBase{ Math::Lerp(r, other.r, f), Math::LerpAngle(theta, other.theta, f) };
+	}
+
 	template <class Float, int32 Oclock>
 	inline Float2 CircularBase<Float, Oclock>::toFloat2() const noexcept
 	{

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,12 @@ namespace s3d`
`83`	`83`	`return *this;`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ template<class Float, int32 Oclock>`
	`87`	`+ inline CircularBase<Float, Oclock> CircularBase<Float, Oclock>::lerp(const CircularBase& other, double f) const noexcept`
	`88`	`+ {`
	`89`	`+ return CircularBase{ Math::Lerp(r, other.r, f), Math::LerpAngle(theta, other.theta, f) };`
	`90`	`+ }`
	`91`	`+`
`86`	`92`	`template <class Float, int32 Oclock>`
`87`	`93`	`inline Float2 CircularBase<Float, Oclock>::toFloat2() const noexcept`
`88`	`94`	`{`