From fc804110217165851c35628602ade2b1ac998358 Mon Sep 17 00:00:00 2001 From: Javidx9 <25419386+OneLoneCoder@users.noreply.github.com> Date: Sat, 14 Nov 2026 16:51:45 +0000 Subject: [PATCH] [draw] Added 3PT Curves --- dev/src/draw.cpp | 27 ++++++++++++ dev/src/draw.h | 51 +++++++++++++++++++++- dev/src/draw_batch.cpp | 27 ++++++++++++ olcPixelGameEngine3.h | 98 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 202 insertions(+), 1 deletion(-) diff --git a/dev/src/draw.cpp b/dev/src/draw.cpp index 9fb9f8c..aef074d 100644 --- a/dev/src/draw.cpp +++ b/dev/src/draw.cpp @@ -535,6 +535,33 @@ const GPUTask& Draw::Line(const olc::vf2d& p1, const olc::Pixel c1, const olc::v ))); } +const GPUTask& olc::Draw::Curve(const olc::vf2d& pStart, const olc::Pixel cStart, const olc::vf2d& pEnd, const olc::Pixel cEnd, const olc::vf2d& pControl, const olc::Pixel tint, const int32_t facets) +{ + PrepareTargetForHW(); + + const float fStep = 1.0f / float(facets-1); + std::vector vPoints(facets); + std::vector vColours(facets); + + for (int32_t i = 0; i < facets; i++) + { + float t = float(i) * fStep; + vPoints[i] = transformAffine.forwardRound((1 - t) * (1 - t) * pStart + 2 * (1 - t) * t * pControl + t * t * pEnd); + vColours[i] = olc::PixelLerp(cStart, cEnd, t); + } + + return vecGPUTasks.data.emplace_back(std::move( + TaskDrawLine( + vPoints, + vColours, + tint + ))); +} + +const GPUTask& olc::Draw::Curve(const olc::vf2d& pStart, const olc::vf2d& pEnd, const olc::vf2d& pControl, const olc::Pixel col, const olc::Pixel tint, const int32_t facets) +{ + return Curve(pStart, col, pEnd, col, pControl, tint, facets); +} const GPUTask& olc::Draw::Rect(const olc::vf2d& pos, const olc::vf2d& size, const olc::Pixel col, const olc::Pixel tint) { diff --git a/dev/src/draw.h b/dev/src/draw.h index 2f9f9c4..5e8cba6 100644 --- a/dev/src/draw.h +++ b/dev/src/draw.h @@ -68,7 +68,12 @@ [#] Line(p1, p2, col, [tint]) [#] Line(p1, c1, p2, c2, [tint]) [#] Line(batch, p1, p2, col, [tint]) - [#] Line(batch, p1, c1, p2, c2, [tint]) + [#] Line(batch, p1, c1, p2, c2, [tint]) + + [#] Curve(p1, p2, pControl, col, [tint]) + [#] Curve(p1, c1, p2, c2, pControl, [tint]) + [#] Curve(batch, p1, p2, pControl, col, [tint]) + [#] Curve(batch, p1, c1, p2, c2, pControl, [tint]) [#] Rect(pos, size, col, [tint]) [#] Rect(pos, size, colTL, colTR, colBL, colBR, [tint]) @@ -344,6 +349,50 @@ namespace olc const olc::Pixel col = olc::Colour::WHITE, const olc::Pixel tint = olc::Colour::WHITE); +// === 3-Point Curves === + + // Draws a single pixel wide 3pt curve into a batch + const LineBatch& Curve( + olc::LineBatch& batch, + const olc::vf2d& pStart, + const olc::vf2d& pEnd, + const olc::vf2d& pControl, + const olc::Pixel col = olc::Colour::WHITE, + const olc::Pixel tint = olc::Colour::WHITE, + const int32_t facets = OLC_DEFAULT_CIRCLE_FACETS); + + // Draws a single pixel wide 3pt curve with a gradient into a batch + const LineBatch& Curve( + olc::LineBatch& batch, + const olc::vf2d& pStart, + const olc::Pixel cStart, + const olc::vf2d& pEnd, + const olc::Pixel cEnd, + const olc::vf2d& pControl, + const olc::Pixel tint = olc::Colour::WHITE, + const int32_t facets = OLC_DEFAULT_CIRCLE_FACETS); + + // Draws a single pixel wide 3pt curve with a gradient + const GPUTask& Curve( + const olc::vf2d& pStart, + const olc::Pixel cStart, + const olc::vf2d& pEnd, + const olc::Pixel cEnd, + const olc::vf2d& pControl, + const olc::Pixel tint = olc::Colour::WHITE, + const int32_t facets = OLC_DEFAULT_CIRCLE_FACETS); + + // Draws a single pixel wide 3pt curve + const GPUTask& Curve( + const olc::vf2d& pStart, + const olc::vf2d& pEnd, + const olc::vf2d& pControl, + const olc::Pixel col = olc::Colour::WHITE, + const olc::Pixel tint = olc::Colour::WHITE, + const int32_t facets = OLC_DEFAULT_CIRCLE_FACETS); + + + // === Rectangles === // Draws a multiple colour rectangle, with linear colour interpolation, into a batch diff --git a/dev/src/draw_batch.cpp b/dev/src/draw_batch.cpp index d5a264e..a5e5b5e 100644 --- a/dev/src/draw_batch.cpp +++ b/dev/src/draw_batch.cpp @@ -94,6 +94,33 @@ const LineBatch& olc::Draw::Line(olc::LineBatch& batch, const olc::vf2d& p1, con return batch; } +const LineBatch& olc::Draw::Curve(olc::LineBatch& batch, const olc::vf2d& pStart, const olc::vf2d& pEnd, const olc::vf2d& pControl, const olc::Pixel col, const olc::Pixel tint, const int32_t facets) +{ + return Curve(batch, pStart, col, pEnd, col, pControl, tint, facets); +} + +const LineBatch& olc::Draw::Curve(olc::LineBatch& batch, const olc::vf2d& pStart, const olc::Pixel cStart, const olc::vf2d& pEnd, const olc::Pixel cEnd, const olc::vf2d& pControl, const olc::Pixel tint, const int32_t facets) +{ + const float fStep = 1.0f / float(facets-1); + olc::vf2d p1, p2; + olc::Pixel c1, c2; + + p1 = pStart; + c1 = cStart; + + for (int32_t i = 1; i < facets; i++) + { + float t = float(i) * fStep; + p2 = transformAffine.forwardRound((1 - t) * (1 - t) * pStart + 2 * (1 - t) * t * pControl + t * t * pEnd); + c2 = olc::PixelLerp(cStart, cEnd, t); + Line(batch, p1, c1, p2, c2, tint); + p1 = p2; + c1 = c2; + } + + return batch; +} + const LineBatch& olc::Draw::Rect(olc::LineBatch& batch, const olc::vf2d& pos, const olc::vf2d& size, const olc::Pixel col, const olc::Pixel tint) { return Rect(batch, pos, size, col, col, col, col, tint); diff --git a/olcPixelGameEngine3.h b/olcPixelGameEngine3.h index 7836f5f..8865f8a 100644 --- a/olcPixelGameEngine3.h +++ b/olcPixelGameEngine3.h @@ -3047,6 +3047,50 @@ namespace olc const olc::Pixel col = olc::Colour::WHITE, const olc::Pixel tint = olc::Colour::WHITE); +// === 3-Point Curves === + + // Draws a single pixel wide 3pt curve into a batch + const LineBatch& Curve( + olc::LineBatch& batch, + const olc::vf2d& pStart, + const olc::vf2d& pEnd, + const olc::vf2d& pControl, + const olc::Pixel col = olc::Colour::WHITE, + const olc::Pixel tint = olc::Colour::WHITE, + const int32_t facets = OLC_DEFAULT_CIRCLE_FACETS); + + // Draws a single pixel wide 3pt curve with a gradient into a batch + const LineBatch& Curve( + olc::LineBatch& batch, + const olc::vf2d& pStart, + const olc::Pixel cStart, + const olc::vf2d& pEnd, + const olc::Pixel cEnd, + const olc::vf2d& pControl, + const olc::Pixel tint = olc::Colour::WHITE, + const int32_t facets = OLC_DEFAULT_CIRCLE_FACETS); + + // Draws a single pixel wide 3pt curve with a gradient + const GPUTask& Curve( + const olc::vf2d& pStart, + const olc::Pixel cStart, + const olc::vf2d& pEnd, + const olc::Pixel cEnd, + const olc::vf2d& pControl, + const olc::Pixel tint = olc::Colour::WHITE, + const int32_t facets = OLC_DEFAULT_CIRCLE_FACETS); + + // Draws a single pixel wide 3pt curve + const GPUTask& Curve( + const olc::vf2d& pStart, + const olc::vf2d& pEnd, + const olc::vf2d& pControl, + const olc::Pixel col = olc::Colour::WHITE, + const olc::Pixel tint = olc::Colour::WHITE, + const int32_t facets = OLC_DEFAULT_CIRCLE_FACETS); + + + // === Rectangles === // Draws a multiple colour rectangle, with linear colour interpolation, into a batch @@ -18645,6 +18689,33 @@ const GPUTask& Draw::Line(const olc::vf2d& p1, const olc::Pixel c1, const olc::v ))); } +const GPUTask& olc::Draw::Curve(const olc::vf2d& pStart, const olc::Pixel cStart, const olc::vf2d& pEnd, const olc::Pixel cEnd, const olc::vf2d& pControl, const olc::Pixel tint, const int32_t facets) +{ + PrepareTargetForHW(); + + const float fStep = 1.0f / float(facets-1); + std::vector vPoints(facets); + std::vector vColours(facets); + + for (int32_t i = 0; i < facets; i++) + { + float t = float(i) * fStep; + vPoints[i] = transformAffine.forwardRound((1 - t) * (1 - t) * pStart + 2 * (1 - t) * t * pControl + t * t * pEnd); + vColours[i] = olc::PixelLerp(cStart, cEnd, t); + } + + return vecGPUTasks.data.emplace_back(std::move( + TaskDrawLine( + vPoints, + vColours, + tint + ))); +} + +const GPUTask& olc::Draw::Curve(const olc::vf2d& pStart, const olc::vf2d& pEnd, const olc::vf2d& pControl, const olc::Pixel col, const olc::Pixel tint, const int32_t facets) +{ + return Curve(pStart, col, pEnd, col, pControl, tint, facets); +} const GPUTask& olc::Draw::Rect(const olc::vf2d& pos, const olc::vf2d& size, const olc::Pixel col, const olc::Pixel tint) { @@ -19490,6 +19561,33 @@ const LineBatch& olc::Draw::Line(olc::LineBatch& batch, const olc::vf2d& p1, con return batch; } +const LineBatch& olc::Draw::Curve(olc::LineBatch& batch, const olc::vf2d& pStart, const olc::vf2d& pEnd, const olc::vf2d& pControl, const olc::Pixel col, const olc::Pixel tint, const int32_t facets) +{ + return Curve(batch, pStart, col, pEnd, col, pControl, tint, facets); +} + +const LineBatch& olc::Draw::Curve(olc::LineBatch& batch, const olc::vf2d& pStart, const olc::Pixel cStart, const olc::vf2d& pEnd, const olc::Pixel cEnd, const olc::vf2d& pControl, const olc::Pixel tint, const int32_t facets) +{ + const float fStep = 1.0f / float(facets-1); + olc::vf2d p1, p2; + olc::Pixel c1, c2; + + p1 = pStart; + c1 = cStart; + + for (int32_t i = 1; i < facets; i++) + { + float t = float(i) * fStep; + p2 = transformAffine.forwardRound((1 - t) * (1 - t) * pStart + 2 * (1 - t) * t * pControl + t * t * pEnd); + c2 = olc::PixelLerp(cStart, cEnd, t); + Line(batch, p1, c1, p2, c2, tint); + p1 = p2; + c1 = c2; + } + + return batch; +} + const LineBatch& olc::Draw::Rect(olc::LineBatch& batch, const olc::vf2d& pos, const olc::vf2d& size, const olc::Pixel col, const olc::Pixel tint) { return Rect(batch, pos, size, col, col, col, col, tint);