Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: node tree loading

Browse Source
This commit is contained in:
Swann 2024-03-23 22:37:12 +01:00
parent 6fd8a32959
commit a87e74842b
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
multi_user/bl_types/bl_material.py
View File

@ -28,9 +28,11 @@ from replication.protocol import ReplicatedDatablock
from .bl_datablock import get_datablock_from_uuid, resolve_datablock_from_uuid from .bl_datablock import get_datablock_from_uuid, resolve_datablock_from_uuid
from .bl_action import dump_animation_data, load_animation_data, resolve_animation_dependencies from .bl_action import dump_animation_data, load_animation_data, resolve_animation_dependencies
from bpy.types import (NodeSocketGeometry, NodeSocketShader, NodeSocketVirtual, NodeSocketCollection, NodeSocketObject)
NODE_SOCKET_INDEX = re.compile('\[(\d*)\]') NODE_SOCKET_INDEX = re.compile('\[(\d*)\]')
IGNORED_SOCKETS = ['NodeSocketGeometry', 'NodeSocketShader', 'CUSTOM'] IGNORED_SOCKETS = ['NodeSocketGeometry', 'NodeSocketShader', 'CUSTOM', 'NodeSocketVirtual']
IGNORED_SOCKETS_TYPES = (NodeSocketGeometry, NodeSocketShader, NodeSocketVirtual)
def load_node(node_data: dict, node_tree: bpy.types.ShaderNodeTree): def load_node(node_data: dict, node_tree: bpy.types.ShaderNodeTree):
""" Load a node into a node_tree from a dict """ Load a node into a node_tree from a dict
@ -59,15 +61,16 @@ def load_node(node_data: dict, node_tree: bpy.types.ShaderNodeTree):
inputs_data = node_data.get('inputs') inputs_data = node_data.get('inputs')
if inputs_data: if inputs_data:
inputs = [i for i in target_node.inputs if i.type not in IGNORED_SOCKETS] inputs = [i for i in target_node.inputs if not isinstance(i, IGNORED_SOCKETS_TYPES)]
for idx, inpt in enumerate(inputs): for idx, inpt in enumerate(inputs):
if idx < len(inputs_data) and hasattr(inpt, "default_value"): if idx < len(inputs_data) and hasattr(inpt, "default_value"):
loaded_input = inputs_data[idx] loaded_input = inputs_data[idx]
try: try:
if inpt.type in ['OBJECT', 'COLLECTION']: if isinstance(inpt, (NodeSocketObject, NodeSocketCollection)):
inpt.default_value = get_datablock_from_uuid(loaded_input, None) inpt.default_value = get_datablock_from_uuid(loaded_input, None)
else: else:
inpt.default_value = loaded_input inpt.default_value = loaded_input
setattr(inpt, 'default_value', loaded_input)
except Exception as e: except Exception as e:
logging.warning(f"Node {target_node.name} input {inpt.name} parameter not supported, skipping ({e})") logging.warning(f"Node {target_node.name} input {inpt.name} parameter not supported, skipping ({e})")
else: else:
@ -75,12 +78,12 @@ def load_node(node_data: dict, node_tree: bpy.types.ShaderNodeTree):
outputs_data = node_data.get('outputs') outputs_data = node_data.get('outputs')
if outputs_data: if outputs_data:
outputs = [o for o in target_node.outputs if o.type not in IGNORED_SOCKETS] outputs = [o for o in target_node.outputs if not isinstance(o, IGNORED_SOCKETS_TYPES)]
for idx, output in enumerate(outputs): for idx, output in enumerate(outputs):
if idx < len(outputs_data) and hasattr(output, "default_value"): if idx < len(outputs_data) and hasattr(output, "default_value"):
loaded_output = outputs_data[idx] loaded_output = outputs_data[idx]
try: try:
if output.type in ['OBJECT', 'COLLECTION']: if isinstance(output, (NodeSocketObject, NodeSocketCollection)):
output.default_value = get_datablock_from_uuid(loaded_output, None) output.default_value = get_datablock_from_uuid(loaded_output, None)
else: else:
output.default_value = loaded_output output.default_value = loaded_output
@ -141,7 +144,7 @@ def dump_node(node: bpy.types.ShaderNode) -> dict:
if hasattr(node, 'inputs'): if hasattr(node, 'inputs'):
dumped_node['inputs'] = [] dumped_node['inputs'] = []
inputs = [i for i in node.inputs if i.type not in IGNORED_SOCKETS] inputs = [i for i in node.inputs if not isinstance(i, IGNORED_SOCKETS_TYPES)]
for idx, inpt in enumerate(inputs): for idx, inpt in enumerate(inputs):
if hasattr(inpt, 'default_value'): if hasattr(inpt, 'default_value'):
if isinstance(inpt.default_value, bpy.types.ID): if isinstance(inpt.default_value, bpy.types.ID):
@ -154,7 +157,7 @@ def dump_node(node: bpy.types.ShaderNode) -> dict:
if hasattr(node, 'outputs'): if hasattr(node, 'outputs'):
dumped_node['outputs'] = [] dumped_node['outputs'] = []
for idx, output in enumerate(node.outputs): for idx, output in enumerate(node.outputs):
if output.type not in IGNORED_SOCKETS: if not isinstance(output, IGNORED_SOCKETS_TYPES):
if hasattr(output, 'default_value'): if hasattr(output, 'default_value'):
dumped_node['outputs'].append( dumped_node['outputs'].append(
io_dumper.dump(output.default_value)) io_dumper.dump(output.default_value))
@ -289,6 +292,9 @@ def load_node_tree_sockets(interface: bpy.types.NodeTreeInterface,
# Check for new sockets # Check for new sockets
for name, socket_type, in_out in sockets_data: for name, socket_type, in_out in sockets_data:
if not socket_type:
logging.error(f"Socket {name} has no type, skipping")
continue
socket = interface.new_socket( socket = interface.new_socket(
name, name,
in_out=in_out, in_out=in_out,

18
multi_user/bl_types/bl_object.py
View File

@ -64,13 +64,11 @@ def get_node_group_properties_identifiers(node_group):
continue continue
else: else:
props_ids.append((socket.identifier, socket.socket_type)) props_ids.append((socket.identifier, socket.socket_type))
# for outpt in node_group.outputs: props_ids.append((f"{socket.identifier}_attribute_name",'NodeSocketString'))
# if outpt.type not in IGNORED_SOCKETS and outpt.type in ['INT', 'VALUE', 'BOOLEAN', 'RGBA', 'VECTOR']: props_ids.append((f"{socket.identifier}_use_attribute", 'NodeSocketBool'))
# props_ids.append((f"{outpt.identifier}_attribute_name", 'STR'))
return props_ids return props_ids
# return [inpt.identifer for inpt in node_group.inputs if inpt.type not in IGNORED_SOCKETS]
def dump_physics(target: bpy.types.Object)->dict: def dump_physics(target: bpy.types.Object)->dict:
@ -136,11 +134,11 @@ def dump_modifier_geometry_node_props(modifier: bpy.types.Modifier) -> list:
""" """
dumped_props = [] dumped_props = []
for prop_value, prop_type in get_node_group_properties_identifiers(modifier.node_group): for prop_id, prop_type in get_node_group_properties_identifiers(modifier.node_group):
try: try:
prop_value = modifier[prop_value] prop_value = modifier[prop_id]
except KeyError as e: except KeyError as e:
logging.error(f"fail to dump geomety node modifier property : {prop_value} ({e})") logging.error(f"fail to dump geomety node modifier property : {prop_id} ({e})")
else: else:
dump = None dump = None
if isinstance(prop_value, bpy.types.ID): if isinstance(prop_value, bpy.types.ID):
@ -151,7 +149,6 @@ def dump_modifier_geometry_node_props(modifier: bpy.types.Modifier) -> list:
dump = prop_value.to_list() dump = prop_value.to_list()
dumped_props.append((dump, prop_type)) dumped_props.append((dump, prop_type))
# logging.info(prop_value)
return dumped_props return dumped_props
@ -169,9 +166,8 @@ def load_modifier_geometry_node_props(dumped_modifier: dict, target_modifier: bp
dumped_value, dumped_type = dumped_modifier['props'][input_index] dumped_value, dumped_type = dumped_modifier['props'][input_index]
input_value = target_modifier[inpt[0]] input_value = target_modifier[inpt[0]]
if dumped_type in ['NodeSocketInt', 'NodeSocketFloat', 'NodeSocketString', 'NodeSocketBool']: if dumped_type in ['NodeSocketInt', 'NodeSocketFloat', 'NodeSocketString', 'NodeSocketBool']:
logging.info(f"{inpt[0]}/{dumped_value}")
target_modifier[inpt[0]] = dumped_value target_modifier[inpt[0]] = dumped_value
elif dumped_type in ['RGBA', 'VECTOR']: elif dumped_type in ['NodeSocketColor', 'NodeSocketVector']:
for index in range(len(input_value)): for index in range(len(input_value)):
input_value[index] = dumped_value[index] input_value[index] = dumped_value[index]
elif dumped_type in ['NodeSocketCollection', 'NodeSocketObject', 'NodeSocketImage', 'NodeSocketTexture', 'NodeSocketMaterial']: elif dumped_type in ['NodeSocketCollection', 'NodeSocketObject', 'NodeSocketImage', 'NodeSocketTexture', 'NodeSocketMaterial']: