Skip to content
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

Add 3D solid model operations #31

Merged
merged 18 commits into from
Jan 28, 2024
Merged

Add 3D solid model operations #31

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
53f9b3c
First pass at solid-model boolean operations
jonathanhogg Jan 23, 2024
367026c
Second pass at solid-model geometry
jonathanhogg Jan 23, 2024
5f785e4
More useful logging
jonathanhogg Jan 23, 2024
fe68ca9
Another new dependency created by the solid-model geometry stuff
jonathanhogg Jan 23, 2024
110a296
Small example
jonathanhogg Jan 23, 2024
576706d
Combine boolean operations on many models into single operations
jonathanhogg Jan 23, 2024
2f10ecd
A bunch of optimisation of solid model operations
jonathanhogg Jan 26, 2024
12f4a7f
Add slicing of 3D shapes with planes
jonathanhogg Jan 27, 2024
161781c
Automatically insert smooth shading nodes on constructed geometry
jonathanhogg Jan 28, 2024
8648290
Get rid of old sphere `subdivisions` attribute
jonathanhogg Jan 28, 2024
30f486d
Now scipy is a requirement again, reverse test soft skipping
jonathanhogg Jan 28, 2024
9589a95
Update README with solid model manipulation stuff
jonathanhogg Jan 28, 2024
00b37a3
Small oops
jonathanhogg Jan 28, 2024
8e1e206
Make flattening and inverting model transformers
jonathanhogg Jan 28, 2024
e6edaec
Annoying spacing typo and make textures example less GPU intensive
jonathanhogg Jan 28, 2024
287da49
Plane slicing is not entirely reliable
jonathanhogg Jan 28, 2024
a1f8c3c
Make this example more interesting
jonathanhogg Jan 28, 2024
6b79dbd
Guess what? Trimesh has another soft dependency we may need
jonathanhogg Jan 28, 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
Get rid of old sphere subdivisions attribute
  • Loading branch information
@jonathanhogg
jonathanhogg committed Jan 28, 2024
commit 86482904ba4ace1d85982fb35a1be98d01a55b0c
9 changes: 4 additions & 5 deletions src/flitter/render/window/models.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,8 @@ cdef class Sphere(PrimitiveModel):
cdef Sphere get(Node node):
cdef bint flat = node.get_bool('flat', False)
cdef bint invert = node.get_bool('invert', False)
cdef int subdivisions = node.get_int('subdivisions', 3)
cdef int segments = max(4, node.get_int('segments', 4<<subdivisions))
cdef str name = f'!sphere-{segments}'
cdef int segments = max(4, node.get_int('segments', DefaultSegments))
cdef str name = f'!sphere-{segments}' if segments != DefaultSegments else '!sphere'
if flat:
name += '|flat'
if invert:
Expand Down Expand Up @@ -449,7 +448,7 @@ cdef class Cylinder(PrimitiveModel):
cdef bint flat = node.get_bool('flat', False)
cdef bint invert = node.get_bool('invert', False)
cdef int segments = max(2, node.get_int('segments', DefaultSegments))
cdef str name = f'!cylinder-{segments}'
cdef str name = f'!cylinder-{segments}' if segments != DefaultSegments else '!cylinder'
if flat:
name += '|flat'
if invert:
Expand Down Expand Up @@ -540,7 +539,7 @@ cdef class Cone(PrimitiveModel):
cdef bint flat = node.get_bool('flat', False)
cdef bint invert = node.get_bool('invert', False)
cdef int segments = max(2, node.get_int('segments', DefaultSegments))
cdef str name = f'!cone-{segments}'
cdef str name = f'!cone-{segments}' if segments != DefaultSegments else '!cone'
if flat:
name += '|flat'
if invert:
Expand Down
Loading