MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make thickness controls draggable

Browse Source
This commit is contained in:
Amy Wilder 2025-08-03 13:17:13 -04:00
parent ddf3bc9d2a
commit 4329343201
1 changed files with 58 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
examples/shapes/shapes_splines_drawing.c
View File

@ -76,6 +76,8 @@ int main(void)
int pointCount = 5; int pointCount = 5;
int selectedPoint = -1; int selectedPoint = -1;
int focusedPoint = -1; int focusedPoint = -1;
int selectedThickPoint = -1;
int focusedThickPoint = -1;
Vector2 *selectedControlPoint = NULL; Vector2 *selectedControlPoint = NULL;
Vector2 *focusedControlPoint = NULL; Vector2 *focusedControlPoint = NULL;
@ -164,6 +166,44 @@ int main(void)
} }
} }
// Variable thickness control points logic
if ((splineTypeActive == SPLINE_LINEAR_VAR) && focusedPoint == -1)
{
// Spline thickness control point focus and selection logic
if (selectedThickPoint == -1)
{
focusedThickPoint = -1;
for (int i = 0; i < pointCount - 1; i++)
{
Vector2 direction = Vector2Normalize(GetSplineVelocityLinear(points[i], points[i + 1]));
Vector2 perpendicular = (Vector2){ direction.y, -direction.x };
for (int j = 0; j < SPLINE_THICK_COUNT; j++)
{
Vector2 point = Vector2Add(GetSplinePointLinear(points[i], points[i + 1], (float)j/(SPLINE_THICK_COUNT - 1)), Vector2Scale(perpendicular, thicks[j]));
if (CheckCollisionPointCircle(GetMousePosition(), point, 4.0f)) {
focusedThickPoint = i*SPLINE_THICK_COUNT + j;
break;
}
}
}
if (IsMouseButtonPressed(MOUSE_LEFT_BUTTON)) selectedThickPoint = focusedThickPoint;
}
if (selectedThickPoint >= 0)
{
int i = selectedThickPoint/SPLINE_THICK_COUNT;
int j = selectedThickPoint%SPLINE_THICK_COUNT;
Vector2 direction = Vector2Normalize(GetSplineVelocityLinear(points[i], points[i + 1]));
Vector2 perpendicular = (Vector2){ direction.y, -direction.x };
thicks[j] = Vector2DotProduct(perpendicular, Vector2Subtract(GetMousePosition(), points[i]));
if (thicks[j] > 40.0f) thicks[j] = 40.0f;
if (thicks[j] < -40.0f) thicks[j] = -40.0f;
if (IsMouseButtonReleased(MOUSE_LEFT_BUTTON)) selectedThickPoint = -1;
}
}
// Spline selection logic // Spline selection logic
if (IsKeyPressed(KEY_ONE)) splineTypeActive = SPLINE_LINEAR; if (IsKeyPressed(KEY_ONE)) splineTypeActive = SPLINE_LINEAR;
else if (IsKeyPressed(KEY_TWO)) splineTypeActive = SPLINE_BASIS; else if (IsKeyPressed(KEY_TWO)) splineTypeActive = SPLINE_BASIS;
@ -300,41 +340,44 @@ int main(void)
DrawText(TextFormat("[%.0f, %.0f]", points[i].x, points[i].y), (int)points[i].x, (int)points[i].y + 10, 10, BLACK); DrawText(TextFormat("[%.0f, %.0f]", points[i].x, points[i].y), (int)points[i].x, (int)points[i].y + 10, 10, BLACK);
} }
// Draw spline thickness helpers
if (splineTypeActive == SPLINE_LINEAR_VAR) if (splineTypeActive == SPLINE_LINEAR_VAR)
{ {
Vector2 thickAnchors[SPLINE_THICK_COUNT] = { 0 };
Vector2 thickPoints[SPLINE_THICK_COUNT] = { 0 }; Vector2 thickPoints[SPLINE_THICK_COUNT] = { 0 };
// Draw spline thickness helpers
for (int i = 0; i < pointCount - 1; i++) for (int i = 0; i < pointCount - 1; i++)
{ {
Vector2 direction = Vector2Normalize(GetSplineVelocityLinear(points[i], points[i + 1])); Vector2 direction = Vector2Normalize(GetSplineVelocityLinear(points[i], points[i + 1]));
Vector2 perpendicular = (Vector2){ direction.y, -direction.x }; Vector2 perpendicular = (Vector2){ direction.y, -direction.x };
DrawLineV(points[i], points[i + 1], BROWN);
for (int j = 0; j < SPLINE_THICK_COUNT; j++) for (int j = 0; j < SPLINE_THICK_COUNT; j++)
{ {
Vector2 point = GetSplinePointLinear(points[i], points[i + 1], j/3.0f); Vector2 anchor = GetSplinePointLinear(points[i], points[i + 1], (float)j/(SPLINE_THICK_COUNT - 1));
thickAnchors[j] = point; thickPoints[j] = Vector2Add(anchor, Vector2Scale(perpendicular, thicks[j]));
thickPoints[j] = Vector2Add(point, Vector2Scale(perpendicular, thicks[j])); DrawLineV(
Vector2Add(anchor, Vector2Scale(perpendicular, 4.0f)),
Vector2Subtract(anchor, Vector2Scale(perpendicular, 4.0f)),
GRAY);
DrawCircleLinesV(thickPoints[j], (((focusedThickPoint % SPLINE_THICK_COUNT) == j)? 6.0f : 4.0f), (((focusedThickPoint % SPLINE_THICK_COUNT) == j)? VIOLET : PURPLE));
} }
DrawSplineBezierCubic(thickPoints, SPLINE_THICK_COUNT, 1.0f, ORANGE);
DrawLineV(thickPoints[0], thickPoints[1], GRAY); DrawLineV(thickPoints[0], thickPoints[1], GRAY);
DrawLineV(thickPoints[3], thickPoints[2], GRAY); DrawLineV(thickPoints[3], thickPoints[2], GRAY);
}
for (int j = 0; j < SPLINE_THICK_COUNT; j++) }
else if (splineTypeActive == SPLINE_BEZIER_VAR)
{ {
DrawCircleLinesV(thickPoints[j], 4.0f, PURPLE); // I tried and this isn't possible.
DrawLineV(Vector2Add(thickAnchors[j], Vector2Scale(perpendicular, 4.0f)), Vector2Subtract(thickAnchors[j], Vector2Scale(perpendicular, 4.0f)), GRAY); // A variable-thickness Bezier curve can potentially have more detail than can
} // be expressed with another Bezier curve of the same degree.
// Example: https://www.desmos.com/calculator/qh31vr4rbf
DrawLineV(points[i], points[i + 1], BROWN);
DrawSplineBezierCubic(thickPoints, SPLINE_THICK_COUNT, 1.0f, ORANGE);
}
} }
} }
// Check all possible UI states that require controls lock // Check all possible UI states that require controls lock
if (splineTypeEditMode || (selectedPoint != -1) || (selectedControlPoint != NULL)) GuiLock(); if (splineTypeEditMode || (selectedPoint != -1) || (selectedThickPoint != -1) || (selectedControlPoint != NULL)) GuiLock();
// Draw spline config // Draw spline config
if ((splineTypeActive == SPLINE_LINEAR_VAR) || (splineTypeActive == SPLINE_BEZIER_VAR)) if ((splineTypeActive == SPLINE_LINEAR_VAR) || (splineTypeActive == SPLINE_BEZIER_VAR))