Shader API improvements #561
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #561 +/- ##
==========================================
+ Coverage 88.88% 89.04% +0.16%
==========================================
Files 55 54 -1
Lines 11367 11515 +148
Branches 1120 1129 +9
==========================================
+ Hits 10103 10253 +150
+ Misses 965 962 -3
- Partials 299 300 +1
|
|
Hi @guaje, Why this PR is a draft? Do you plan to add more stuff in here? |
Yes, I'm planning to move the |
…r_code from fury.shaders.
skoudoro
reviewed
Apr 12, 2022
fury/shaders/base.py
Outdated
| "geometry": Shader.Geometry, | ||
| "fragment": Shader.Fragment, | ||
| } | ||
| from os.path import join as pjoin, dirname, isfile |
There was a problem hiding this comment.
pep8: import order. see https://peps.python.org/pep-0008/#imports for more information
There was a problem hiding this comment.
This should be fixed, but PTAL.
Comment on lines
+161
to
+190
| def generate_points(): | ||
| centers = np.array([[1, 0, 0], [0, 1, 0], [0, 0, 1]]) | ||
|
|
||
| scene = window.Scene() | ||
| scene.add(cube) | ||
| if interactive: | ||
| scene.add(actor.axes()) | ||
| window.show(scene) | ||
| colors = np.array([[1, 0, 0], [0, 1, 0], [0, 0, 1]]) * 255 | ||
|
|
||
| arr = window.snapshot(scene) | ||
| report = window.analyze_snapshot(arr) | ||
| npt.assert_equal(report.objects, 1) | ||
| vtk_vertices = Points() | ||
| # Create the topology of the point (a vertex) | ||
| vtk_faces = CellArray() | ||
| # Add points | ||
| for i in range(len(centers)): | ||
| p = centers[i] | ||
| id = vtk_vertices.InsertNextPoint(p) | ||
| vtk_faces.InsertNextCell(1) | ||
| vtk_faces.InsertCellPoint(id) | ||
| # Create a polydata object | ||
| polydata = PolyData() | ||
| # Set the vertices and faces we created as the geometry and topology of the | ||
| # polydata | ||
| polydata.SetPoints(vtk_vertices) | ||
| polydata.SetVerts(vtk_faces) | ||
|
|
||
| # test errors | ||
| npt.assert_raises(ValueError, shader_to_actor, cube, "error", | ||
| vertex_impl) | ||
| npt.assert_raises(ValueError, shader_to_actor, cube, "vertex", | ||
| vertex_impl, block="error") | ||
| npt.assert_raises(ValueError, replace_shader_in_actor, cube, "error", | ||
| vertex_impl) | ||
| set_polydata_colors(polydata, colors) | ||
|
|
||
| mapper = PolyDataMapper() | ||
| mapper.SetInputData(polydata) | ||
| mapper.SetVBOShiftScaleMethod(False) | ||
|
|
||
| point_actor = Actor() | ||
| point_actor.SetMapper(mapper) | ||
|
|
There was a problem hiding this comment.
Why restart from scratch and not use a point actor?
To reduce the maintenance, you should try to reduce as much as possible code duplication
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR includes the following improvements: