From 2788a0c57e55c4f40eea2188fcbe758aa69b083e Mon Sep 17 00:00:00 2001 From: appbird Date: Mon, 18 Nov 2024 08:17:37 +0900 Subject: [PATCH] =?UTF-8?q?Update=20Geometry.ipp=20=E3=82=B3=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=80=8C?= =?UTF-8?q?=E8=A8=B1=E5=AE=B9=E8=AA=A4=E5=B7=AE=E4=BB=A5=E4=B8=8B=E3=80=8D?= =?UTF-8?q?=E3=81=A7=E3=81=82=E3=82=8C=E3=81=B0=E5=86=86=E3=81=AB=E5=90=AB?= =?UTF-8?q?=E3=81=BE=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B=E3=81=A8=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Siv3D/include/Siv3D/detail/Geometry2D.ipp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Siv3D/include/Siv3D/detail/Geometry2D.ipp b/Siv3D/include/Siv3D/detail/Geometry2D.ipp index ec141fda1..b537817f9 100644 --- a/Siv3D/include/Siv3D/detail/Geometry2D.ipp +++ b/Siv3D/include/Siv3D/detail/Geometry2D.ipp @@ -44,7 +44,7 @@ namespace s3d /// @brief 点 p が円 c に含まれているかを判定します。 /// @param c 円 /// @param p 点 - /// @param tolerance 許容誤差（相対誤差または絶対誤差のいずれかが許容誤差内であれば許容） + /// @param tolerance 許容誤差（相対誤差または絶対誤差のいずれかが許容誤差以下であれば許容） /// @return 点 p が円 c に含まれている場合 true, それ以外の場合は false [[nodiscard]] inline bool Contains(const Circle& c, const Vec2& p, const double tolerance = 1e-8) @@ -55,10 +55,10 @@ namespace s3d if (rSquared == 0) { - return (err < tolerance); + return (err <= tolerance); } - return (((err / rSquared) < tolerance) || (err < tolerance)); + return (((err / rSquared) <= tolerance) || (err <= tolerance)); } //