Remove POLY constructors

This commit is contained in:
2023-09-27 21:15:53 +02:00
parent 7943bafb8d
commit 0e78551a5a
2 changed files with 158 additions and 111 deletions

View File

@@ -26,13 +26,13 @@ static constexpr auto RectangleClut = GPU::PageClut(320, 510);
static constexpr auto LineColor = GPU::Color24(0xFF, 0x0, 0x0);
static constexpr const auto triangle1 = GPU::POLY_F3({
static constexpr const auto triangle1 = GPU::POLY_F3::create({
{TriangleArea.position.x, TriangleArea.position.y},
{TriangleArea.size.width, TriangleArea.size.height},
{TriangleArea.position.x, TriangleArea.size.height}},
TriangleColor
);
static constexpr const auto triangle2 = GPU::POLY_FT3({
static constexpr const auto triangle2 = GPU::POLY_FT3::create({
{TriangleArea.position.x, TriangleArea.position.y},
{TriangleArea.size.width, TriangleArea.position.y},
{TriangleArea.size.width, TriangleArea.size.height}},{
@@ -44,12 +44,12 @@ static constexpr const auto triangle2 = GPU::POLY_FT3({
TriangleClut,
GPU::Color24::Grey()
);
static constexpr const auto triangle3 = GPU::POLY_G3({
static constexpr const auto triangle3 = GPU::POLY_G3::create({
{triangle1.vertex0.move(TriangleArea.size.width, 0), GPU::Color24::Red()},
{triangle1.vertex1.move(TriangleArea.size.width, 0), GPU::Color24::Green()},
{triangle1.vertex2.move(TriangleArea.size.width, 0), GPU::Color24::Blue()}}
);
static constexpr const auto triangle4 = GPU::POLY_GT3({
static constexpr const auto triangle4 = GPU::POLY_GT3::create({
{triangle2.vertex0.move(TriangleArea.size.width, 0), triangle2.page0, GPU::Color24::Red()},
{triangle2.vertex1.move(TriangleArea.size.width, 0), triangle2.page1, GPU::Color24::Blue()},
{triangle2.vertex2.move(TriangleArea.size.width, 0), triangle2.page2, GPU::Color24::Green()}},
@@ -57,20 +57,20 @@ static constexpr const auto triangle4 = GPU::POLY_GT3({
TriangleClut
);
static constexpr const auto rectangle1 = GPU::POLY_F4(RectangleArea, RectangleColor);
static constexpr const auto rectangle2 = GPU::POLY_FT4({
static constexpr const auto rectangle1 = GPU::POLY_F4::create(RectangleArea, RectangleColor);
static constexpr const auto rectangle2 = GPU::POLY_FT4::create({
RectangleArea.position.move(RectangleArea.size.width, 0), RectangleArea.size}, {0, 0},
RectangleTPage,
RectangleClut,
GPU::Color24::Grey()
);
static constexpr const auto rectangle3 = GPU::POLY_G4(
static constexpr const auto rectangle3 = GPU::POLY_G4::create(
{RectangleArea.position.move(RectangleArea.size.width*2, 0), RectangleArea.size}, {
GPU::Color24::Red(),
GPU::Color24::Blue(),
GPU::Color24::Green(),
GPU::Color24::White()});
static constexpr const auto rectangle4 = GPU::POLY_GT4(
static constexpr const auto rectangle4 = GPU::POLY_GT4::create(
{RectangleArea.position.move(RectangleArea.size.width*3, 0), RectangleArea.size}, {0, 0},
RectangleTPage,
RectangleClut, {
@@ -79,7 +79,7 @@ static constexpr const auto rectangle4 = GPU::POLY_GT4(
GPU::Color24::Green(),
GPU::Color24::White()}
);
static constexpr const auto rectangle5 = GPU::POLY_GT4(
static constexpr const auto rectangle5 = GPU::POLY_GT4::create(
{RectangleArea.position.move(0, RectangleArea.size.height), RectangleArea.size}, {0, 0},
RectangleTPage,
RectangleClut, {