maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix reroute socket indices

Browse source
This commit is contained in:
Moritz Brückner 2021-01-17 00:23:02 +01:00
parent 0a5c209dd9
commit fb8a056394
1 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
blender/arm/make_logic.py
View file

@ -1,4 +1,6 @@
import os
from typing import Optional, TextIO
import bpy
import arm.utils
import arm.log
@ -167,26 +169,45 @@ def build_node(node: bpy.types.Node, f):
# Create inputs
for inp in node.inputs:
# Is linked - find node
# True if the input is connected to a unlinked reroute
# somewhere down the reroute line
unconnected = False
# Is linked -> find the connected node
if inp.is_linked:
n = inp.links[0].from_node
socket = inp.links[0].from_socket
if (inp.bl_idname == 'ArmNodeSocketAction' and socket.bl_idname != 'ArmNodeSocketAction') or \
(socket.bl_idname == 'ArmNodeSocketAction' and inp.bl_idname != 'ArmNodeSocketAction'):
print('Armory Error: Sockets do not match in logic node tree "{0}" - node "{1}" - socket "{2}"'.format(group_name, node.name, inp.name))
inp_name = build_node(n, f)
for i in range(0, len(n.outputs)):
if n.outputs[i] == socket:
inp_from = i
# Follow reroutes first
while n.type == "REROUTE":
if len(n.inputs) == 0 or not n.inputs[0].is_linked:
unconnected = True
break
# Not linked - create node with default values
socket = n.inputs[0].links[0].from_socket
n = n.inputs[0].links[0].from_node
if not unconnected:
if (inp.bl_idname == 'ArmNodeSocketAction' and socket.bl_idname != 'ArmNodeSocketAction') or \
(socket.bl_idname == 'ArmNodeSocketAction' and inp.bl_idname != 'ArmNodeSocketAction'):
arm.log.warn(f'Sockets do not match in logic node tree "{group_name}": node "{node.name}", socket "{inp.name}"')
inp_name = build_node(n, f)
for i in range(0, len(n.outputs)):
if n.outputs[i] == socket:
inp_from = i
break
# Not linked -> create node with default values
else:
inp_name = build_default_node(inp)
inp_from = 0
# The input is linked to a reroute, but the reroute is unlinked
if inp_name == None:
if unconnected:
inp_name = build_default_node(inp)
inp_from = 0
# Add input
f.write('\t\t' + name + '.addInput(' + inp_name + ', ' + str(inp_from) + ');\n')