Skip to content

Commit

Permalink
MultiPolygonにおける範囲for文の*thisをm_dataへ変更(#1188) (#1189)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ogame3334
Ogame3334 committed Jan 18, 2024
1 parent 0e0b5fc commit 91be5ed
Showing 1 changed file with 25 additions and 25 deletions.
50 changes: 25 additions & 25 deletions Siv3D/src/Siv3D/MultiPolygon/SivMultiPolygon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ namespace s3d

MultiPolygon& MultiPolygon::moveBy(const double x, const double y) noexcept
{
for (auto& polygon : *this)
for (auto& polygon : m_data)
{
polygon.moveBy(x, y);
}
Expand Down Expand Up @@ -158,7 +158,7 @@ namespace s3d

MultiPolygon& MultiPolygon::rotate(const double angle)
{
for (auto& polygon : *this)
for (auto& polygon : m_data)
{
polygon.rotate(angle);
}
Expand All @@ -168,7 +168,7 @@ namespace s3d

MultiPolygon& MultiPolygon::rotateAt(const Vec2& pos, const double angle)
{
for (auto& polygon : *this)
for (auto& polygon : m_data)
{
polygon.rotateAt(pos, angle);
}
Expand All @@ -188,7 +188,7 @@ namespace s3d

MultiPolygon& MultiPolygon::transform(const double s, const double c, const Vec2& pos)
{
for (auto& polygon : *this)
for (auto& polygon : m_data)
{
polygon.transform(s, c, pos);
}
Expand Down Expand Up @@ -228,7 +228,7 @@ namespace s3d

MultiPolygon& MultiPolygon::scale(const double s)
{
for (auto& polygon : *this)
for (auto& polygon : m_data)
{
polygon.scale(s);
}
Expand All @@ -243,7 +243,7 @@ namespace s3d

MultiPolygon& MultiPolygon::scale(const Vec2 s)
{
for (auto& polygon : *this)
for (auto& polygon : m_data)
{
polygon.scale(s);
}
Expand All @@ -263,7 +263,7 @@ namespace s3d

MultiPolygon& MultiPolygon::scaleAt(const Vec2 pos, const double s)
{
for (auto& polygon : *this)
for (auto& polygon : m_data)
{
polygon.scaleAt(pos, s);
}
Expand Down Expand Up @@ -298,7 +298,7 @@ namespace s3d

MultiPolygon& MultiPolygon::scaleAt(const Vec2 pos, const Vec2 s)
{
for (auto& polygon : *this)
for (auto& polygon : m_data)
{
polygon.scaleAt(pos, s);
}
Expand Down Expand Up @@ -420,7 +420,7 @@ namespace s3d

const MultiPolygon& MultiPolygon::paint(Image& dst, const Color& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.paint(dst, color);
}
Expand All @@ -432,7 +432,7 @@ namespace s3d
{
const Vec2 pos{ x, y };

for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.paint(dst, pos, color);
}
Expand All @@ -442,7 +442,7 @@ namespace s3d

const MultiPolygon& MultiPolygon::paint(Image& dst, const Vec2& pos, const Color& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.paint(dst, pos, color);
}
Expand All @@ -452,7 +452,7 @@ namespace s3d

const MultiPolygon& MultiPolygon::overwrite(Image& dst, const Color& color, const Antialiased antialiased) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.overwrite(dst, color, antialiased);
}
Expand All @@ -464,7 +464,7 @@ namespace s3d
{
const Vec2 pos{ x, y };

for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.overwrite(dst, pos, color, antialiased);
}
Expand All @@ -474,7 +474,7 @@ namespace s3d

const MultiPolygon& MultiPolygon::overwrite(Image& dst, const Vec2& pos, const Color& color, const Antialiased antialiased) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.overwrite(dst, pos, color, antialiased);
}
Expand All @@ -484,7 +484,7 @@ namespace s3d

const MultiPolygon& MultiPolygon::draw(const ColorF& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.draw(color);
}
Expand All @@ -494,23 +494,23 @@ namespace s3d

void MultiPolygon::draw(const double x, const double y, const ColorF& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.draw(x, y, color);
}
}

void MultiPolygon::draw(const Vec2& pos, const ColorF& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.draw(pos, color);
}
}

const MultiPolygon& MultiPolygon::drawFrame(const double thickness, const ColorF& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.drawFrame(thickness, color);
}
Expand All @@ -520,23 +520,23 @@ namespace s3d

void MultiPolygon::drawFrame(const double x, const double y, const double thickness, const ColorF& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.drawFrame(x, y, thickness, color);
}
}

void MultiPolygon::drawFrame(const Vec2& pos, const double thickness, const ColorF& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.drawFrame(pos, thickness, color);
}
}

const MultiPolygon& MultiPolygon::drawWireframe(const double thickness, const ColorF& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.drawWireframe(thickness, color);
}
Expand All @@ -546,15 +546,15 @@ namespace s3d

void MultiPolygon::drawWireframe(const double x, const double y, const double thickness, const ColorF& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.drawWireframe(x, y, thickness, color);
}
}

void MultiPolygon::drawWireframe(const Vec2& pos, const double thickness, const ColorF& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.drawWireframe(pos, thickness, color);
}
Expand All @@ -564,15 +564,15 @@ namespace s3d
{
const auto [s, c] = FastMath::SinCos(angle);

for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.drawTransformed(s, c, pos, color);
}
}

void MultiPolygon::drawTransformed(const double s, const double c, const Vec2& pos, const ColorF& color) const
{
for (const auto& polygon : *this)
for (const auto& polygon : m_data)
{
polygon.drawTransformed(s, c, pos, color);
}
Expand Down

0 comments on commit 91be5ed

Please sign in to comment.