blender/blender-addons
19
43
Fork 96
Code Issues 632 Pull Requests 27 Projects 1 Releases Wiki Activity

Node Wrangler: Improved accuracy on Align Nodes operator #104551

Open
quackarooni wants to merge 18 commits from quackarooni/blender-addons:nw_rework_align_nodes into main
pull from: quackarooni/blender-addons:nw_rework_align_nodes
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 8 Commits 18 Files Changed 4 +16 -11
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f8816bd075 - Show all commits

27
node_wrangler/operators.py
View File

@ -2352,6 +2352,9 @@ class NWAlignNodes(Operator, NWBase):
active_node = context.active_node active_node = context.active_node
margin = self.margin margin = self.margin
# Somehow hidden nodes would come out 10 units higher that non-hidden nodes when aligned, so this offset has to exist
weird_offset = 10
with temporary_unframe(nodes=selection): with temporary_unframe(nodes=selection):
active_loc = None active_loc = None
if active_node in selection: if active_node in selection:
@ -2360,12 +2363,19 @@ class NWAlignNodes(Operator, NWBase):
# Check if nodes should be laid out horizontally or vertically # Check if nodes should be laid out horizontally or vertically
# use dimension to get center of node, not corner # use dimension to get center of node, not corner
x_locs = [n.location.x + (0.5 * n.dimensions.x) for n in selection] x_locs = [n.location.x + (0.5 * n.dimensions.x) for n in selection]
y_locs = [n.location.y - (0.5 * n.dimensions.y) for n in selection] y_locs = [n.location.y - weird_offset if n.hide
else n.location.y - (0.5 * n.dimensions.y) for n in selection]
x_range = max(x_locs) - min(x_locs) x_range = max(x_locs) - min(x_locs)
y_range = max(y_locs) - min(y_locs) y_range = max(y_locs) - min(y_locs)
horizontal = x_range > y_range
#Undo corrective offsets for hidden nodes if alignment is horizontal
if not horizontal:
y_locs = [n.location.y - (0.5 * n.dimensions.y) for n in selection]
mid_x = 0.5 * (max(x_locs) + min(x_locs)) mid_x = 0.5 * (max(x_locs) + min(x_locs))
mid_y = 0.5 * (max(y_locs) + min(y_locs)) mid_y = 0.5 * (max(y_locs) + min(y_locs))
horizontal = x_range > y_range
# Sort selection by location of node mid-point # Sort selection by location of node mid-point
if horizontal: if horizontal:
@ -2375,23 +2385,18 @@ class NWAlignNodes(Operator, NWBase):
# Alignment # Alignment
current_pos = 0 current_pos = 0
weird_offset = 10 # Somehow hidden nodes would come out 10 units higher that non-hidden nodes when aligned, so this offset has to exist
if horizontal: if horizontal:
for node in selection: for node in selection:
node.location.x = current_pos node.location.x = current_pos
node.location.y = mid_y + (0.5 * node.dimensions.y) node.location.y = (mid_y + weird_offset) if node.hide else mid_y + (0.5 * node.dimensions.y)
if node.hide:
node.location.y -= (0.5 * node.dimensions.y) - weird_offset
current_pos += margin + node.dimensions.x current_pos += margin + node.dimensions.x
else: else:
for node in selection: for node in selection:
node.location.y = current_pos
if node.hide:
node.location.y -= (0.5 * node.dimensions.y) - weird_offset
node.location.x = mid_x - (0.5 * node.dimensions.x) node.location.x = mid_x - (0.5 * node.dimensions.x)
node.location.y = (current_pos - (0.5 * node.dimensions.y) + weird_offset) if node.hide else current_pos
current_pos -= 0.3 * margin + node.dimensions.y # use half-margin for vertical alignment current_pos -= 0.3 * margin + node.dimensions.y # use half-margin for vertical alignment
# If active node is selected, center nodes around it # If active node is selected, center nodes around it