Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions dev/src/draw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<olc::vf2d> vPoints(facets);
std::vector<olc::Pixel> vColours(facets);

for (int32_t i = 0; i < facets; i++)
{
float t = float(i) * fStep;
vPoints[i] = transformAffine.forwardRound<float>((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)
{
Expand Down
51 changes: 50 additions & 1 deletion dev/src/draw.h
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down Expand Up @@ -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
Expand Down
27 changes: 27 additions & 0 deletions dev/src/draw_batch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<float>((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);
Expand Down
98 changes: 98 additions & 0 deletions olcPixelGameEngine3.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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<olc::vf2d> vPoints(facets);
std::vector<olc::Pixel> vColours(facets);

for (int32_t i = 0; i < facets; i++)
{
float t = float(i) * fStep;
vPoints[i] = transformAffine.forwardRound<float>((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)
{
Expand Down Expand Up @@ -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<float>((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);
Expand Down
Loading