-
Notifications
You must be signed in to change notification settings - Fork 334
Support for materials #1815
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.
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
base: master
Are you sure you want to change the base?
Support for materials #1815
Conversation
This looks great, I wonder if there is ever a use case for a material to be a string in as an option in addition to these nice material classes you have here. I was wondering if something like this would be possible / useful
|
@shimwell it would certainly be nice to have some predefined materials, and maybe allow to use the material name for other things too. But let's start with making CI green. |
38218df
to
36308a6
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1815 +/- ##
==========================================
+ Coverage 95.66% 95.74% +0.07%
==========================================
Files 28 29 +1
Lines 7431 7606 +175
Branches 1122 1150 +28
==========================================
+ Hits 7109 7282 +173
Misses 193 193
- Partials 129 131 +2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Material support in step exporting will get better in OCCT: |
Would probably nice to have a set of materials to get started, but I think, any real-world application will require custom material sets. (edit: for example https://physicallybased.info) |
VRML export runs, but is not correct yet. |
9bad718
to
a76304a
Compare
2a8410b
to
a4232a0
Compare
The PR would be ready from my side for a first iteration. I think it would be great to add textures later on, one could create quite good visualizations directly with cadquery/vtk. For the time, the PBR materials already achieve quite nice results. |
Thanks for all the hard work! Are the new classes picklable? |
Yes, they are pure dataclasses/basic python types, so everything can be pickled. How far is the progress on the serialization topic? Have you thought about using pydantic? I plan to implement model caching in our internal project and json would be easier to use in a db like with Postgres' JSONB column or redis' JSON datatype compared to pickle. |
Perfect, thanks! There are no plans to implement serialization beyond pickling which is already there. For caching I'd suggest joblib, but maybe you have something else in mind. |
@adrianschneider94 @adam-urbanczyk What action items are left to do before getting this PR merged? |
Review... Given the size of the PR it might take a while, but we'll definitely get this merged. |
I'll plan to spend some time reviewing it next week then. |
I see that this branch has conflicts now that I must have missed last week. Should it be rebased? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey, thanks for all the hard work, but this requires some serious rework with backward compatibility in mind. May I as why there are so many changes that are not needed?
|
||
|
||
@dataclass(frozen=True) | ||
class Color: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather have the the original Color class not removed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new Color class has the same behaviour as the old one (except toTuple, I will bring that back as alias for rgba()
). I think it makes sense to unify color handling throughout the codebase instead of mixing Color
, str
, and tuple
(with 3 or 4 floats). As I touched every place where colors come up, and need them inside materials, it seemed obvious to me to update it (but you're right, backwards compatibility in the vtk functions is partially broken).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd propose to go back to the original class. Maybe also move the materials to the assy module.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the rationale behind that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minimize the impact of the PR. For the second point, the organization of your module does not follow what is in general happening in the codebase. At least it should go to occ_impl
cadquery/occ_impl/assembly.py
Outdated
|
||
return self.toTuple() == other.toTuple() | ||
@dataclass | ||
class AssemblyElement: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert to the original style of iteration
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regarding this I have a question: What parts of the API do you consider as public and which as internal?
Is the line between documented (https://cadquery.readthedocs.io/en/latest/apireference.html) and undocumented functions? Or between functions without and with leading underscores? Or something else?
I can revert this, but I still think, the usability of a dataclass is better than expanding a tuple of five entries where you must look into the source code to understand which item is which. With the dataclass, the field names in conjunction with the type system make clear what we receive.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not 100% if the question above is related to the request above. Methods/functions/attributes with _
are "private". The rest is not. Please in general minimize the scope of PRs.
@@ -537,29 +537,6 @@ def solve_result_check(solve_result: dict) -> bool: | |||
return all(checks) | |||
|
|||
|
|||
def test_color(): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you need to remove a test, something is really wrong with the PR. I think you made to many backward incompatible changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The test was not removed, just moved here:
cadquery/tests/test_materials.py
Line 106 in 4bab75e
def test_occt_conversion(self): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert the removal.
tests/test_assembly.py
Outdated
@@ -1106,7 +1083,7 @@ def check_nodes(doc, expected): | |||
(["box0", "box0_part"], {"color_shape": (1.0, 0.0, 0.0, 1.0)}), | |||
( | |||
["box1", "box1_part"], | |||
{"color_shape": cq.Color().toTuple()}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please do not change the API without a clear need.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will bring back toTuple
, my suggestion is, to keep rgb()
and rgba()
as toTuple()
does not convey what kind of values we get. Is it RGB, RGBA, HSV?
toTuple()
would then be an alias for rgba()
that maybe could be marked for deprecation if a major revision approaches (or kept, if too much depends on it).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Either way, the preference is to not change existing methods. No problem with rgba/rgb
a4232a0
to
288f1e6
Compare
Rebase is done. |
I think there are only two changes that affect backwards compatibility: The missing The only changes not needed (in my eyes) are the assembly iteration and unifying the color handling. I think both make sense in terms of readability/clarity and as they appear in all places where materials need to be handled, it seemed obvious to me to handle it. As a suggestion, I will revert the iteration and widen the signatures of all places where colors can be passed, so it's entirely backwards compatible at all those places. |
Implemented material support.
In this approach, materials are stored in python dataclasses, the OpenCascade objects are only created when building the assembly.
Tests/docs are missing at the moment.