-
Notifications
You must be signed in to change notification settings - Fork 234
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
fix #5045. Append "Angle Units" to properties of node "Revolution Surface" and fix documents. #5046
Open
satabol
wants to merge
1
commit into
master
Choose a base branch
from
fix_5045_Append_Angle_Units_to_node_Revolution_Surface
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
|
|
||
| import numpy as np | ||
| from math import pi | ||
|
|
||
| import bpy | ||
| from bpy.props import FloatProperty, EnumProperty, BoolProperty, IntProperty | ||
|
|
||
| from sverchok.node_tree import SverchCustomTreeNode | ||
| from sverchok.data_structure import updateNode, zip_long_repeat, ensure_nesting_level | ||
| from sverchok.utils.curve import SvCurve | ||
| from sverchok.utils.surface.algorithms import SvRevolutionSurface | ||
|
|
||
|
|
||
| class SvRevolutionSurfaceNode(SverchCustomTreeNode, bpy.types.Node): | ||
| """ | ||
| Triggers: Revolution Surface | ||
| Tooltip: Generate a surface of revolution (similar to Spin / Lathe modifier) | ||
| """ | ||
| bl_idname = 'SvRevolutionSurfaceNodeMK2' | ||
| bl_label = 'Revolution Surface' | ||
| bl_icon = 'MOD_SCREW' | ||
|
|
||
| v_min : FloatProperty( | ||
| name = "Angle From", | ||
| description = "Minimal value of V surface parameter", | ||
| default = 0.0, | ||
| update = updateNode) | ||
|
|
||
| v_max : FloatProperty( | ||
| name = "Angle To", | ||
| description = "Minimal value of V surface parameter", | ||
| default = 2*pi, | ||
| update = updateNode) | ||
|
|
||
| origins = [ | ||
| ('GLOBAL', "Global origin", "Global origin", 0), | ||
| ('POINT', "Revolution axis", "Rotation axis", 1) | ||
| ] | ||
|
|
||
| origin : EnumProperty( | ||
| name = "Origin", | ||
| items = origins, | ||
| default = 'GLOBAL', # default for pre-existing nodes | ||
| update = updateNode) | ||
|
|
||
| def sv_init(self, context): | ||
| self.inputs.new('SvCurveSocket', "Profile") | ||
| p = self.inputs.new('SvVerticesSocket', "Point") | ||
| p.use_prop = True | ||
| p.default_property = (0.0, 0.0, 0.0) | ||
| p = self.inputs.new('SvVerticesSocket', "Direction") | ||
| p.use_prop = True | ||
| p.default_property = (0.0, 0.0, 1.0) | ||
| self.inputs.new('SvStringsSocket', 'AngleFrom').prop_name = 'v_min' | ||
| self.inputs.new('SvStringsSocket', 'AngleTo').prop_name = 'v_max' | ||
| self.outputs.new('SvSurfaceSocket', "Surface") | ||
| # default for newly created nodes | ||
| self.origin = 'POINT' | ||
|
|
||
| def draw_buttons(self, context, layout): | ||
| layout.prop(self, "origin") | ||
|
|
||
| def process(self): | ||
| if not any(socket.is_linked for socket in self.outputs): | ||
| return | ||
|
|
||
| point_s = self.inputs['Point'].sv_get() | ||
| direction_s = self.inputs['Direction'].sv_get() | ||
| curve_s = self.inputs['Profile'].sv_get() | ||
| v_min_s = self.inputs['AngleFrom'].sv_get() | ||
| v_max_s = self.inputs['AngleTo'].sv_get() | ||
|
|
||
| if isinstance(curve_s[0], SvCurve): | ||
| curve_s = [curve_s] | ||
| point_s = ensure_nesting_level(point_s, 3) | ||
| direction_s = ensure_nesting_level(direction_s, 3) | ||
| v_min_s = ensure_nesting_level(v_min_s, 2) | ||
| v_max_s = ensure_nesting_level(v_max_s, 2) | ||
|
|
||
| surface_out = [] | ||
| for curves, points, directions, v_mins, v_maxs in zip_long_repeat(curve_s, point_s, direction_s, v_min_s, v_max_s): | ||
| for curve, point, direction, v_min, v_max in zip_long_repeat(curves, points, directions, v_mins, v_maxs): | ||
| origin = self.origin == 'GLOBAL' | ||
| surface = SvRevolutionSurface.build(curve, | ||
| np.array(point), np.array(direction), | ||
| v_min, v_max, | ||
| global_origin=origin) | ||
| surface_out.append(surface) | ||
|
|
||
| self.outputs['Surface'].sv_set(surface_out) | ||
|
|
||
| def register(): | ||
| bpy.utils.register_class(SvRevolutionSurfaceNode) | ||
|
|
||
| def unregister(): | ||
| bpy.utils.unregister_class(SvRevolutionSurfaceNode) | ||
|
|
Oops, something went wrong.
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.
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.
SvAngleHelpershould be first in the row. Python takes rightmost class first than it takes next left class and overrides methods and so on.