Skip to content

(feat) Hobby Splines #209

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

Open
cuttlefisch wants to merge 16 commits into
base: master
Choose a base branch
from
Open

(feat) Hobby Splines #209

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fa9745d
check in wip code for first hobby splines
May 10, 2024
7438d2c
fix optional closed loop in 3d
May 10, 2024
2629678
set correct unit test values
May 10, 2024
7184d55
fix OBOB in hobby results, cleanup
May 10, 2024
f126178
remove old debug output
May 10, 2024
8af9491
initial hobby splines examples
May 10, 2024
eb7e8fd
clarify return type and function purpose
May 10, 2024
6267314
cleanup open vs closed loop results
May 10, 2024
3511b47
curvier example, fix pytest expected path
May 10, 2024
68e4166
remove unwanted pudb import
May 10, 2024
d77180a
undo formatting-only applied in development
May 10, 2024
9e39c3d
cleanup gathering points in open vs closed loop
May 10, 2024
d279c22
Merge remote-tracking branch 'origin/dev' into dev
May 10, 2024
ac2d583
fix wording in comment
May 10, 2024
4be9122
Merge pull request #1 from cuttlefisch/dev
cuttlefisch May 10, 2024
1d07fa3
bump version
May 10, 2024
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
Prev Previous commit
Next Next commit
fix optional closed loop in 3d
  • Loading branch information
cuttlefisch committed May 10, 2024
commit 7438d2cb9481ba1fc5afe1564bc9a6cceb033953
39 changes: 28 additions & 11 deletions solid/splines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,9 +442,9 @@ def hobby_points(
"""
# n is defined such that the points can be numbered P[0] ... P[n].
# such that there are a total of n-1 points
if close_loop:
points.append(points[0])
points.insert(0, points[-2])
# if close_loop:
points.append(points[0])
points.insert(0, points[-2])
n = len(points) - 1
if n < 2:
raise ValueError(
Expand Down Expand Up @@ -563,21 +563,38 @@ def hobby_points(
# Finally gather up and return the spline points (knots & control points)
# as a List of Point2s
# res_controls = [(points[i], c0[i], c1[i]) for i in range(0, n - 1)]
res_controls = [(points[i], c0[i], c1[i]) for i in range(2, n - 1)]
# c0 at points[0] is None as there is no leading control
# c1 at points[-1] is None as there is no leading control
res_controls = [(points[i], c0[i], c1[i]) for i in range(2, n - 2)]
# res_controls[0] = (points[1], c0[-1], c1[0])
# res_controls[-1] = (c0[0], c1[-1])
res_controls.insert(
0,
(points[0], c0[-1], c1[1]),
)
if close_loop:
# Insert the curve from the last original point (points[0])
# to the first original point,
# res_controls.insert(0, (points[1], c0[1], c1[2]))
res_controls.insert(0, (points[0], c0[-1], c1[1]))
# res_controls[1] = (
# points[1],
# c0[-1],
# c1[-1],
# )
# res_controls.insert(0, (c0[-1], c1[-1], points[0]))
res_controls.append(
(points[n - 2], c0[n - 2], c1[n - 2]),
)
# res_controls.append(
# (points[0], c0[n - 1], c1[-1]),
# )
res_controls.append((points[0],))
else:
res_controls.insert(0, (points[0], c0[0], c1[1]))
res_controls.append((points[n - 2],))

set_trace()
# res_controls.insert(0, (points[1], c0[0], c1[-1]))
# res_controls.append(
# (points[n - 2], c0[0], c1[-1]),
# )
# res_controls.append((points[n - 1],))
# og_angle =
res_controls.append((points[n - 1],))
if DEBUG:
return [
[Point3(*p.xyz) for p in flatten(res_controls)],
Expand Down