Skip to content

Fix continues drawCardinalSplines() drawing outside the control points on last control point #2303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 5, 2025
Merged

Fix continues drawCardinalSplines() drawing outside the control points on last control point #2303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cab7f47
Fix for issue #2302
aismann Jan 4, 2025
1124426
Codacy Static Code Analysis fix
aismann Jan 4, 2025
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
26 changes: 9 additions & 17 deletions core/2d/DrawNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,17 +489,15 @@ void DrawNode::drawCardinalSpline(PointArray* config,
for (unsigned int i = 0; i < segments; i++)
{
float dt = (float)i / segments;
p = static_cast<ssize_t>(dt / deltaT);

// border
if (dt == 1)
// Check last control point reached
if (p >= (config->count() - 1))
{
p = config->count() - 1;
lt = 1;
}
else
{
p = static_cast<ssize_t>(dt / deltaT);
lt = (dt - deltaT * (float)p) / deltaT;
_vertices[i] = config->getControlPointAtIndex(config->count() - 1);
segments = i + 1;
_vertices.resize(segments);
break;
}

// Interpolate
Expand All @@ -508,14 +506,8 @@ void DrawNode::drawCardinalSpline(PointArray* config,
Vec2 pp2 = config->getControlPointAtIndex(p + 1);
Vec2 pp3 = config->getControlPointAtIndex(p + 2);

Vec2 newPos = ccCardinalSplineAt(pp0, pp1, pp2, pp3, tension, lt);
_vertices[i].x = newPos.x;
_vertices[i].y = newPos.y;
if (newPos == config->getControlPointAtIndex(config->count() - 1) && i > 0)
{
segments = i + 1;
break;
}
lt = (dt - deltaT * (float)p) / deltaT;
_vertices[i] = ccCardinalSplineAt(pp0, pp1, pp2, pp3, tension, lt);
}

_drawPoly(_vertices.data(), segments, false, color, thickness, true);
Expand Down
11 changes: 10 additions & 1 deletion tests/cpp-tests/Source/DrawNodeTest/DrawNodeTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3515,9 +3515,18 @@ void DrawNodeSpLinesTest::update(float dt)

drawNode->drawCardinalSpline(array, 0.2f, points.size() * 8, Color4F::GREEN, 20.0f);
drawNode->drawCardinalSpline(array, 0.2f, points.size() * 8, Color4F::BLUE);

drawNode->drawCardinalSpline(array, 0.2f, points.size() * 16, Color4F(1.0f, 1.0f, 0.5f, 1.0f), 10.0f);

// Issue #2302
auto array3 = PointArray::create(20);
for (int i = 0; i < 10; i++)
{
array3->addControlPoint(Vec2((i % 2) ? 20 : screen.width - 20, 50 + i * 20));
drawNode->drawPoint(array3->getControlPointAtIndex(i), 10, Color4F::BLUE);
}
drawNode->drawCardinalSpline(array3, 0.1, 20, Color4F::ORANGE);


// drawNode->drawCatmullRom(array, points.size() * 8, Color4F::YELLOW,5);
// if (points.size()>3)
//{
Expand Down
Loading