[共通] fix #1164

Siv3D · Dec 12, 2023 · 3426203 · 3426203
1 parent a110199
commit 3426203
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Siv3D/src/Siv3D/Renderer2D/Vertex2DBuilder.cpp b/Siv3D/src/Siv3D/Renderer2D/Vertex2DBuilder.cpp
@@ -3051,7 +3051,7 @@ namespace s3d
 		Vertex2D::IndexType BuildRoundRectShadow(const BufferCreatorFunc& bufferCreator, const RoundRect& roundRect, const float blur, const Float4& color, const float scale, const bool fill)
 		{
 			const float baseRadius = static_cast<float>(roundRect.r);
-			const float nearRadius = (baseRadius - (blur * 0.5f));
+			const float nearRadius = Max(baseRadius - (blur * 0.5f), 0.0f);
 			const float farRadius = (baseRadius + (blur * 0.5f));
 			const FloatRect innerRect{ (roundRect.x + baseRadius), (roundRect.y + baseRadius), (roundRect.x + roundRect.w - baseRadius), (roundRect.y + roundRect.h - baseRadius) };
 			const Vertex2D::IndexType quality = static_cast<uint16>(detail::CaluculateFanQuality(farRadius * scale));

diff --git a/Siv3D/src/Siv3D/RoundRect/SivRoundRect.cpp b/Siv3D/src/Siv3D/RoundRect/SivRoundRect.cpp
@@ -321,6 +321,7 @@ namespace s3d
 
 		RoundRect baseRoundRect = movedBy(offset).stretched(spread);
 		baseRoundRect.r += spread;
+		baseRoundRect.r = Min(baseRoundRect.r, (baseRoundRect.rect.size.minComponent() * 0.5));
 		const double blurClamped = Min({ baseRoundRect.w, baseRoundRect.h, blur });
 
 		SIV3D_ENGINE(Renderer2D)->addRoundRectShadow(baseRoundRect, static_cast<float>(blurClamped), color.toFloat4(), fill);