From 783f2ce8c44fbd77ef31b56f718cf46894f8335e Mon Sep 17 00:00:00 2001 From: raclamusi Date: Tue, 14 Nov 2023 14:31:51 +0900 Subject: [PATCH] =?UTF-8?q?Polygon=20=E3=81=AE=E3=83=90=E3=82=A6=E3=83=B3?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E3=83=9C=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=B9=E3=81=AE=E8=A8=88=E7=AE=97=E9=80=9F=E5=BA=A6=E3=80=81?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E3=82=92=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Siv3D/src/Siv3D/Polygon/PolygonDetail.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Siv3D/src/Siv3D/Polygon/PolygonDetail.cpp b/Siv3D/src/Siv3D/Polygon/PolygonDetail.cpp index ed0568ce9..925e32a33 100644 --- a/Siv3D/src/Siv3D/Polygon/PolygonDetail.cpp +++ b/Siv3D/src/Siv3D/Polygon/PolygonDetail.cpp @@ -18,8 +18,7 @@ namespace s3d { namespace detail { - template - static RectF CalculateBoundingRect(const Vector2D* const pVertex, const size_t vertexSize) + static RectF CalculateBoundingRect(const Vec2* const pVertex, const size_t vertexSize) { assert(pVertex != nullptr); assert(vertexSize != 0); @@ -209,7 +208,7 @@ namespace s3d m_indices = std::move(indices); // [5 of 5] - m_boundingRect = detail::CalculateBoundingRect(pOuterVertex, vertexSize); + m_boundingRect = detail::CalculateBoundingRect(m_polygon.outer().data(), m_polygon.outer().size()); } const Array& Polygon::PolygonDetail::outer() const noexcept @@ -370,7 +369,7 @@ namespace s3d m_holes.back().insert(m_holes.back().end(), hole.begin(), hole.end()); } - m_boundingRect = detail::CalculateBoundingRect(m_vertices.data(), m_vertices.size()); + m_boundingRect = detail::CalculateBoundingRect(m_polygon.outer().data(), m_polygon.outer().size()); } void Polygon::PolygonDetail::transform(const double s, const double c, const Vec2& pos) @@ -417,7 +416,7 @@ namespace s3d m_holes.back().insert(m_holes.back().end(), hole.begin(), hole.end()); } - m_boundingRect = detail::CalculateBoundingRect(m_vertices.data(), m_vertices.size()); + m_boundingRect = detail::CalculateBoundingRect(m_polygon.outer().data(), m_polygon.outer().size()); } void Polygon::PolygonDetail::scale(const double s)