This refactors how a geometry nodes node tree is converted to a lazy-function graph. Previously, all nodes were inserted into a single graph. This was fine because every node was evaluated at most once per node group evaluation. However, loops (#108896) break this assumption since now nodes may be evaluated multiple times and thus a single flat graph does not work anymore. Now, a separate lazy-function is build for every zone which gives us much more flexibility for what can happen in a zone. Right now, the change only applies to simulation zones since that's the only kind of zone we have. Technically, those zones could be inlined, but turning them into a separate lazy-function also does not hurt and makes it possible to test this refactor without implementing loops first. Also, having them as separate functions might help in the future if we integrate a substep loop directly into the simulation zone. The most tricky part here is to just link everything up correctly, especially with respect to deterministic anonymous attribute lifetimes. Fortunately, correctness can be checked visually by looking at the generated graphs. The logging/viewer system also had to be refactored a bit, because now there can be multiple different `ComputeContext` in a single node tree. Each zone is in a separate `ComputeContext`. To make it work, the `ViewerPath` system now explicitly supports zones and drawing code will look up the right logger for showing inspection data. No functional changes are expected, except that the spreadsheet now shows "Simulation Zone" in the context path if the viewer is in a simulation.
124 lines
4.3 KiB
Python
124 lines
4.3 KiB
Python
# SPDX-FileCopyrightText: 2009-2023 Blender Foundation
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
import bpy
|
|
|
|
|
|
class SPREADSHEET_HT_header(bpy.types.Header):
|
|
bl_space_type = 'SPREADSHEET'
|
|
|
|
def draw(self, context):
|
|
layout = self.layout
|
|
space = context.space_data
|
|
|
|
layout.template_header()
|
|
viewer_path = space.viewer_path.path
|
|
|
|
if len(viewer_path) == 0:
|
|
self.draw_without_viewer_path(layout)
|
|
return
|
|
root_context = viewer_path[0]
|
|
if root_context.type != 'ID':
|
|
self.draw_without_viewer_path(layout)
|
|
return
|
|
if not isinstance(root_context.id, bpy.types.Object):
|
|
self.draw_without_viewer_path(layout)
|
|
return
|
|
obj = root_context.id
|
|
if obj is None:
|
|
self.draw_without_viewer_path(layout)
|
|
return
|
|
|
|
layout.prop(space, "object_eval_state", text="")
|
|
|
|
if space.object_eval_state == 'ORIGINAL':
|
|
# Only show first context.
|
|
viewer_path = viewer_path[:1]
|
|
if space.display_viewer_path_collapsed:
|
|
self.draw_collapsed_viewer_path(context, layout, viewer_path)
|
|
else:
|
|
self.draw_full_viewer_path(context, layout, viewer_path)
|
|
|
|
pin_icon = 'PINNED' if space.is_pinned else 'UNPINNED'
|
|
layout.operator("spreadsheet.toggle_pin", text="", icon=pin_icon, emboss=False)
|
|
|
|
if space.object_eval_state == 'VIEWER_NODE' and len(viewer_path) < 3:
|
|
layout.label(text="No active viewer node", icon='INFO')
|
|
|
|
layout.separator_spacer()
|
|
|
|
row = layout.row(align=True)
|
|
sub = row.row(align=True)
|
|
sub.active = self.selection_filter_available(space)
|
|
sub.prop(space, "show_only_selected", text="")
|
|
row.prop(space, "use_filter", toggle=True, icon='FILTER', icon_only=True)
|
|
|
|
def draw_without_viewer_path(self, layout):
|
|
layout.label(text="No active context")
|
|
|
|
def draw_full_viewer_path(self, context, layout, viewer_path):
|
|
space = context.space_data
|
|
row = layout.row()
|
|
for ctx in viewer_path[:-1]:
|
|
subrow = row.row(align=True)
|
|
self.draw_spreadsheet_context(subrow, ctx)
|
|
self.draw_spreadsheet_viewer_path_icon(subrow, space)
|
|
|
|
self.draw_spreadsheet_context(row, viewer_path[-1])
|
|
|
|
def draw_collapsed_viewer_path(self, context, layout, viewer_path):
|
|
space = context.space_data
|
|
row = layout.row(align=True)
|
|
self.draw_spreadsheet_context(row, viewer_path[0])
|
|
if len(viewer_path) == 1:
|
|
return
|
|
self.draw_spreadsheet_viewer_path_icon(row, space)
|
|
if len(viewer_path) > 2:
|
|
self.draw_spreadsheet_viewer_path_icon(row, space, icon='DOT')
|
|
self.draw_spreadsheet_viewer_path_icon(row, space)
|
|
self.draw_spreadsheet_context(row, viewer_path[-1])
|
|
|
|
def draw_spreadsheet_context(self, layout, ctx):
|
|
if ctx.type == 'ID':
|
|
if ctx.id is not None and isinstance(ctx.id, bpy.types.Object):
|
|
layout.label(text=ctx.id.name, icon='OBJECT_DATA')
|
|
else:
|
|
layout.label(text="Invalid id")
|
|
elif ctx.type == 'MODIFIER':
|
|
layout.label(text=ctx.modifier_name, icon='MODIFIER')
|
|
elif ctx.type == 'GROUP_NODE':
|
|
layout.label(text=ctx.ui_name, icon='NODE')
|
|
elif ctx.type == 'SIMULATION_ZONE':
|
|
layout.label(text="Simulation Zone")
|
|
elif ctx.type == 'VIEWER_NODE':
|
|
layout.label(text=ctx.ui_name)
|
|
|
|
def draw_spreadsheet_viewer_path_icon(self, layout, space, icon='RIGHTARROW_THIN'):
|
|
layout.prop(space, "display_viewer_path_collapsed", icon_only=True, emboss=False, icon=icon)
|
|
|
|
def selection_filter_available(self, space):
|
|
root_context = space.viewer_path.path[0]
|
|
if root_context.type != 'ID':
|
|
return False
|
|
if not isinstance(root_context.id, bpy.types.Object):
|
|
return False
|
|
obj = root_context.id
|
|
if obj is None:
|
|
return False
|
|
if obj.type == 'MESH':
|
|
return obj.mode == 'EDIT'
|
|
if obj.type == 'CURVES':
|
|
return obj.mode in {'SCULPT_CURVES', 'EDIT'}
|
|
return True
|
|
|
|
|
|
classes = (
|
|
SPREADSHEET_HT_header,
|
|
)
|
|
|
|
if __name__ == "__main__": # Only for live edit.
|
|
from bpy.utils import register_class
|
|
for cls in classes:
|
|
register_class(cls)
|