diff --git a/Sources/armory/logicnode/LogicNode.hx b/Sources/armory/logicnode/LogicNode.hx index 9255a559..38dac54b 100644 --- a/Sources/armory/logicnode/LogicNode.hx +++ b/Sources/armory/logicnode/LogicNode.hx @@ -1,5 +1,6 @@ package armory.logicnode; +#if arm_patch @:keep @:keepSub #end class LogicNode { var tree: LogicTree; diff --git a/Sources/armory/trait/internal/LivePatch.hx b/Sources/armory/trait/internal/LivePatch.hx index 69c33452..550acb5b 100644 --- a/Sources/armory/trait/internal/LivePatch.hx +++ b/Sources/armory/trait/internal/LivePatch.hx @@ -6,6 +6,7 @@ import armory.logicnode.LogicTree; #if arm_patch @:expose("LivePatch") #end @:access(armory.logicnode.LogicNode) +@:access(armory.logicnode.LogicNodeInput) class LivePatch extends iron.Trait { #if !arm_patch @@ -105,6 +106,31 @@ class LivePatch extends iron.Trait { tree.nodes.remove(nodeName); } + public static function patchNodeCreate(treeName: String, nodeName: String, nodeType: String, propDatas: Array>, inputDatas: Array>, outputDatas: Array>) { + var tree = LogicTree.nodeTrees[treeName]; + if (tree == null) return; + + // No further constructor parameters required here, all variable nodes + // use optional further parameters and all values are set later in this + // function. + var newNode: LogicNode = Type.createInstance(Type.resolveClass(nodeType), [tree]); + newNode.name = nodeName; + tree.nodes[nodeName] = newNode; + + for (propData in propDatas) { + Reflect.setField(newNode, propData[0], propData[1]); + } + + var i = 0; + for (inputData in inputDatas) { + newNode.addInput(createSocketDefaultNode(newNode.tree, inputData[0], inputData[1]), i++); + } + + for (outputData in outputDatas) { + newNode.addOutputs([createSocketDefaultNode(newNode.tree, outputData[0], outputData[1])]); + } + } + public static function patchNodeCopy(treeName: String, nodeName: String, newNodeName: String, copyProps: Array, inputDatas: Array>, outputDatas: Array>) { var tree = LogicTree.nodeTrees[treeName]; if (tree == null) return; @@ -115,7 +141,7 @@ class LivePatch extends iron.Trait { // No further constructor parameters required here, all variable nodes // use optional further parameters and all values are set later in this // function. - var newNode = Type.createInstance(Type.getClass(node), [tree]); + var newNode: LogicNode = Type.createInstance(Type.getClass(node), [tree]); newNode.name = newNodeName; tree.nodes[newNodeName] = newNode; diff --git a/blender/arm/live_patch.py b/blender/arm/live_patch.py index 1130e5b5..7bc8073d 100644 --- a/blender/arm/live_patch.py +++ b/blender/arm/live_patch.py @@ -186,7 +186,7 @@ def send_event(event_id: str, opt_data: Any = None): tree_name = arm.node_utils.get_export_tree_name(node.get_tree()) node_name = arm.node_utils.get_export_node_name(node)[1:] - value = arm.node_utils.haxe_format_prop(node, prop_name) + value = arm.node_utils.haxe_format_prop_value(node, prop_name) js = f'LivePatch.patchUpdateNodeProp("{tree_name}", "{node_name}", "{prop_name}", {value});' write_patch(js) @@ -215,6 +215,25 @@ def send_event(event_id: str, opt_data: Any = None): js = f'LivePatch.patchUpdateNodeInputVal("{tree_name}", "{node_name}", {socket_index}, {value});' write_patch(js) + elif event_id == 'ln_create': + node: ArmLogicTreeNode = opt_data + + tree_name = arm.node_utils.get_export_tree_name(node.get_tree()) + node_name = arm.node_utils.get_export_node_name(node)[1:] + node_type = 'armory.logicnode.' + node.bl_idname[2:] + + prop_names = (p for p in arm.node_utils.get_haxe_property_names(node)) + prop_values = (getattr(node, prop_name) for prop_name in prop_names) + prop_datas = arm.node_utils.haxe_format_socket_val(list(zip(prop_names, prop_values))) + + inp_data = [(inp.arm_socket_type, inp.get_default_value()) for inp in node.inputs] + inp_data = arm.node_utils.haxe_format_socket_val(inp_data) + out_data = [(out.arm_socket_type, out.get_default_value()) for out in node.outputs] + out_data = arm.node_utils.haxe_format_socket_val(out_data) + + js = f'LivePatch.patchNodeCreate("{tree_name}", "{node_name}", "{node_type}", {prop_datas}, {inp_data}, {out_data});' + write_patch(js) + elif event_id == 'ln_delete': node: ArmLogicTreeNode = opt_data diff --git a/blender/arm/logicnode/animation/LN_action.py b/blender/arm/logicnode/animation/LN_action.py index d156819b..e7913910 100644 --- a/blender/arm/logicnode/animation/LN_action.py +++ b/blender/arm/logicnode/animation/LN_action.py @@ -6,8 +6,7 @@ class AnimActionNode(ArmLogicTreeNode): bl_label = 'Action' arm_version = 1 - def init(self, context): - super(AnimActionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAnimAction', 'Action') self.add_output('ArmNodeSocketAnimAction', 'Action', is_var=True) diff --git a/blender/arm/logicnode/animation/LN_blend_action.py b/blender/arm/logicnode/animation/LN_blend_action.py index 0d98d693..0214e28d 100644 --- a/blender/arm/logicnode/animation/LN_blend_action.py +++ b/blender/arm/logicnode/animation/LN_blend_action.py @@ -6,8 +6,7 @@ class BlendActionNode(ArmLogicTreeNode): bl_label = 'Blend Action' arm_version = 1 - def init(self, context): - super(BlendActionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketAnimAction', 'Action 1') diff --git a/blender/arm/logicnode/animation/LN_bone_fk.py b/blender/arm/logicnode/animation/LN_bone_fk.py index 58f59910..d994584d 100644 --- a/blender/arm/logicnode/animation/LN_bone_fk.py +++ b/blender/arm/logicnode/animation/LN_bone_fk.py @@ -7,8 +7,7 @@ class BoneFKNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'armature' - def init(self, context): - super(BoneFKNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmStringSocket', 'Bone') diff --git a/blender/arm/logicnode/animation/LN_bone_ik.py b/blender/arm/logicnode/animation/LN_bone_ik.py index 00577537..e677b9d8 100644 --- a/blender/arm/logicnode/animation/LN_bone_ik.py +++ b/blender/arm/logicnode/animation/LN_bone_ik.py @@ -7,8 +7,7 @@ class BoneIKNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'armature' - def init(self, context): - super(BoneIKNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmStringSocket', 'Bone') diff --git a/blender/arm/logicnode/animation/LN_get_action_state.py b/blender/arm/logicnode/animation/LN_get_action_state.py index 51e2d130..1b506613 100644 --- a/blender/arm/logicnode/animation/LN_get_action_state.py +++ b/blender/arm/logicnode/animation/LN_get_action_state.py @@ -6,8 +6,7 @@ class AnimationStateNode(ArmLogicTreeNode): bl_label = 'Get Action State' arm_version = 1 - def init(self, context): - super(AnimationStateNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmStringSocket', 'Action') diff --git a/blender/arm/logicnode/animation/LN_get_tilesheet_state.py b/blender/arm/logicnode/animation/LN_get_tilesheet_state.py index dadf0888..09adee81 100644 --- a/blender/arm/logicnode/animation/LN_get_tilesheet_state.py +++ b/blender/arm/logicnode/animation/LN_get_tilesheet_state.py @@ -7,8 +7,7 @@ class GetTilesheetStateNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'tilesheet' - def init(self, context): - super(GetTilesheetStateNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmStringSocket', 'Name') diff --git a/blender/arm/logicnode/animation/LN_on_action_marker.py b/blender/arm/logicnode/animation/LN_on_action_marker.py index c26abc19..07c4e690 100644 --- a/blender/arm/logicnode/animation/LN_on_action_marker.py +++ b/blender/arm/logicnode/animation/LN_on_action_marker.py @@ -6,8 +6,7 @@ class OnActionMarkerNode(ArmLogicTreeNode): bl_label = 'On Action Marker' arm_version = 1 - def init(self, context): - super(OnActionMarkerNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmStringSocket', 'Marker') diff --git a/blender/arm/logicnode/animation/LN_play_action_from.py b/blender/arm/logicnode/animation/LN_play_action_from.py index 732a7c40..31a218ea 100644 --- a/blender/arm/logicnode/animation/LN_play_action_from.py +++ b/blender/arm/logicnode/animation/LN_play_action_from.py @@ -6,8 +6,7 @@ class PlayActionFromNode(ArmLogicTreeNode): bl_label = 'Play Action From' arm_version = 2 - def init(self, context): - super(PlayActionFromNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketAnimAction', 'Action') @@ -22,7 +21,7 @@ class PlayActionFromNode(ArmLogicTreeNode): def get_replacement_node(self, node_tree: bpy.types.NodeTree): if self.arm_version not in (0, 1): raise LookupError() - + return NodeReplacement( 'LNPlayActionFromNode', self.arm_version, 'LNPlayActionFromNode', 2, in_socket_mapping={0:0, 1:1, 2:2, 3:3, 4:4}, out_socket_mapping={0:0, 1:1} diff --git a/blender/arm/logicnode/animation/LN_play_tilesheet.py b/blender/arm/logicnode/animation/LN_play_tilesheet.py index 4af5d10a..6e008f9e 100644 --- a/blender/arm/logicnode/animation/LN_play_tilesheet.py +++ b/blender/arm/logicnode/animation/LN_play_tilesheet.py @@ -7,8 +7,7 @@ class PlayTilesheetNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'tilesheet' - def init(self, context): - super(PlayTilesheetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmStringSocket', 'Name') diff --git a/blender/arm/logicnode/animation/LN_set_action_paused.py b/blender/arm/logicnode/animation/LN_set_action_paused.py index 8df9b9ce..6c994959 100644 --- a/blender/arm/logicnode/animation/LN_set_action_paused.py +++ b/blender/arm/logicnode/animation/LN_set_action_paused.py @@ -6,8 +6,7 @@ class SetActionPausedNode(ArmLogicTreeNode): bl_label = 'Set Action Paused' arm_version = 1 - def init(self, context): - super(SetActionPausedNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmBoolSocket', 'Paused') diff --git a/blender/arm/logicnode/animation/LN_set_action_speed.py b/blender/arm/logicnode/animation/LN_set_action_speed.py index 9a011883..e90cec67 100644 --- a/blender/arm/logicnode/animation/LN_set_action_speed.py +++ b/blender/arm/logicnode/animation/LN_set_action_speed.py @@ -6,8 +6,7 @@ class SetActionSpeedNode(ArmLogicTreeNode): bl_label = 'Set Action Speed' arm_version = 1 - def init(self, context): - super(SetActionSpeedNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmFloatSocket', 'Speed', default_value=1.0) diff --git a/blender/arm/logicnode/animation/LN_set_parent_bone.py b/blender/arm/logicnode/animation/LN_set_parent_bone.py index dc40384b..5aa686e3 100644 --- a/blender/arm/logicnode/animation/LN_set_parent_bone.py +++ b/blender/arm/logicnode/animation/LN_set_parent_bone.py @@ -7,8 +7,7 @@ class SetParentBoneNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'armature' - def init(self, context): - super(SetParentBoneNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketObject', 'Parent', default_value='Parent') diff --git a/blender/arm/logicnode/animation/LN_set_particle_speed.py b/blender/arm/logicnode/animation/LN_set_particle_speed.py index d4e614bd..2fe92ee4 100644 --- a/blender/arm/logicnode/animation/LN_set_particle_speed.py +++ b/blender/arm/logicnode/animation/LN_set_particle_speed.py @@ -6,8 +6,7 @@ class SetParticleSpeedNode(ArmLogicTreeNode): bl_label = 'Set Particle Speed' arm_version = 1 - def init(self, context): - super(SetParticleSpeedNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmFloatSocket', 'Speed', default_value=1.0) diff --git a/blender/arm/logicnode/animation/LN_set_tilesheet_paused.py b/blender/arm/logicnode/animation/LN_set_tilesheet_paused.py index ef7f954a..393a259f 100644 --- a/blender/arm/logicnode/animation/LN_set_tilesheet_paused.py +++ b/blender/arm/logicnode/animation/LN_set_tilesheet_paused.py @@ -7,8 +7,7 @@ class SetTilesheetPausedNode(ArmLogicTreeNode): arm_section = 'tilesheet' arm_version = 1 - def init(self, context): - super(SetTilesheetPausedNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmBoolSocket', 'Paused') diff --git a/blender/arm/logicnode/arm_nodes.py b/blender/arm/logicnode/arm_nodes.py index 50db2c43..d7548c5c 100644 --- a/blender/arm/logicnode/arm_nodes.py +++ b/blender/arm/logicnode/arm_nodes.py @@ -37,6 +37,14 @@ class ArmLogicTreeNode(bpy.types.Node): else: self.arm_version = 1 + if not hasattr(self, 'arm_init'): + # Show warning for older node packages + arm.log.warn(f'Node {self.bl_idname} has no arm_init function and might not work correctly!') + else: + self.arm_init(context) + + arm.live_patch.send_event('ln_create', self) + @classmethod def poll(cls, ntree): return ntree.bl_idname == 'ArmLogicTreeType' diff --git a/blender/arm/logicnode/array/LN_array.py b/blender/arm/logicnode/array/LN_array.py index 39326e79..65473756 100644 --- a/blender/arm/logicnode/array/LN_array.py +++ b/blender/arm/logicnode/array/LN_array.py @@ -10,8 +10,7 @@ class ArrayNode(ArmLogicTreeNode): def __init__(self): array_nodes[str(id(self))] = self - def init(self, context): - super(ArrayNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketArray', 'Array', is_var=True) self.add_output('ArmIntSocket', 'Length') diff --git a/blender/arm/logicnode/array/LN_array_add.py b/blender/arm/logicnode/array/LN_array_add.py index acbc5959..0fc31a6d 100644 --- a/blender/arm/logicnode/array/LN_array_add.py +++ b/blender/arm/logicnode/array/LN_array_add.py @@ -15,8 +15,7 @@ class ArrayAddNode(ArmLogicTreeNode): super(ArrayAddNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(ArrayAddNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') self.add_input('ArmBoolSocket', 'Modify Original', default_value=True) diff --git a/blender/arm/logicnode/array/LN_array_boolean.py b/blender/arm/logicnode/array/LN_array_boolean.py index ae355b09..7c0b333d 100644 --- a/blender/arm/logicnode/array/LN_array_boolean.py +++ b/blender/arm/logicnode/array/LN_array_boolean.py @@ -11,8 +11,7 @@ class BooleanArrayNode(ArmLogicTreeNode): super(BooleanArrayNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(BooleanArrayNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketArray', 'Array', is_var=True) self.add_output('ArmIntSocket', 'Length') diff --git a/blender/arm/logicnode/array/LN_array_color.py b/blender/arm/logicnode/array/LN_array_color.py index f569245a..148fd2da 100644 --- a/blender/arm/logicnode/array/LN_array_color.py +++ b/blender/arm/logicnode/array/LN_array_color.py @@ -11,8 +11,7 @@ class ColorArrayNode(ArmLogicTreeNode): super(ColorArrayNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(ColorArrayNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketArray', 'Array', is_var=True) self.add_output('ArmIntSocket', 'Length') diff --git a/blender/arm/logicnode/array/LN_array_contains.py b/blender/arm/logicnode/array/LN_array_contains.py index b0a2bc53..c81ec46a 100644 --- a/blender/arm/logicnode/array/LN_array_contains.py +++ b/blender/arm/logicnode/array/LN_array_contains.py @@ -6,8 +6,7 @@ class ArrayContainsNode(ArmLogicTreeNode): bl_label = 'Array Contains' arm_version = 1 - def init(self, context): - super(ArrayContainsNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketArray', 'Array') self.add_input('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/array/LN_array_float.py b/blender/arm/logicnode/array/LN_array_float.py index 22e2019b..2c3ec3d8 100644 --- a/blender/arm/logicnode/array/LN_array_float.py +++ b/blender/arm/logicnode/array/LN_array_float.py @@ -11,8 +11,7 @@ class FloatArrayNode(ArmLogicTreeNode): super(FloatArrayNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(FloatArrayNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketArray', 'Array', is_var=True) self.add_output('ArmIntSocket', 'Length') diff --git a/blender/arm/logicnode/array/LN_array_get.py b/blender/arm/logicnode/array/LN_array_get.py index bda50633..598a60f5 100644 --- a/blender/arm/logicnode/array/LN_array_get.py +++ b/blender/arm/logicnode/array/LN_array_get.py @@ -6,8 +6,7 @@ class ArrayGetNode(ArmLogicTreeNode): bl_label = 'Array Get' arm_version = 1 - def init(self, context): - super(ArrayGetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketArray', 'Array') self.add_input('ArmIntSocket', 'Index') diff --git a/blender/arm/logicnode/array/LN_array_integer.py b/blender/arm/logicnode/array/LN_array_integer.py index f4e0aab8..1b01e721 100644 --- a/blender/arm/logicnode/array/LN_array_integer.py +++ b/blender/arm/logicnode/array/LN_array_integer.py @@ -11,8 +11,7 @@ class IntegerArrayNode(ArmLogicTreeNode): super(IntegerArrayNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(IntegerArrayNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketArray', 'Array') self.add_output('ArmIntSocket', 'Length') diff --git a/blender/arm/logicnode/array/LN_array_length.py b/blender/arm/logicnode/array/LN_array_length.py index c655ac86..3ef4e9f1 100644 --- a/blender/arm/logicnode/array/LN_array_length.py +++ b/blender/arm/logicnode/array/LN_array_length.py @@ -6,8 +6,7 @@ class ArrayLengthNode(ArmLogicTreeNode): bl_label = 'Array Length' arm_version = 1 - def init(self, context): - super(ArrayLengthNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketArray', 'Array') self.add_output('ArmIntSocket', 'Length') diff --git a/blender/arm/logicnode/array/LN_array_loop_node.py b/blender/arm/logicnode/array/LN_array_loop_node.py index 18207c8e..aefd7331 100644 --- a/blender/arm/logicnode/array/LN_array_loop_node.py +++ b/blender/arm/logicnode/array/LN_array_loop_node.py @@ -7,8 +7,7 @@ class ArrayLoopNode(ArmLogicTreeNode): bl_label = 'Array Loop' arm_version = 1 - def init(self, context): - super(ArrayLoopNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') diff --git a/blender/arm/logicnode/array/LN_array_object.py b/blender/arm/logicnode/array/LN_array_object.py index 71c55d89..513e211c 100644 --- a/blender/arm/logicnode/array/LN_array_object.py +++ b/blender/arm/logicnode/array/LN_array_object.py @@ -11,8 +11,7 @@ class ObjectArrayNode(ArmLogicTreeNode): super(ObjectArrayNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(ObjectArrayNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketArray', 'Array', is_var=True) self.add_output('ArmIntSocket', 'Length') diff --git a/blender/arm/logicnode/array/LN_array_pop.py b/blender/arm/logicnode/array/LN_array_pop.py index 9708b343..37b9ad5c 100644 --- a/blender/arm/logicnode/array/LN_array_pop.py +++ b/blender/arm/logicnode/array/LN_array_pop.py @@ -8,8 +8,7 @@ class ArrayPopNode(ArmLogicTreeNode): bl_label = 'Array Pop' arm_version = 1 - def init(self, context): - super(ArrayPopNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketArray', 'Array') self.add_output('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/array/LN_array_remove_by_index.py b/blender/arm/logicnode/array/LN_array_remove_by_index.py index a07c864c..efc69b43 100644 --- a/blender/arm/logicnode/array/LN_array_remove_by_index.py +++ b/blender/arm/logicnode/array/LN_array_remove_by_index.py @@ -8,8 +8,7 @@ class ArrayRemoveIndexNode(ArmLogicTreeNode): bl_label = 'Array Remove by Index' arm_version = 1 - def init(self, context): - super(ArrayRemoveIndexNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') self.add_input('ArmIntSocket', 'Index') diff --git a/blender/arm/logicnode/array/LN_array_remove_by_value.py b/blender/arm/logicnode/array/LN_array_remove_by_value.py index 8ab646fd..5314b714 100644 --- a/blender/arm/logicnode/array/LN_array_remove_by_value.py +++ b/blender/arm/logicnode/array/LN_array_remove_by_value.py @@ -11,8 +11,7 @@ class ArrayRemoveValueNode(ArmLogicTreeNode): # def __init__(self): # array_nodes[str(id(self))] = self - def init(self, context): - super(ArrayRemoveValueNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') self.add_input('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/array/LN_array_set.py b/blender/arm/logicnode/array/LN_array_set.py index c0fb2293..e1eac977 100644 --- a/blender/arm/logicnode/array/LN_array_set.py +++ b/blender/arm/logicnode/array/LN_array_set.py @@ -6,8 +6,7 @@ class ArraySetNode(ArmLogicTreeNode): bl_label = 'Array Set' arm_version = 1 - def init(self, context): - super(ArraySetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') self.add_input('ArmIntSocket', 'Index') diff --git a/blender/arm/logicnode/array/LN_array_shift.py b/blender/arm/logicnode/array/LN_array_shift.py index d1d31b37..15ee7b78 100644 --- a/blender/arm/logicnode/array/LN_array_shift.py +++ b/blender/arm/logicnode/array/LN_array_shift.py @@ -8,8 +8,7 @@ class ArrayShiftNode(ArmLogicTreeNode): bl_label = 'Array Shift' arm_version = 1 - def init(self, context): - super(ArrayShiftNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketArray', 'Array') self.add_output('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/array/LN_array_slice.py b/blender/arm/logicnode/array/LN_array_slice.py index 87da4910..be2b1bd4 100644 --- a/blender/arm/logicnode/array/LN_array_slice.py +++ b/blender/arm/logicnode/array/LN_array_slice.py @@ -8,8 +8,7 @@ class ArraySliceNode(ArmLogicTreeNode): bl_label = 'Array Slice' arm_version = 1 - def init(self, context): - super(ArraySliceNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketArray', 'Array') self.add_input('ArmIntSocket', 'Index') self.add_input('ArmIntSocket', 'End') diff --git a/blender/arm/logicnode/array/LN_array_splice.py b/blender/arm/logicnode/array/LN_array_splice.py index ea1c28f8..1f367cc5 100644 --- a/blender/arm/logicnode/array/LN_array_splice.py +++ b/blender/arm/logicnode/array/LN_array_splice.py @@ -8,8 +8,7 @@ class ArraySpliceNode(ArmLogicTreeNode): bl_label = 'Array Splice' arm_version = 1 - def init(self, context): - super(ArraySpliceNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') self.add_input('ArmIntSocket', 'Index') diff --git a/blender/arm/logicnode/array/LN_array_string.py b/blender/arm/logicnode/array/LN_array_string.py index 2052a9db..0bf6ed27 100644 --- a/blender/arm/logicnode/array/LN_array_string.py +++ b/blender/arm/logicnode/array/LN_array_string.py @@ -11,8 +11,7 @@ class StringArrayNode(ArmLogicTreeNode): super(StringArrayNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(StringArrayNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketArray', 'Array', is_var=True) self.add_output('ArmIntSocket', 'Length') diff --git a/blender/arm/logicnode/array/LN_array_vector.py b/blender/arm/logicnode/array/LN_array_vector.py index 75b08e59..bf1715d7 100644 --- a/blender/arm/logicnode/array/LN_array_vector.py +++ b/blender/arm/logicnode/array/LN_array_vector.py @@ -11,8 +11,7 @@ class VectorArrayNode(ArmLogicTreeNode): super(VectorArrayNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(VectorArrayNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketArray', 'Array', is_var=True) self.add_output('ArmIntSocket', 'Length') diff --git a/blender/arm/logicnode/camera/LN_get_camera_active.py b/blender/arm/logicnode/camera/LN_get_camera_active.py index 54c3fe7a..9956d45e 100644 --- a/blender/arm/logicnode/camera/LN_get_camera_active.py +++ b/blender/arm/logicnode/camera/LN_get_camera_active.py @@ -8,6 +8,5 @@ class ActiveCameraNode(ArmLogicTreeNode): bl_label = 'Get Camera Active' arm_version = 1 - def init(self, context): - super(ActiveCameraNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketObject', 'Camera') diff --git a/blender/arm/logicnode/camera/LN_get_camera_fov.py b/blender/arm/logicnode/camera/LN_get_camera_fov.py index f6dc4426..b5e70466 100644 --- a/blender/arm/logicnode/camera/LN_get_camera_fov.py +++ b/blender/arm/logicnode/camera/LN_get_camera_fov.py @@ -8,8 +8,7 @@ class GetCameraFovNode(ArmLogicTreeNode): bl_label = 'Get Camera FOV' arm_version = 1 - def init(self, context): - super(GetCameraFovNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmFloatSocket', 'FOV') diff --git a/blender/arm/logicnode/camera/LN_set_camera_active.py b/blender/arm/logicnode/camera/LN_set_camera_active.py index dd05a919..fa078d10 100644 --- a/blender/arm/logicnode/camera/LN_set_camera_active.py +++ b/blender/arm/logicnode/camera/LN_set_camera_active.py @@ -8,8 +8,7 @@ class SetCameraNode(ArmLogicTreeNode): bl_label = 'Set Camera Active' arm_version = 1 - def init(self, context): - super(SetCameraNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Camera') diff --git a/blender/arm/logicnode/camera/LN_set_camera_fov.py b/blender/arm/logicnode/camera/LN_set_camera_fov.py index 2a5103ea..1974c0d0 100644 --- a/blender/arm/logicnode/camera/LN_set_camera_fov.py +++ b/blender/arm/logicnode/camera/LN_set_camera_fov.py @@ -8,8 +8,7 @@ class SetCameraFovNode(ArmLogicTreeNode): bl_label = 'Set Camera FOV' arm_version = 1 - def init(self, context): - super(SetCameraFovNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Camera') self.add_input('ArmFloatSocket', 'FOV', default_value=0.9) diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_checkbox.py b/blender/arm/logicnode/canvas/LN_get_canvas_checkbox.py index a8860a36..de3cee1d 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_checkbox.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_checkbox.py @@ -6,8 +6,7 @@ class CanvasGetCheckboxNode(ArmLogicTreeNode): bl_label = 'Get Canvas Checkbox' arm_version = 1 - def init(self, context): - super(CanvasGetCheckboxNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'Element') self.add_output('ArmBoolSocket', 'Is Checked') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_input_text.py b/blender/arm/logicnode/canvas/LN_get_canvas_input_text.py index 69938c5c..e8d1a7d3 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_input_text.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_input_text.py @@ -6,8 +6,7 @@ class CanvasGetInputTextNode(ArmLogicTreeNode): bl_label = 'Get Canvas Input Text' arm_version = 1 - def init(self, context): - super(CanvasGetInputTextNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'Element') self.add_output('ArmStringSocket', 'Text') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_location.py b/blender/arm/logicnode/canvas/LN_get_canvas_location.py index 21e38a1b..71e9491f 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_location.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_location.py @@ -6,8 +6,7 @@ class CanvasGetLocationNode(ArmLogicTreeNode): bl_label = 'Get Canvas Location' arm_version = 1 - def init(self, context): - super(CanvasGetLocationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_position.py b/blender/arm/logicnode/canvas/LN_get_canvas_position.py index 66ae4db6..47efa750 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_position.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_position.py @@ -6,8 +6,7 @@ class CanvasGetPositionNode(ArmLogicTreeNode): bl_label = 'Get Canvas Position' arm_version = 1 - def init(self, context): - super(CanvasGetPositionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'Element') self.add_output('ArmIntSocket', 'Position') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_progress_bar.py b/blender/arm/logicnode/canvas/LN_get_canvas_progress_bar.py index 493a740d..5e9435ca 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_progress_bar.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_progress_bar.py @@ -6,8 +6,7 @@ class CanvasGetPBNode(ArmLogicTreeNode): bl_label = 'Get Canvas Progress Bar' arm_version = 1 - def init(self, context): - super(CanvasGetPBNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_rotation.py b/blender/arm/logicnode/canvas/LN_get_canvas_rotation.py index bde56b39..3b7ffa9e 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_rotation.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_rotation.py @@ -6,8 +6,7 @@ class CanvasGetRotationNode(ArmLogicTreeNode): bl_label = 'Get Canvas Rotation' arm_version = 1 - def init(self, context): - super(CanvasGetRotationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_scale.py b/blender/arm/logicnode/canvas/LN_get_canvas_scale.py index fad278f2..9e65ea39 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_scale.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_scale.py @@ -6,8 +6,7 @@ class CanvasGetScaleNode(ArmLogicTreeNode): bl_label = 'Get Canvas Scale' arm_version = 1 - def init(self, context): - super(CanvasGetScaleNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_slider.py b/blender/arm/logicnode/canvas/LN_get_canvas_slider.py index d6d44535..c0d09cc4 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_slider.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_slider.py @@ -6,8 +6,7 @@ class CanvasGetSliderNode(ArmLogicTreeNode): bl_label = 'Get Canvas Slider' arm_version = 1 - def init(self, context): - super(CanvasGetSliderNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'Element') self.add_output('ArmFloatSocket', 'Float') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_visible.py b/blender/arm/logicnode/canvas/LN_get_canvas_visible.py index f930146f..3fb4ae1b 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_visible.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_visible.py @@ -9,8 +9,7 @@ class CanvasGetVisibleNode(ArmLogicTreeNode): bl_label = 'Get Canvas Visible' arm_version = 1 - def init(self, context): - super(CanvasGetVisibleNode, self).init(context) + def arm_init(self, context): self.inputs.new('ArmStringSocket', 'Element') self.outputs.new('ArmBoolSocket', 'Is Visible') diff --git a/blender/arm/logicnode/canvas/LN_on_canvas_element.py b/blender/arm/logicnode/canvas/LN_on_canvas_element.py index a72501a5..fe65ad0c 100644 --- a/blender/arm/logicnode/canvas/LN_on_canvas_element.py +++ b/blender/arm/logicnode/canvas/LN_on_canvas_element.py @@ -24,8 +24,7 @@ class OnCanvasElementNode(ArmLogicTreeNode): ('right', 'Right', 'Right mouse button')], name='Mouse Button', default='left') - def init(self, context): - super(OnCanvasElementNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'Element') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_asset.py b/blender/arm/logicnode/canvas/LN_set_canvas_asset.py index 077ece2e..bf734e70 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_asset.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_asset.py @@ -6,8 +6,7 @@ class CanvasSetAssetNode(ArmLogicTreeNode): bl_label = 'Set Canvas Asset' arm_version = 1 - def init(self, context): - super(CanvasSetAssetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') self.add_input('ArmStringSocket', 'Asset') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_checkbox.py b/blender/arm/logicnode/canvas/LN_set_canvas_checkbox.py index 293200a5..ad41a7ae 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_checkbox.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_checkbox.py @@ -6,8 +6,7 @@ class CanvasSetCheckBoxNode(ArmLogicTreeNode): bl_label = 'Set Canvas Checkbox' arm_version = 1 - def init(self, context): - super(CanvasSetCheckBoxNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') self.add_input('ArmBoolSocket', 'Check') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_location.py b/blender/arm/logicnode/canvas/LN_set_canvas_location.py index cfb43449..03402117 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_location.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_location.py @@ -6,8 +6,7 @@ class CanvasSetLocationNode(ArmLogicTreeNode): bl_label = 'Set Canvas Location' arm_version = 1 - def init(self, context): - super(CanvasSetLocationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') self.add_input('ArmFloatSocket', 'X') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_progress_bar.py b/blender/arm/logicnode/canvas/LN_set_canvas_progress_bar.py index 38ae0530..b5d59085 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_progress_bar.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_progress_bar.py @@ -6,8 +6,7 @@ class CanvasSetPBNode(ArmLogicTreeNode): bl_label = 'Set Canvas Progress Bar' arm_version = 1 - def init(self, context): - super(CanvasSetPBNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') self.add_input('ArmIntSocket', 'At') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_rotation.py b/blender/arm/logicnode/canvas/LN_set_canvas_rotation.py index dae5deaf..ee9f6502 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_rotation.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_rotation.py @@ -6,8 +6,7 @@ class CanvasSetRotationNode(ArmLogicTreeNode): bl_label = 'Set Canvas Rotation' arm_version = 1 - def init(self, context): - super(CanvasSetRotationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') self.add_input('ArmFloatSocket', 'Rad') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_scale.py b/blender/arm/logicnode/canvas/LN_set_canvas_scale.py index 714c0030..7afbf7ab 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_scale.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_scale.py @@ -6,8 +6,7 @@ class CanvasSetScaleNode(ArmLogicTreeNode): bl_label = 'Set Canvas Scale' arm_version = 1 - def init(self, context): - super(CanvasSetScaleNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') self.add_input('ArmIntSocket', 'Height') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_slider.py b/blender/arm/logicnode/canvas/LN_set_canvas_slider.py index 7f48cce3..9988266b 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_slider.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_slider.py @@ -6,8 +6,7 @@ class CanvasSetSliderNode(ArmLogicTreeNode): bl_label = 'Set Canvas Slider' arm_version = 1 - def init(self, context): - super(CanvasSetSliderNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') self.add_input('ArmFloatSocket', 'Float') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_text.py b/blender/arm/logicnode/canvas/LN_set_canvas_text.py index a706b31a..462b7ba2 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_text.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_text.py @@ -6,8 +6,7 @@ class CanvasSetTextNode(ArmLogicTreeNode): bl_label = 'Set Canvas Text' arm_version = 1 - def init(self, context): - super(CanvasSetTextNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') self.add_input('ArmStringSocket', 'Text') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_text_color.py b/blender/arm/logicnode/canvas/LN_set_canvas_text_color.py index b6064691..5863510f 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_text_color.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_text_color.py @@ -6,8 +6,7 @@ class CanvasSetTextColorNode(ArmLogicTreeNode): bl_label = 'Set Canvas Text Color' arm_version = 1 - def init(self, context): - super(CanvasSetTextColorNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') self.add_input('ArmFloatSocket', 'R') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_visible.py b/blender/arm/logicnode/canvas/LN_set_canvas_visible.py index e9af8266..dbe88b26 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_visible.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_visible.py @@ -6,8 +6,7 @@ class CanvasSetVisibleNode(ArmLogicTreeNode): bl_label = 'Set Canvas Visible' arm_version = 1 - def init(self, context): - super(CanvasSetVisibleNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Element') self.add_input('ArmBoolSocket', 'Visible') diff --git a/blender/arm/logicnode/deprecated/LN_get_mouse_lock.py b/blender/arm/logicnode/deprecated/LN_get_mouse_lock.py index 5a651247..83cea8fa 100644 --- a/blender/arm/logicnode/deprecated/LN_get_mouse_lock.py +++ b/blender/arm/logicnode/deprecated/LN_get_mouse_lock.py @@ -14,8 +14,7 @@ class GetMouseLockNode(ArmLogicTreeNode): arm_category = 'Input' arm_section = 'mouse' - def init(self, context): - super(GetMouseLockNode, self).init(context) + def arm_init(self, context): self.outputs.new('ArmBoolSocket', 'Is Locked') def get_replacement_node(self, node_tree: bpy.types.NodeTree): diff --git a/blender/arm/logicnode/deprecated/LN_get_mouse_visible.py b/blender/arm/logicnode/deprecated/LN_get_mouse_visible.py index 6f394deb..95c5d0f1 100644 --- a/blender/arm/logicnode/deprecated/LN_get_mouse_visible.py +++ b/blender/arm/logicnode/deprecated/LN_get_mouse_visible.py @@ -14,8 +14,7 @@ class GetMouseVisibleNode(ArmLogicTreeNode): arm_section = 'mouse' arm_version = 2 - def init(self, context): - super(GetMouseVisibleNode, self).init(context) + def arm_init(self, context): self.outputs.new('ArmBoolSocket', 'Is Visible') def get_replacement_node(self, node_tree: bpy.types.NodeTree): diff --git a/blender/arm/logicnode/deprecated/LN_mouse_coords.py b/blender/arm/logicnode/deprecated/LN_mouse_coords.py index 1244730d..60b58cdd 100644 --- a/blender/arm/logicnode/deprecated/LN_mouse_coords.py +++ b/blender/arm/logicnode/deprecated/LN_mouse_coords.py @@ -11,8 +11,7 @@ class MouseCoordsNode(ArmLogicTreeNode): arm_section = 'mouse' arm_version = 2 - def init(self, context): - super(MouseCoordsNode, self).init(context) + def arm_init(self, context): self.add_output('ArmVectorSocket', 'Coords') self.add_output('ArmVectorSocket', 'Movement') self.add_output('ArmIntSocket', 'Wheel') diff --git a/blender/arm/logicnode/deprecated/LN_on_gamepad.py b/blender/arm/logicnode/deprecated/LN_on_gamepad.py index fe1f2913..3de6a284 100644 --- a/blender/arm/logicnode/deprecated/LN_on_gamepad.py +++ b/blender/arm/logicnode/deprecated/LN_on_gamepad.py @@ -42,8 +42,7 @@ class OnGamepadNode(ArmLogicTreeNode): ('touchpad', 'touchpad', 'touchpad'),], name='', default='cross') - def init(self, context): - super(OnGamepadNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') self.add_input('ArmIntSocket', 'Gamepad') diff --git a/blender/arm/logicnode/deprecated/LN_on_keyboard.py b/blender/arm/logicnode/deprecated/LN_on_keyboard.py index b5b8bbcf..77699451 100644 --- a/blender/arm/logicnode/deprecated/LN_on_keyboard.py +++ b/blender/arm/logicnode/deprecated/LN_on_keyboard.py @@ -74,8 +74,7 @@ class OnKeyboardNode(ArmLogicTreeNode): ('down', 'down', 'down'),], name='', default='space') - def init(self, context): - super(OnKeyboardNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/deprecated/LN_on_mouse.py b/blender/arm/logicnode/deprecated/LN_on_mouse.py index 487d634e..087ef551 100644 --- a/blender/arm/logicnode/deprecated/LN_on_mouse.py +++ b/blender/arm/logicnode/deprecated/LN_on_mouse.py @@ -25,8 +25,7 @@ class OnMouseNode(ArmLogicTreeNode): ('middle', 'middle', 'middle')], name='', default='left') - def init(self, context): - super(OnMouseNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/deprecated/LN_on_surface.py b/blender/arm/logicnode/deprecated/LN_on_surface.py index b906d143..706c45c6 100644 --- a/blender/arm/logicnode/deprecated/LN_on_surface.py +++ b/blender/arm/logicnode/deprecated/LN_on_surface.py @@ -19,8 +19,7 @@ class OnSurfaceNode(ArmLogicTreeNode): ('Moved', 'Moved', 'Moved')], name='', default='Touched') - def init(self, context): - super(OnSurfaceNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/deprecated/LN_on_virtual_button.py b/blender/arm/logicnode/deprecated/LN_on_virtual_button.py index e5201612..e2377d0b 100644 --- a/blender/arm/logicnode/deprecated/LN_on_virtual_button.py +++ b/blender/arm/logicnode/deprecated/LN_on_virtual_button.py @@ -19,8 +19,7 @@ class OnVirtualButtonNode(ArmLogicTreeNode): name='', default='Started') property1: HaxeStringProperty('property1', name='', default='button') - def init(self, context): - super(OnVirtualButtonNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/deprecated/LN_pause_action.py b/blender/arm/logicnode/deprecated/LN_pause_action.py index 2def9733..b515ec0d 100644 --- a/blender/arm/logicnode/deprecated/LN_pause_action.py +++ b/blender/arm/logicnode/deprecated/LN_pause_action.py @@ -10,8 +10,7 @@ class PauseActionNode(ArmLogicTreeNode): arm_category = 'Animation' arm_version = 2 - def init(self, context): - super(PauseActionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_pause_tilesheet.py b/blender/arm/logicnode/deprecated/LN_pause_tilesheet.py index 87185558..38313026 100644 --- a/blender/arm/logicnode/deprecated/LN_pause_tilesheet.py +++ b/blender/arm/logicnode/deprecated/LN_pause_tilesheet.py @@ -11,8 +11,7 @@ class PauseTilesheetNode(ArmLogicTreeNode): arm_section = 'tilesheet' arm_version = 2 - def init(self, context): - super(PauseTilesheetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_pause_trait.py b/blender/arm/logicnode/deprecated/LN_pause_trait.py index 7baa2d9f..b3aecd2c 100644 --- a/blender/arm/logicnode/deprecated/LN_pause_trait.py +++ b/blender/arm/logicnode/deprecated/LN_pause_trait.py @@ -10,8 +10,7 @@ class PauseTraitNode(ArmLogicTreeNode): arm_category = 'Trait' arm_version = 2 - def init(self, context): - super(PauseTraitNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Trait') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_play_action.py b/blender/arm/logicnode/deprecated/LN_play_action.py index a386d7f2..5ac411c9 100644 --- a/blender/arm/logicnode/deprecated/LN_play_action.py +++ b/blender/arm/logicnode/deprecated/LN_play_action.py @@ -10,8 +10,7 @@ class PlayActionNode(ArmLogicTreeNode): arm_category = 'Animation' arm_version = 2 - def init(self, context): - super(PlayActionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketAnimAction', 'Action') diff --git a/blender/arm/logicnode/deprecated/LN_resume_action.py b/blender/arm/logicnode/deprecated/LN_resume_action.py index 4df1d8dc..9af44ae0 100644 --- a/blender/arm/logicnode/deprecated/LN_resume_action.py +++ b/blender/arm/logicnode/deprecated/LN_resume_action.py @@ -10,8 +10,7 @@ class ResumeActionNode(ArmLogicTreeNode): arm_category = 'Animation' arm_version = 2 - def init(self, context): - super(ResumeActionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_resume_tilesheet.py b/blender/arm/logicnode/deprecated/LN_resume_tilesheet.py index 68ad6da2..b807dcc9 100644 --- a/blender/arm/logicnode/deprecated/LN_resume_tilesheet.py +++ b/blender/arm/logicnode/deprecated/LN_resume_tilesheet.py @@ -10,8 +10,7 @@ class ResumeTilesheetNode(ArmLogicTreeNode): arm_category = 'Animation' arm_version = 2 - def init(self, context): - super(ResumeTilesheetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_resume_trait.py b/blender/arm/logicnode/deprecated/LN_resume_trait.py index ccb9e183..89c15bdf 100644 --- a/blender/arm/logicnode/deprecated/LN_resume_trait.py +++ b/blender/arm/logicnode/deprecated/LN_resume_trait.py @@ -10,8 +10,7 @@ class ResumeTraitNode(ArmLogicTreeNode): arm_category = 'Trait' arm_version = 2 - def init(self, context): - super(ResumeTraitNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Trait') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_rotate_object_around_axis.py b/blender/arm/logicnode/deprecated/LN_rotate_object_around_axis.py index 49fe997d..104f774b 100644 --- a/blender/arm/logicnode/deprecated/LN_rotate_object_around_axis.py +++ b/blender/arm/logicnode/deprecated/LN_rotate_object_around_axis.py @@ -11,8 +11,7 @@ class RotateObjectAroundAxisNode(ArmLogicTreeNode): arm_section = 'rotation' arm_version = 2 - def init(self, context): - super(RotateObjectAroundAxisNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmVectorSocket', 'Axis', default_value=[0, 0, 1]) diff --git a/blender/arm/logicnode/deprecated/LN_scale_object.py b/blender/arm/logicnode/deprecated/LN_scale_object.py index 58f1078f..29d5ae3d 100644 --- a/blender/arm/logicnode/deprecated/LN_scale_object.py +++ b/blender/arm/logicnode/deprecated/LN_scale_object.py @@ -11,8 +11,7 @@ class ScaleObjectNode(ArmLogicTreeNode): arm_section = 'scale' arm_version = 2 - def init(self, context): - super(ScaleObjectNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmVectorSocket', 'Scale') diff --git a/blender/arm/logicnode/deprecated/LN_set_mouse_lock.py b/blender/arm/logicnode/deprecated/LN_set_mouse_lock.py index bb5ca4bb..a27f42c3 100644 --- a/blender/arm/logicnode/deprecated/LN_set_mouse_lock.py +++ b/blender/arm/logicnode/deprecated/LN_set_mouse_lock.py @@ -11,8 +11,7 @@ class SetMouseLockNode(ArmLogicTreeNode): arm_section = 'mouse' arm_version = 2 - def init(self, context): - super(SetMouseLockNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmBoolSocket', 'Lock') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_set_mouse_visible.py b/blender/arm/logicnode/deprecated/LN_set_mouse_visible.py index 19c29d1b..73e40a5b 100644 --- a/blender/arm/logicnode/deprecated/LN_set_mouse_visible.py +++ b/blender/arm/logicnode/deprecated/LN_set_mouse_visible.py @@ -11,8 +11,7 @@ class ShowMouseNode(ArmLogicTreeNode): arm_section = 'mouse' arm_version = 2 - def init(self, context): - super(ShowMouseNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmBoolSocket', 'Show') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_set_object_material.py b/blender/arm/logicnode/deprecated/LN_set_object_material.py index 4ca6b967..5d01c135 100644 --- a/blender/arm/logicnode/deprecated/LN_set_object_material.py +++ b/blender/arm/logicnode/deprecated/LN_set_object_material.py @@ -10,8 +10,7 @@ class SetMaterialNode(ArmLogicTreeNode): arm_category = 'Material' arm_version = 2 - def init(self, context): - super(SetMaterialNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmDynamicSocket', 'Material') diff --git a/blender/arm/logicnode/deprecated/LN_surface_coords.py b/blender/arm/logicnode/deprecated/LN_surface_coords.py index 480d4d95..3fc6d1ee 100644 --- a/blender/arm/logicnode/deprecated/LN_surface_coords.py +++ b/blender/arm/logicnode/deprecated/LN_surface_coords.py @@ -12,7 +12,6 @@ class SurfaceCoordsNode(ArmLogicTreeNode): arm_is_obsolete = 'is_obsolete' arm_version = 2 - def init(self, context): - super(SurfaceCoordsNode, self).init(context) + def arm_init(self, context): self.add_output('ArmVectorSocket', 'Coords') self.add_output('ArmVectorSocket', 'Movement') diff --git a/blender/arm/logicnode/event/LN_on_application_state.py b/blender/arm/logicnode/event/LN_on_application_state.py index e624e77d..d38f8255 100644 --- a/blender/arm/logicnode/event/LN_on_application_state.py +++ b/blender/arm/logicnode/event/LN_on_application_state.py @@ -6,8 +6,7 @@ class OnApplicationStateNode(ArmLogicTreeNode): bl_label = 'On Application State' arm_version = 1 - def init(self, context): - super().init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'On Foreground') self.add_output('ArmNodeSocketAction', 'On Background') self.add_output('ArmNodeSocketAction', 'On Shutdown') diff --git a/blender/arm/logicnode/event/LN_on_event.py b/blender/arm/logicnode/event/LN_on_event.py index 99d68c06..4cb7c28b 100644 --- a/blender/arm/logicnode/event/LN_on_event.py +++ b/blender/arm/logicnode/event/LN_on_event.py @@ -12,8 +12,7 @@ class OnEventNode(ArmLogicTreeNode): property0: HaxeStringProperty('property0', name='', default='') - def init(self, context): - super(OnEventNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/event/LN_on_init.py b/blender/arm/logicnode/event/LN_on_init.py index 3c75947c..b7246258 100644 --- a/blender/arm/logicnode/event/LN_on_init.py +++ b/blender/arm/logicnode/event/LN_on_init.py @@ -6,6 +6,5 @@ class OnInitNode(ArmLogicTreeNode): bl_label = 'On Init' arm_version = 1 - def init(self, context): - super(OnInitNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/event/LN_on_timer.py b/blender/arm/logicnode/event/LN_on_timer.py index 603755d2..f5c98e3e 100644 --- a/blender/arm/logicnode/event/LN_on_timer.py +++ b/blender/arm/logicnode/event/LN_on_timer.py @@ -9,8 +9,7 @@ class OnTimerNode(ArmLogicTreeNode): bl_label = 'On Timer' arm_version = 1 - def init(self, context): - super(OnTimerNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Duration') self.add_input('ArmBoolSocket', 'Repeat') diff --git a/blender/arm/logicnode/event/LN_on_update.py b/blender/arm/logicnode/event/LN_on_update.py index 3b39d066..c73ac019 100644 --- a/blender/arm/logicnode/event/LN_on_update.py +++ b/blender/arm/logicnode/event/LN_on_update.py @@ -17,8 +17,7 @@ class OnUpdateNode(ArmLogicTreeNode): ('Physics Pre-Update', 'Physics Pre-Update', 'Physics Pre-Update')], name='On', default='Update') - def init(self, context): - super(OnUpdateNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/event/LN_send_event_to_object.py b/blender/arm/logicnode/event/LN_send_event_to_object.py index 03dd9ed1..8470a704 100644 --- a/blender/arm/logicnode/event/LN_send_event_to_object.py +++ b/blender/arm/logicnode/event/LN_send_event_to_object.py @@ -13,8 +13,7 @@ class SendEventNode(ArmLogicTreeNode): arm_section = 'custom' arm_version = 1 - def init(self, context): - super(SendEventNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Event') self.add_input('ArmNodeSocketObject', 'Object') diff --git a/blender/arm/logicnode/event/LN_send_global_event.py b/blender/arm/logicnode/event/LN_send_global_event.py index 25943b51..aba0ac0e 100644 --- a/blender/arm/logicnode/event/LN_send_global_event.py +++ b/blender/arm/logicnode/event/LN_send_global_event.py @@ -12,8 +12,7 @@ class SendGlobalEventNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'custom' - def init(self, context): - super(SendGlobalEventNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Event') diff --git a/blender/arm/logicnode/input/LN_gamepad.py b/blender/arm/logicnode/input/LN_gamepad.py index 09c5cd0e..83e31ac1 100644 --- a/blender/arm/logicnode/input/LN_gamepad.py +++ b/blender/arm/logicnode/input/LN_gamepad.py @@ -46,8 +46,7 @@ class GamepadNode(ArmLogicTreeNode): ('touchpad', 'touchpad', 'touchpad'),], name='', default='cross') - def init(self, context): - super(GamepadNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmBoolSocket', 'State') diff --git a/blender/arm/logicnode/input/LN_gamepad_coords.py b/blender/arm/logicnode/input/LN_gamepad_coords.py index fdb61b75..2648479a 100644 --- a/blender/arm/logicnode/input/LN_gamepad_coords.py +++ b/blender/arm/logicnode/input/LN_gamepad_coords.py @@ -11,8 +11,7 @@ class GamepadCoordsNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'gamepad' - def init(self, context): - super(GamepadCoordsNode, self).init(context) + def arm_init(self, context): self.add_output('ArmVectorSocket', 'Left Stick') self.add_output('ArmVectorSocket', 'Right Stick') self.add_output('ArmVectorSocket', 'Left Movement') diff --git a/blender/arm/logicnode/input/LN_get_cursor_location.py b/blender/arm/logicnode/input/LN_get_cursor_location.py index 2d102343..6e6eedac 100644 --- a/blender/arm/logicnode/input/LN_get_cursor_location.py +++ b/blender/arm/logicnode/input/LN_get_cursor_location.py @@ -7,8 +7,7 @@ class GetCursorLocationNode(ArmLogicTreeNode): arm_section = 'mouse' arm_version = 1 - def init(self, context): - super(GetCursorLocationNode, self).init(context) + def arm_init(self, context): self.add_output('ArmIntSocket', 'X') self.add_output('ArmIntSocket', 'Y') self.add_output('ArmIntSocket', 'Inverted X') diff --git a/blender/arm/logicnode/input/LN_get_cursor_state.py b/blender/arm/logicnode/input/LN_get_cursor_state.py index b09c253a..0d1c7c8f 100644 --- a/blender/arm/logicnode/input/LN_get_cursor_state.py +++ b/blender/arm/logicnode/input/LN_get_cursor_state.py @@ -16,8 +16,7 @@ class GetCursorStateNode(ArmLogicTreeNode): arm_section = 'mouse' arm_version = 1 - def init(self, context): - super(GetCursorStateNode, self).init(context) + def arm_init(self, context): self.outputs.new('ArmBoolSocket', 'Is Hidden Locked') self.outputs.new('ArmBoolSocket', 'Is Hidden') self.outputs.new('ArmBoolSocket', 'Is Locked') diff --git a/blender/arm/logicnode/input/LN_get_mouse_movement.py b/blender/arm/logicnode/input/LN_get_mouse_movement.py index a3ac08d2..fbef5311 100644 --- a/blender/arm/logicnode/input/LN_get_mouse_movement.py +++ b/blender/arm/logicnode/input/LN_get_mouse_movement.py @@ -9,8 +9,7 @@ class GetMouseMovementNode(ArmLogicTreeNode): arm_section = 'mouse' arm_version = 1 - def init(self, context): - super(GetMouseMovementNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'X Multiplier', default_value=-1.0) self.add_input('ArmFloatSocket', 'Y Multiplier', default_value=-1.0) diff --git a/blender/arm/logicnode/input/LN_get_touch_location.py b/blender/arm/logicnode/input/LN_get_touch_location.py index 1acf6028..3aea57b6 100644 --- a/blender/arm/logicnode/input/LN_get_touch_location.py +++ b/blender/arm/logicnode/input/LN_get_touch_location.py @@ -7,8 +7,7 @@ class GetTouchLocationNode(ArmLogicTreeNode): arm_section = 'surface' arm_version = 1 - def init(self, context): - super(GetTouchLocationNode, self).init(context) + def arm_init(self, context): self.add_output('ArmIntSocket', 'X') self.add_output('ArmIntSocket', 'Y') self.add_output('ArmIntSocket', 'Inverted X') diff --git a/blender/arm/logicnode/input/LN_get_touch_movement.py b/blender/arm/logicnode/input/LN_get_touch_movement.py index 6c110679..8c37c844 100644 --- a/blender/arm/logicnode/input/LN_get_touch_movement.py +++ b/blender/arm/logicnode/input/LN_get_touch_movement.py @@ -7,8 +7,7 @@ class GetTouchMovementNode(ArmLogicTreeNode): arm_section = 'surface' arm_version = 1 - def init(self, context): - super(GetTouchMovementNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'X Multiplier', default_value=-1.0) self.add_input('ArmFloatSocket', 'Y Multiplier', default_value=-1.0) diff --git a/blender/arm/logicnode/input/LN_keyboard.py b/blender/arm/logicnode/input/LN_keyboard.py index b1613b02..7a78e651 100644 --- a/blender/arm/logicnode/input/LN_keyboard.py +++ b/blender/arm/logicnode/input/LN_keyboard.py @@ -70,8 +70,7 @@ class KeyboardNode(ArmLogicTreeNode): ('down', 'down', 'down'),], name='', default='space') - def init(self, context): - super(KeyboardNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmBoolSocket', 'State') diff --git a/blender/arm/logicnode/input/LN_mouse.py b/blender/arm/logicnode/input/LN_mouse.py index 69663544..03624cd7 100644 --- a/blender/arm/logicnode/input/LN_mouse.py +++ b/blender/arm/logicnode/input/LN_mouse.py @@ -21,8 +21,7 @@ class MouseNode(ArmLogicTreeNode): ('right', 'Right', 'Right mouse button')], name='', default='left') - def init(self, context): - super(MouseNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmBoolSocket', 'State') diff --git a/blender/arm/logicnode/input/LN_on_swipe.py b/blender/arm/logicnode/input/LN_on_swipe.py index 61c11913..8bd6226e 100644 --- a/blender/arm/logicnode/input/LN_on_swipe.py +++ b/blender/arm/logicnode/input/LN_on_swipe.py @@ -59,8 +59,7 @@ class OnSwipeNode(ArmLogicTreeNode): super(OnSwipeNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(OnSwipeNode, self).init(context) + def arm_init(self, context): self.inputs.new('ArmFloatSocket', 'Time') self.inputs[-1].default_value = 0.15 self.inputs.new('ArmIntSocket', 'Min Length (px)') diff --git a/blender/arm/logicnode/input/LN_on_tap_screen.py b/blender/arm/logicnode/input/LN_on_tap_screen.py index c0450ca0..61c4a0fa 100644 --- a/blender/arm/logicnode/input/LN_on_tap_screen.py +++ b/blender/arm/logicnode/input/LN_on_tap_screen.py @@ -18,8 +18,7 @@ class OnTapScreen(ArmLogicTreeNode): arm_section = 'Input' arm_version = 1 - def init(self, context): - super(OnTapScreen, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Duration') self.inputs[-1].default_value = 0.3 self.add_input('ArmFloatSocket', 'Interval') diff --git a/blender/arm/logicnode/input/LN_sensor_coords.py b/blender/arm/logicnode/input/LN_sensor_coords.py index 439f8eb1..a92f38f0 100644 --- a/blender/arm/logicnode/input/LN_sensor_coords.py +++ b/blender/arm/logicnode/input/LN_sensor_coords.py @@ -7,6 +7,5 @@ class SensorCoordsNode(ArmLogicTreeNode): arm_section = 'sensor' arm_version = 1 - def init(self, context): - super(SensorCoordsNode, self).init(context) + def arm_init(self, context): self.add_output('ArmVectorSocket', 'Coords') diff --git a/blender/arm/logicnode/input/LN_set_cursor_state.py b/blender/arm/logicnode/input/LN_set_cursor_state.py index c1f38fde..0c8c2d6e 100644 --- a/blender/arm/logicnode/input/LN_set_cursor_state.py +++ b/blender/arm/logicnode/input/LN_set_cursor_state.py @@ -22,8 +22,7 @@ class SetCursorStateNode(ArmLogicTreeNode): ], name='', default='hide locked') - def init(self, context): - super(SetCursorStateNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmBoolSocket', 'State') diff --git a/blender/arm/logicnode/input/LN_touch.py b/blender/arm/logicnode/input/LN_touch.py index ffbc32c6..f6ff0593 100644 --- a/blender/arm/logicnode/input/LN_touch.py +++ b/blender/arm/logicnode/input/LN_touch.py @@ -15,8 +15,7 @@ class SurfaceNode(ArmLogicTreeNode): ('moved', 'Moved', 'Moved')], name='', default='down') - def init(self, context): - super(SurfaceNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmBoolSocket', 'State') diff --git a/blender/arm/logicnode/input/LN_virtual_button.py b/blender/arm/logicnode/input/LN_virtual_button.py index 28a52189..3850a26e 100644 --- a/blender/arm/logicnode/input/LN_virtual_button.py +++ b/blender/arm/logicnode/input/LN_virtual_button.py @@ -15,8 +15,7 @@ class VirtualButtonNode(ArmLogicTreeNode): name='', default='down') property1: HaxeStringProperty('property1', name='', default='button') - def init(self, context): - super(VirtualButtonNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmBoolSocket', 'State') diff --git a/blender/arm/logicnode/light/LN_set_light_color.py b/blender/arm/logicnode/light/LN_set_light_color.py index 38b3d6ef..5af7cde7 100644 --- a/blender/arm/logicnode/light/LN_set_light_color.py +++ b/blender/arm/logicnode/light/LN_set_light_color.py @@ -6,8 +6,7 @@ class SetLightColorNode(ArmLogicTreeNode): bl_label = 'Set Light Color' arm_version = 1 - def init(self, context): - super(SetLightColorNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Light') self.add_input('ArmColorSocket', 'Color', default_value=[1.0, 1.0, 1.0, 1.0]) diff --git a/blender/arm/logicnode/light/LN_set_light_strength.py b/blender/arm/logicnode/light/LN_set_light_strength.py index cbf11700..bc9fd67e 100644 --- a/blender/arm/logicnode/light/LN_set_light_strength.py +++ b/blender/arm/logicnode/light/LN_set_light_strength.py @@ -6,8 +6,7 @@ class SetLightStrengthNode(ArmLogicTreeNode): bl_label = 'Set Light Strength' arm_version = 1 - def init(self, context): - super(SetLightStrengthNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Light') self.add_input('ArmFloatSocket', 'Strength', default_value=250) diff --git a/blender/arm/logicnode/logic/LN_alternate_output.py b/blender/arm/logicnode/logic/LN_alternate_output.py index 839c75bd..8f0a81e6 100644 --- a/blender/arm/logicnode/logic/LN_alternate_output.py +++ b/blender/arm/logicnode/logic/LN_alternate_output.py @@ -8,8 +8,7 @@ class AlternateNode(ArmLogicTreeNode): arm_section = 'flow' arm_version = 1 - def init(self, context): - super(AlternateNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', '0') diff --git a/blender/arm/logicnode/logic/LN_branch.py b/blender/arm/logicnode/logic/LN_branch.py index d7b5536d..5693f882 100644 --- a/blender/arm/logicnode/logic/LN_branch.py +++ b/blender/arm/logicnode/logic/LN_branch.py @@ -8,8 +8,7 @@ class BranchNode(ArmLogicTreeNode): bl_label = 'Branch' arm_version = 1 - def init(self, context): - super(BranchNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmBoolSocket', 'Bool') diff --git a/blender/arm/logicnode/logic/LN_call_function.py b/blender/arm/logicnode/logic/LN_call_function.py index 20808c71..819407ad 100644 --- a/blender/arm/logicnode/logic/LN_call_function.py +++ b/blender/arm/logicnode/logic/LN_call_function.py @@ -13,8 +13,7 @@ class CallFunctionNode(ArmLogicTreeNode): super(CallFunctionNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(CallFunctionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Trait/Any') self.add_input('ArmStringSocket', 'Function') diff --git a/blender/arm/logicnode/logic/LN_function.py b/blender/arm/logicnode/logic/LN_function.py index 5af1e5e7..2d3fe0dd 100644 --- a/blender/arm/logicnode/logic/LN_function.py +++ b/blender/arm/logicnode/logic/LN_function.py @@ -15,8 +15,7 @@ class FunctionNode(ArmLogicTreeNode): super(FunctionNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(FunctionNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') function_name: StringProperty(name="Name") diff --git a/blender/arm/logicnode/logic/LN_function_output.py b/blender/arm/logicnode/logic/LN_function_output.py index 87343512..073b364f 100644 --- a/blender/arm/logicnode/logic/LN_function_output.py +++ b/blender/arm/logicnode/logic/LN_function_output.py @@ -10,8 +10,7 @@ class FunctionOutputNode(ArmLogicTreeNode): arm_section = 'function' arm_version = 1 - def init(self, context): - super(FunctionOutputNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/logic/LN_gate.py b/blender/arm/logicnode/logic/LN_gate.py index 286c6580..e67b9f23 100644 --- a/blender/arm/logicnode/logic/LN_gate.py +++ b/blender/arm/logicnode/logic/LN_gate.py @@ -38,8 +38,7 @@ class GateNode(ArmLogicTreeNode): super(GateNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(GateNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Input 1') self.add_input('ArmDynamicSocket', 'Input 2') diff --git a/blender/arm/logicnode/logic/LN_invert_boolean.py b/blender/arm/logicnode/logic/LN_invert_boolean.py index 5c5475f1..c981c7cc 100644 --- a/blender/arm/logicnode/logic/LN_invert_boolean.py +++ b/blender/arm/logicnode/logic/LN_invert_boolean.py @@ -6,8 +6,7 @@ class NotNode(ArmLogicTreeNode): bl_label = 'Invert Boolean' arm_version = 1 - def init(self, context): - super(NotNode, self).init(context) + def arm_init(self, context): self.add_input('ArmBoolSocket', 'Bool In') self.add_output('ArmBoolSocket', 'Bool Out') diff --git a/blender/arm/logicnode/logic/LN_invert_output.py b/blender/arm/logicnode/logic/LN_invert_output.py index 04c7d596..7a30dbb8 100644 --- a/blender/arm/logicnode/logic/LN_invert_output.py +++ b/blender/arm/logicnode/logic/LN_invert_output.py @@ -8,8 +8,7 @@ class InverseNode(ArmLogicTreeNode): arm_section = 'flow' arm_version = 1 - def init(self, context): - super(InverseNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/logic/LN_is_false.py b/blender/arm/logicnode/logic/LN_is_false.py index a4ec30df..304c025d 100644 --- a/blender/arm/logicnode/logic/LN_is_false.py +++ b/blender/arm/logicnode/logic/LN_is_false.py @@ -10,8 +10,7 @@ class IsFalseNode(ArmLogicTreeNode): bl_label = 'Is False' arm_version = 1 - def init(self, context): - super(IsFalseNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmBoolSocket', 'Bool') diff --git a/blender/arm/logicnode/logic/LN_is_not_null.py b/blender/arm/logicnode/logic/LN_is_not_null.py index 200b4cdf..e18ee5a4 100644 --- a/blender/arm/logicnode/logic/LN_is_not_null.py +++ b/blender/arm/logicnode/logic/LN_is_not_null.py @@ -9,8 +9,7 @@ class IsNotNoneNode(ArmLogicTreeNode): bl_label = 'Is Not Null' arm_version = 1 - def init(self, context): - super(IsNotNoneNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/logic/LN_is_null.py b/blender/arm/logicnode/logic/LN_is_null.py index a08e2c32..da2e120c 100644 --- a/blender/arm/logicnode/logic/LN_is_null.py +++ b/blender/arm/logicnode/logic/LN_is_null.py @@ -10,8 +10,7 @@ class IsNoneNode(ArmLogicTreeNode): bl_label = 'Is Null' arm_version = 1 - def init(self, context): - super(IsNoneNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/logic/LN_is_true.py b/blender/arm/logicnode/logic/LN_is_true.py index 6e88f6b8..17f0b47b 100644 --- a/blender/arm/logicnode/logic/LN_is_true.py +++ b/blender/arm/logicnode/logic/LN_is_true.py @@ -9,8 +9,7 @@ class IsTrueNode(ArmLogicTreeNode): bl_label = 'Is True' arm_version = 1 - def init(self, context): - super(IsTrueNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmBoolSocket', 'Bool') diff --git a/blender/arm/logicnode/logic/LN_loop.py b/blender/arm/logicnode/logic/LN_loop.py index d6ef4b0e..212c514d 100644 --- a/blender/arm/logicnode/logic/LN_loop.py +++ b/blender/arm/logicnode/logic/LN_loop.py @@ -20,8 +20,7 @@ class LoopNode(ArmLogicTreeNode): arm_section = 'flow' arm_version = 1 - def init(self, context): - super(LoopNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmIntSocket', 'From') self.add_input('ArmIntSocket', 'To') diff --git a/blender/arm/logicnode/logic/LN_loop_break.py b/blender/arm/logicnode/logic/LN_loop_break.py index 3c0d8a2c..326d15b8 100644 --- a/blender/arm/logicnode/logic/LN_loop_break.py +++ b/blender/arm/logicnode/logic/LN_loop_break.py @@ -12,6 +12,5 @@ class LoopBreakNode(ArmLogicTreeNode): arm_section = 'flow' arm_version = 1 - def init(self, context): - super(LoopBreakNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') diff --git a/blender/arm/logicnode/logic/LN_merge.py b/blender/arm/logicnode/logic/LN_merge.py index 5c3b8a9f..c5e369de 100644 --- a/blender/arm/logicnode/logic/LN_merge.py +++ b/blender/arm/logicnode/logic/LN_merge.py @@ -14,8 +14,7 @@ class MergeNode(ArmLogicTreeNode): super(MergeNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(MergeNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/logic/LN_null.py b/blender/arm/logicnode/logic/LN_null.py index 7ed6a18f..ed0d9601 100644 --- a/blender/arm/logicnode/logic/LN_null.py +++ b/blender/arm/logicnode/logic/LN_null.py @@ -6,6 +6,5 @@ class NoneNode(ArmLogicTreeNode): bl_label = 'Null' arm_version = 1 - def init(self, context): - super(NoneNode, self).init(context) + def arm_init(self, context): self.add_output('ArmDynamicSocket', 'Null') diff --git a/blender/arm/logicnode/logic/LN_output_sequence.py b/blender/arm/logicnode/logic/LN_output_sequence.py index 3d973cdd..f6166a69 100644 --- a/blender/arm/logicnode/logic/LN_output_sequence.py +++ b/blender/arm/logicnode/logic/LN_output_sequence.py @@ -11,8 +11,7 @@ class SequenceNode(ArmLogicTreeNode): super(SequenceNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(SequenceNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/logic/LN_output_to_boolean.py b/blender/arm/logicnode/logic/LN_output_to_boolean.py index e8b040db..d03c79cf 100644 --- a/blender/arm/logicnode/logic/LN_output_to_boolean.py +++ b/blender/arm/logicnode/logic/LN_output_to_boolean.py @@ -7,8 +7,7 @@ class ToBoolNode(ArmLogicTreeNode): bl_label = 'Output to Boolean' arm_version = 1 - def init(self, context): - super(ToBoolNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmBoolSocket', 'Bool') diff --git a/blender/arm/logicnode/logic/LN_switch_output.py b/blender/arm/logicnode/logic/LN_switch_output.py index 26bd5246..688245e2 100644 --- a/blender/arm/logicnode/logic/LN_switch_output.py +++ b/blender/arm/logicnode/logic/LN_switch_output.py @@ -15,8 +15,7 @@ class SwitchNode(ArmLogicTreeNode): super(SwitchNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(SwitchNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/logic/LN_value_changed.py b/blender/arm/logicnode/logic/LN_value_changed.py index c805d3a1..82af3d5c 100644 --- a/blender/arm/logicnode/logic/LN_value_changed.py +++ b/blender/arm/logicnode/logic/LN_value_changed.py @@ -6,8 +6,7 @@ class ValueChangedNode(ArmLogicTreeNode): bl_label = 'Value Changed' arm_version = 1 - def init(self, context): - super(ValueChangedNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/logic/LN_while_true.py b/blender/arm/logicnode/logic/LN_while_true.py index f817c1fd..b2a7b670 100644 --- a/blender/arm/logicnode/logic/LN_while_true.py +++ b/blender/arm/logicnode/logic/LN_while_true.py @@ -15,8 +15,7 @@ class WhileNode(ArmLogicTreeNode): arm_section = 'flow' arm_version = 1 - def init(self, context): - super(WhileNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmBoolSocket', 'Condition') diff --git a/blender/arm/logicnode/material/LN_get_object_material.py b/blender/arm/logicnode/material/LN_get_object_material.py index ec560fcf..8e64630d 100644 --- a/blender/arm/logicnode/material/LN_get_object_material.py +++ b/blender/arm/logicnode/material/LN_get_object_material.py @@ -6,8 +6,7 @@ class GetMaterialNode(ArmLogicTreeNode): bl_label = 'Get Object Material' arm_version = 1 - def init(self, context): - super(GetMaterialNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmIntSocket', 'Slot') diff --git a/blender/arm/logicnode/material/LN_material.py b/blender/arm/logicnode/material/LN_material.py index 63cf9c46..082f2a80 100644 --- a/blender/arm/logicnode/material/LN_material.py +++ b/blender/arm/logicnode/material/LN_material.py @@ -20,8 +20,7 @@ class MaterialNode(ArmLogicTreeNode): property0: HaxePointerProperty('property0', name='', type=bpy.types.Material) - def init(self, context): - super(MaterialNode, self).init(context) + def arm_init(self, context): self.add_output('ArmDynamicSocket', 'Material', is_var=True) def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/material/LN_set_material_image_param.py b/blender/arm/logicnode/material/LN_set_material_image_param.py index e6188f76..38ae1bf3 100644 --- a/blender/arm/logicnode/material/LN_set_material_image_param.py +++ b/blender/arm/logicnode/material/LN_set_material_image_param.py @@ -7,8 +7,7 @@ class SetMaterialImageParamNode(ArmLogicTreeNode): arm_section = 'params' arm_version = 1 - def init(self, context): - super(SetMaterialImageParamNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Material') self.add_input('ArmStringSocket', 'Node') diff --git a/blender/arm/logicnode/material/LN_set_material_rgb_param.py b/blender/arm/logicnode/material/LN_set_material_rgb_param.py index 1b826834..b8a4b5f6 100644 --- a/blender/arm/logicnode/material/LN_set_material_rgb_param.py +++ b/blender/arm/logicnode/material/LN_set_material_rgb_param.py @@ -7,8 +7,7 @@ class SetMaterialRgbParamNode(ArmLogicTreeNode): arm_section = 'params' arm_version = 1 - def init(self, context): - super(SetMaterialRgbParamNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Material') self.add_input('ArmStringSocket', 'Node') diff --git a/blender/arm/logicnode/material/LN_set_material_value_param.py b/blender/arm/logicnode/material/LN_set_material_value_param.py index afae0aa7..cabc7b19 100644 --- a/blender/arm/logicnode/material/LN_set_material_value_param.py +++ b/blender/arm/logicnode/material/LN_set_material_value_param.py @@ -7,8 +7,7 @@ class SetMaterialValueParamNode(ArmLogicTreeNode): arm_section = 'params' arm_version = 1 - def init(self, context): - super(SetMaterialValueParamNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Material') self.add_input('ArmStringSocket', 'Node') diff --git a/blender/arm/logicnode/material/LN_set_object_material_slot.py b/blender/arm/logicnode/material/LN_set_object_material_slot.py index acfa6a68..ccfab366 100644 --- a/blender/arm/logicnode/material/LN_set_object_material_slot.py +++ b/blender/arm/logicnode/material/LN_set_object_material_slot.py @@ -6,8 +6,7 @@ class SetMaterialSlotNode(ArmLogicTreeNode): bl_label = 'Set Object Material Slot' arm_version = 1 - def init(self, context): - super(SetMaterialSlotNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmDynamicSocket', 'Material') diff --git a/blender/arm/logicnode/math/LN_clamp.py b/blender/arm/logicnode/math/LN_clamp.py index 8337dd97..257c3802 100644 --- a/blender/arm/logicnode/math/LN_clamp.py +++ b/blender/arm/logicnode/math/LN_clamp.py @@ -9,8 +9,7 @@ class ClampNode(ArmLogicTreeNode): bl_label = 'Clamp' arm_version = 1 - def init(self, context): - super(ClampNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Value') self.add_input('ArmFloatSocket', 'Min') self.add_input('ArmFloatSocket', 'Max') diff --git a/blender/arm/logicnode/math/LN_compare.py b/blender/arm/logicnode/math/LN_compare.py index 027ee9ed..c3b86472 100644 --- a/blender/arm/logicnode/math/LN_compare.py +++ b/blender/arm/logicnode/math/LN_compare.py @@ -29,8 +29,7 @@ class CompareNode(ArmLogicTreeNode): super(CompareNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(CompareNode, self).init(context) + def arm_init(self, context): self.add_input('ArmDynamicSocket', 'Value') self.add_input('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/math/LN_deg_to_rad.py b/blender/arm/logicnode/math/LN_deg_to_rad.py index 034e73e9..6ee81e61 100644 --- a/blender/arm/logicnode/math/LN_deg_to_rad.py +++ b/blender/arm/logicnode/math/LN_deg_to_rad.py @@ -7,8 +7,7 @@ class DegToRadNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'angle' - def init(self, context): - super(DegToRadNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Degrees') self.add_output('ArmFloatSocket', 'Radians') diff --git a/blender/arm/logicnode/math/LN_map_range.py b/blender/arm/logicnode/math/LN_map_range.py index 29de5d67..0008ce88 100644 --- a/blender/arm/logicnode/math/LN_map_range.py +++ b/blender/arm/logicnode/math/LN_map_range.py @@ -9,8 +9,7 @@ class MapRangeNode(ArmLogicTreeNode): bl_label = 'Map Range' arm_version = 1 - def init(self, context): - super(MapRangeNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Value', default_value=1.0) self.add_input('ArmFloatSocket', 'From Min') self.add_input('ArmFloatSocket', 'From Max', default_value=1.0) diff --git a/blender/arm/logicnode/math/LN_math.py b/blender/arm/logicnode/math/LN_math.py index ddae6d7f..2271c2dc 100644 --- a/blender/arm/logicnode/math/LN_math.py +++ b/blender/arm/logicnode/math/LN_math.py @@ -98,8 +98,7 @@ class MathNode(ArmLogicTreeNode): def __init__(self): array_nodes[str(id(self))] = self - def init(self, context): - super(MathNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Value 0', default_value=0.0) self.add_input('ArmFloatSocket', 'Value 1', default_value=0.0) diff --git a/blender/arm/logicnode/math/LN_math_expression.py b/blender/arm/logicnode/math/LN_math_expression.py index 4018b3e1..0795d6a8 100644 --- a/blender/arm/logicnode/math/LN_math_expression.py +++ b/blender/arm/logicnode/math/LN_math_expression.py @@ -161,8 +161,7 @@ class MathExpressionNode(ArmLogicTreeNode): def __init__(self): array_nodes[str(id(self))] = self - def init(self, context): - super(MathExpressionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', self.get_variable_name(0), default_value=0.0) self.add_input('ArmFloatSocket', self.get_variable_name(1), default_value=0.0) self.add_output('ArmFloatSocket', 'Result') diff --git a/blender/arm/logicnode/math/LN_matrix_math.py b/blender/arm/logicnode/math/LN_matrix_math.py index 903a4e87..6a4d200e 100644 --- a/blender/arm/logicnode/math/LN_matrix_math.py +++ b/blender/arm/logicnode/math/LN_matrix_math.py @@ -12,8 +12,7 @@ class MatrixMathNode(ArmLogicTreeNode): items = [('Multiply', 'Multiply', 'Multiply')], name='', default='Multiply') - def init(self, context): - super(MatrixMathNode, self).init(context) + def arm_init(self, context): self.add_input('ArmDynamicSocket', 'Matrix 1') self.add_input('ArmDynamicSocket', 'Matrix 2') diff --git a/blender/arm/logicnode/math/LN_mix.py b/blender/arm/logicnode/math/LN_mix.py index 0d4a98e3..7ae648a4 100644 --- a/blender/arm/logicnode/math/LN_mix.py +++ b/blender/arm/logicnode/math/LN_mix.py @@ -30,8 +30,7 @@ class MixNode(ArmLogicTreeNode): property2: HaxeBoolProperty('property2', name='Clamp', default=False) - def init(self, context): - super(MixNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Factor', default_value=0.0) self.add_input('ArmFloatSocket', 'Value 1', default_value=0.0) self.add_input('ArmFloatSocket', 'Value 2', default_value=1.0) diff --git a/blender/arm/logicnode/math/LN_mix_vector.py b/blender/arm/logicnode/math/LN_mix_vector.py index 9084d75c..4349de86 100644 --- a/blender/arm/logicnode/math/LN_mix_vector.py +++ b/blender/arm/logicnode/math/LN_mix_vector.py @@ -32,8 +32,7 @@ class VectorMixNode(ArmLogicTreeNode): property2: HaxeBoolProperty('property2', name='Clamp', default=False) - def init(self, context): - super(VectorMixNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Factor', default_value=0.0) self.add_input('ArmVectorSocket', 'Vector 1', default_value=[0.0, 0.0, 0.0]) self.add_input('ArmVectorSocket', 'Vector 2', default_value=[1.0, 1.0, 1.0]) diff --git a/blender/arm/logicnode/math/LN_quaternion_math.py b/blender/arm/logicnode/math/LN_quaternion_math.py index 8dfdc590..dfdece72 100644 --- a/blender/arm/logicnode/math/LN_quaternion_math.py +++ b/blender/arm/logicnode/math/LN_quaternion_math.py @@ -155,8 +155,7 @@ class QuaternionMathNode(ArmLogicTreeNode): def __init__(self): array_nodes[str(id(self))] = self - def init(self, context): - super(QuaternionMathNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'Quaternion 0', default_value=[0.0, 0.0, 0.0]) self.add_input('ArmVectorSocket', 'Quaternion 1', default_value=[0.0, 0.0, 0.0]) self.add_output('ArmVectorSocket', 'Result') diff --git a/blender/arm/logicnode/math/LN_rad_to_deg.py b/blender/arm/logicnode/math/LN_rad_to_deg.py index 2335acb2..c144ae98 100644 --- a/blender/arm/logicnode/math/LN_rad_to_deg.py +++ b/blender/arm/logicnode/math/LN_rad_to_deg.py @@ -7,8 +7,7 @@ class RadToDegNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'angle' - def init(self, context): - super(RadToDegNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Radians') self.add_output('ArmFloatSocket', 'Degrees') diff --git a/blender/arm/logicnode/math/LN_screen_to_world_space.py b/blender/arm/logicnode/math/LN_screen_to_world_space.py index 0a6c2375..ef1864cb 100644 --- a/blender/arm/logicnode/math/LN_screen_to_world_space.py +++ b/blender/arm/logicnode/math/LN_screen_to_world_space.py @@ -12,8 +12,7 @@ class ScreenToWorldSpaceNode(ArmLogicTreeNode): property0: HaxeBoolProperty('property0', name='Separator Out', default=False) - def init(self, context): - super(ScreenToWorldSpaceNode, self).init(context) + def arm_init(self, context): self.add_input('ArmIntSocket', 'Screen X') self.add_input('ArmIntSocket', 'Screen Y') diff --git a/blender/arm/logicnode/math/LN_separate_quaternion.py b/blender/arm/logicnode/math/LN_separate_quaternion.py index 10d81ded..d8b6f0cf 100644 --- a/blender/arm/logicnode/math/LN_separate_quaternion.py +++ b/blender/arm/logicnode/math/LN_separate_quaternion.py @@ -7,8 +7,7 @@ class SeparateQuaternionNode(ArmLogicTreeNode): arm_section = 'quaternions' arm_version = 1 - def init(self, context): - super(SeparateQuaternionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'Quaternion') self.add_output('ArmFloatSocket', 'X') diff --git a/blender/arm/logicnode/math/LN_separate_rgb.py b/blender/arm/logicnode/math/LN_separate_rgb.py index e76766f1..e2098989 100644 --- a/blender/arm/logicnode/math/LN_separate_rgb.py +++ b/blender/arm/logicnode/math/LN_separate_rgb.py @@ -7,8 +7,7 @@ class SeparateColorNode(ArmLogicTreeNode): arm_section = 'color' arm_version = 1 - def init(self, context): - super(SeparateColorNode, self).init(context) + def arm_init(self, context): self.add_input('ArmColorSocket', 'Color', default_value=[1.0, 1.0, 1.0, 1.0]) self.add_output('ArmFloatSocket', 'R') diff --git a/blender/arm/logicnode/math/LN_separate_xyz.py b/blender/arm/logicnode/math/LN_separate_xyz.py index c2e33ecd..4f7ac735 100644 --- a/blender/arm/logicnode/math/LN_separate_xyz.py +++ b/blender/arm/logicnode/math/LN_separate_xyz.py @@ -7,8 +7,7 @@ class SeparateVectorNode(ArmLogicTreeNode): arm_section = 'vector' arm_version = 1 - def init(self, context): - super(SeparateVectorNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'Vector') self.add_output('ArmFloatSocket', 'X') diff --git a/blender/arm/logicnode/math/LN_vector_clamp.py b/blender/arm/logicnode/math/LN_vector_clamp.py index 744880ef..a61e677d 100644 --- a/blender/arm/logicnode/math/LN_vector_clamp.py +++ b/blender/arm/logicnode/math/LN_vector_clamp.py @@ -7,8 +7,7 @@ class VectorClampToSizeNode(ArmLogicTreeNode): arm_section = 'vector' arm_version = 1 - def init(self, context): - super(VectorClampToSizeNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'Vector In', default_value=[0.0, 0.0, 0.0]) self.add_input('ArmFloatSocket', 'Min') self.add_input('ArmFloatSocket', 'Max') diff --git a/blender/arm/logicnode/math/LN_vector_math.py b/blender/arm/logicnode/math/LN_vector_math.py index 7654d151..4e9e82a5 100644 --- a/blender/arm/logicnode/math/LN_vector_math.py +++ b/blender/arm/logicnode/math/LN_vector_math.py @@ -123,8 +123,7 @@ class VectorMathNode(ArmLogicTreeNode): def __init__(self): array_nodes[str(id(self))] = self - def init(self, context): - super(VectorMathNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'Value 0', default_value=[0.0, 0.0, 0.0]) self.add_input('ArmVectorSocket', 'Value 1', default_value=[0.0, 0.0, 0.0]) diff --git a/blender/arm/logicnode/math/LN_world_to_screen_space.py b/blender/arm/logicnode/math/LN_world_to_screen_space.py index 6b8f519c..b3f16b6a 100644 --- a/blender/arm/logicnode/math/LN_world_to_screen_space.py +++ b/blender/arm/logicnode/math/LN_world_to_screen_space.py @@ -7,8 +7,7 @@ class WorldToScreenSpaceNode(ArmLogicTreeNode): arm_section = 'matrix' arm_version = 1 - def init(self, context): - super(WorldToScreenSpaceNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'World') self.add_output('ArmVectorSocket', 'Screen') diff --git a/blender/arm/logicnode/miscellaneous/LN_boolean_to_vector.py b/blender/arm/logicnode/miscellaneous/LN_boolean_to_vector.py index d2999718..5bcb5002 100644 --- a/blender/arm/logicnode/miscellaneous/LN_boolean_to_vector.py +++ b/blender/arm/logicnode/miscellaneous/LN_boolean_to_vector.py @@ -6,8 +6,7 @@ class VectorFromBooleanNode(ArmLogicTreeNode): bl_label = 'Boolean to Vector' arm_version = 1 - def init(self, context): - super(VectorFromBooleanNode, self).init(context) + def arm_init(self, context): self.inputs.new('ArmBoolSocket', 'X') self.inputs.new('ArmBoolSocket', '-X') self.inputs.new('ArmBoolSocket', 'Y') diff --git a/blender/arm/logicnode/miscellaneous/LN_call_group.py b/blender/arm/logicnode/miscellaneous/LN_call_group.py index cb5849bb..87e13ec1 100644 --- a/blender/arm/logicnode/miscellaneous/LN_call_group.py +++ b/blender/arm/logicnode/miscellaneous/LN_call_group.py @@ -17,8 +17,7 @@ class CallGroupNode(ArmLogicTreeNode): property0_: HaxePointerProperty('property0', name='Group', type=bpy.types.NodeTree) - def init(self, context): - super(CallGroupNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/miscellaneous/LN_default_if_null.py b/blender/arm/logicnode/miscellaneous/LN_default_if_null.py index d2bcf730..e1e5f2db 100644 --- a/blender/arm/logicnode/miscellaneous/LN_default_if_null.py +++ b/blender/arm/logicnode/miscellaneous/LN_default_if_null.py @@ -10,8 +10,7 @@ class DefaultIfNullNode(ArmLogicTreeNode): bl_label = 'Default if Null' arm_version = 1 - def init(self, context): - super(DefaultIfNullNode, self).init(context) + def arm_init(self, context): self.inputs.new('ArmDynamicSocket', 'Value In') self.inputs.new('ArmDynamicSocket', 'Default') diff --git a/blender/arm/logicnode/miscellaneous/LN_get_application_time.py b/blender/arm/logicnode/miscellaneous/LN_get_application_time.py index 2e4301d6..ae2ba85a 100644 --- a/blender/arm/logicnode/miscellaneous/LN_get_application_time.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_application_time.py @@ -6,7 +6,6 @@ class TimeNode(ArmLogicTreeNode): bl_label = 'Get Application Time' arm_version = 1 - def init(self, context): - super(TimeNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'Time') self.add_output('ArmFloatSocket', 'Delta') diff --git a/blender/arm/logicnode/miscellaneous/LN_get_debug_console_settings.py b/blender/arm/logicnode/miscellaneous/LN_get_debug_console_settings.py index 5bd6653e..e6e04394 100644 --- a/blender/arm/logicnode/miscellaneous/LN_get_debug_console_settings.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_debug_console_settings.py @@ -6,8 +6,7 @@ class GetDebugConsoleSettings(ArmLogicTreeNode): bl_label = 'Get Debug Console Settings' arm_version = 1 - def init(self, context): - super(GetDebugConsoleSettings, self).init(context) + def arm_init(self, context): self.add_output('ArmBoolSocket', 'Visible') self.add_output('ArmFloatSocket', 'Scale') self.add_output('ArmStringSocket', 'Position') diff --git a/blender/arm/logicnode/miscellaneous/LN_get_display_resolution.py b/blender/arm/logicnode/miscellaneous/LN_get_display_resolution.py index 42399587..411e298c 100644 --- a/blender/arm/logicnode/miscellaneous/LN_get_display_resolution.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_display_resolution.py @@ -10,7 +10,6 @@ class DisplayInfoNode(ArmLogicTreeNode): arm_section = 'screen' arm_version = 1 - def init(self, context): - super(DisplayInfoNode, self).init(context) + def arm_init(self, context): self.add_output('ArmIntSocket', 'Width') self.add_output('ArmIntSocket', 'Height') diff --git a/blender/arm/logicnode/miscellaneous/LN_get_fps.py b/blender/arm/logicnode/miscellaneous/LN_get_fps.py index cd693644..4bc298d9 100644 --- a/blender/arm/logicnode/miscellaneous/LN_get_fps.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_fps.py @@ -6,6 +6,5 @@ class GetFPSNode(ArmLogicTreeNode): bl_label = 'Get Frames Per Second' arm_version = 1 - def init(self, context): - super(GetFPSNode, self).init(context) + def arm_init(self, context): self.add_output('ArmIntSocket', 'Count') diff --git a/blender/arm/logicnode/miscellaneous/LN_get_window_resolution.py b/blender/arm/logicnode/miscellaneous/LN_get_window_resolution.py index 1870da26..d2fe52b6 100644 --- a/blender/arm/logicnode/miscellaneous/LN_get_window_resolution.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_window_resolution.py @@ -10,7 +10,6 @@ class WindowInfoNode(ArmLogicTreeNode): arm_section = 'screen' arm_version = 1 - def init(self, context): - super(WindowInfoNode, self).init(context) + def arm_init(self, context): self.add_output('ArmIntSocket', 'Width') self.add_output('ArmIntSocket', 'Height') diff --git a/blender/arm/logicnode/miscellaneous/LN_group_nodes.py b/blender/arm/logicnode/miscellaneous/LN_group_nodes.py index c8d8cdc9..8b08343b 100644 --- a/blender/arm/logicnode/miscellaneous/LN_group_nodes.py +++ b/blender/arm/logicnode/miscellaneous/LN_group_nodes.py @@ -7,6 +7,5 @@ class GroupOutputNode(ArmLogicTreeNode): arm_section = 'group' arm_version = 1 - def init(self, context): - super(GroupOutputNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') diff --git a/blender/arm/logicnode/miscellaneous/LN_set_debug_console_settings.py b/blender/arm/logicnode/miscellaneous/LN_set_debug_console_settings.py index 56d64c89..4bbd4d12 100644 --- a/blender/arm/logicnode/miscellaneous/LN_set_debug_console_settings.py +++ b/blender/arm/logicnode/miscellaneous/LN_set_debug_console_settings.py @@ -13,8 +13,7 @@ class SetDebugConsoleSettings(ArmLogicTreeNode): ('right', 'Anchor Right', 'Anchor the debug console in the top right')], name='', default='right') - def init(self, context): - super(SetDebugConsoleSettings, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmBoolSocket', 'Visible') self.add_input('ArmFloatSocket', 'Scale') diff --git a/blender/arm/logicnode/miscellaneous/LN_set_time_scale.py b/blender/arm/logicnode/miscellaneous/LN_set_time_scale.py index 3cad6073..77bc3f59 100644 --- a/blender/arm/logicnode/miscellaneous/LN_set_time_scale.py +++ b/blender/arm/logicnode/miscellaneous/LN_set_time_scale.py @@ -6,8 +6,7 @@ class SetTimeScaleNode(ArmLogicTreeNode): bl_label = 'Set Time Scale' arm_version = 1 - def init(self, context): - super(SetTimeScaleNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmFloatSocket', 'Scale', default_value=1.0) diff --git a/blender/arm/logicnode/miscellaneous/LN_sleep.py b/blender/arm/logicnode/miscellaneous/LN_sleep.py index 778bd260..884720e7 100644 --- a/blender/arm/logicnode/miscellaneous/LN_sleep.py +++ b/blender/arm/logicnode/miscellaneous/LN_sleep.py @@ -7,8 +7,7 @@ class SleepNode(ArmLogicTreeNode): bl_label = 'Sleep' arm_version = 1 - def init(self, context): - super(SleepNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmFloatSocket', 'Time') diff --git a/blender/arm/logicnode/miscellaneous/LN_timer.py b/blender/arm/logicnode/miscellaneous/LN_timer.py index 0d9e8ce2..e19a36b8 100644 --- a/blender/arm/logicnode/miscellaneous/LN_timer.py +++ b/blender/arm/logicnode/miscellaneous/LN_timer.py @@ -6,8 +6,7 @@ class TimerNode(ArmLogicTreeNode): bl_label = 'Timer' arm_version = 1 - def init(self, context): - super(TimerNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'Start') self.add_input('ArmNodeSocketAction', 'Pause') self.add_input('ArmNodeSocketAction', 'Stop') diff --git a/blender/arm/logicnode/native/LN_call_haxe_static.py b/blender/arm/logicnode/native/LN_call_haxe_static.py index 3b266d22..fd7e2c91 100644 --- a/blender/arm/logicnode/native/LN_call_haxe_static.py +++ b/blender/arm/logicnode/native/LN_call_haxe_static.py @@ -10,8 +10,7 @@ class CallHaxeStaticNode(ArmLogicTreeNode): arm_section = 'haxe' arm_version = 1 - def init(self, context): - super(CallHaxeStaticNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Function') diff --git a/blender/arm/logicnode/native/LN_detect_mobile_browser.py b/blender/arm/logicnode/native/LN_detect_mobile_browser.py index e2e7afed..4268ab0d 100644 --- a/blender/arm/logicnode/native/LN_detect_mobile_browser.py +++ b/blender/arm/logicnode/native/LN_detect_mobile_browser.py @@ -6,6 +6,5 @@ class DetectMobileBrowserNode(ArmLogicTreeNode): bl_label = 'Detect Mobile Browser' arm_version = 1 - def init(self, context): - super(DetectMobileBrowserNode, self).init(context) + def arm_init(self, context): self.add_output('ArmBoolSocket', 'Mobile') diff --git a/blender/arm/logicnode/native/LN_expression.py b/blender/arm/logicnode/native/LN_expression.py index 092612ed..843869fd 100644 --- a/blender/arm/logicnode/native/LN_expression.py +++ b/blender/arm/logicnode/native/LN_expression.py @@ -11,8 +11,7 @@ class ExpressionNode(ArmLogicTreeNode): property0: HaxeStringProperty('property0', name='', default='') - def init(self, context): - super(ExpressionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/native/LN_get_haxe_property.py b/blender/arm/logicnode/native/LN_get_haxe_property.py index 71d1db4e..2748a873 100644 --- a/blender/arm/logicnode/native/LN_get_haxe_property.py +++ b/blender/arm/logicnode/native/LN_get_haxe_property.py @@ -9,8 +9,7 @@ class GetHaxePropertyNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'haxe' - def init(self, context): - super(GetHaxePropertyNode, self).init(context) + def arm_init(self, context): self.add_input('ArmDynamicSocket', 'Dynamic') self.add_input('ArmStringSocket', 'Property') diff --git a/blender/arm/logicnode/native/LN_get_system_language.py b/blender/arm/logicnode/native/LN_get_system_language.py index 4c0af5e2..4dcb6cc5 100644 --- a/blender/arm/logicnode/native/LN_get_system_language.py +++ b/blender/arm/logicnode/native/LN_get_system_language.py @@ -7,6 +7,5 @@ class GetSystemLanguage(ArmLogicTreeNode): arm_section = 'Native' arm_version = 1 - def init(self, context): - super(GetSystemLanguage, self).init(context) + def arm_init(self, context): self.add_output('ArmStringSocket', 'Language') diff --git a/blender/arm/logicnode/native/LN_get_system_name.py b/blender/arm/logicnode/native/LN_get_system_name.py index 95f71053..6e08ac3e 100644 --- a/blender/arm/logicnode/native/LN_get_system_name.py +++ b/blender/arm/logicnode/native/LN_get_system_name.py @@ -8,8 +8,7 @@ class GetSystemName(ArmLogicTreeNode): arm_section = 'Native' arm_version = 1 - def init(self, context): - super(GetSystemName, self).init(context) + def arm_init(self, context): self.add_output('ArmStringSocket', 'System Name') self.add_output('ArmBoolSocket', 'Windows') self.add_output('ArmBoolSocket', 'Linux') diff --git a/blender/arm/logicnode/native/LN_loadUrl.py b/blender/arm/logicnode/native/LN_loadUrl.py index ee885e80..fbbed12b 100644 --- a/blender/arm/logicnode/native/LN_loadUrl.py +++ b/blender/arm/logicnode/native/LN_loadUrl.py @@ -6,7 +6,6 @@ class LoadUrlNode(ArmLogicTreeNode): bl_label = 'Load URL' arm_version = 1 - def init(self, context): - super(LoadUrlNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'URL') diff --git a/blender/arm/logicnode/native/LN_print.py b/blender/arm/logicnode/native/LN_print.py index 8c3310a2..8ba303d7 100644 --- a/blender/arm/logicnode/native/LN_print.py +++ b/blender/arm/logicnode/native/LN_print.py @@ -6,8 +6,7 @@ class PrintNode(ArmLogicTreeNode): bl_label = 'Print' arm_version = 1 - def init(self, context): - super(PrintNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'String') diff --git a/blender/arm/logicnode/native/LN_read_file.py b/blender/arm/logicnode/native/LN_read_file.py index a42c269d..dae4805b 100644 --- a/blender/arm/logicnode/native/LN_read_file.py +++ b/blender/arm/logicnode/native/LN_read_file.py @@ -9,8 +9,7 @@ class ReadFileNode(ArmLogicTreeNode): arm_section = 'file' arm_version = 1 - def init(self, context): - super(ReadFileNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'File') self.add_input('ArmBoolSocket', 'Use cache', default_value=1) diff --git a/blender/arm/logicnode/native/LN_read_json.py b/blender/arm/logicnode/native/LN_read_json.py index 7bb6b04e..a48081fd 100644 --- a/blender/arm/logicnode/native/LN_read_json.py +++ b/blender/arm/logicnode/native/LN_read_json.py @@ -9,8 +9,7 @@ class ReadJsonNode(ArmLogicTreeNode): arm_section = 'file' arm_version = 1 - def init(self, context): - super(ReadJsonNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'File') self.add_input('ArmBoolSocket', 'Use cache', default_value=1) diff --git a/blender/arm/logicnode/native/LN_read_storage.py b/blender/arm/logicnode/native/LN_read_storage.py index 144c5bef..d8bd8bd8 100644 --- a/blender/arm/logicnode/native/LN_read_storage.py +++ b/blender/arm/logicnode/native/LN_read_storage.py @@ -9,8 +9,7 @@ class ReadStorageNode(ArmLogicTreeNode): arm_section = 'file' arm_version = 1 - def init(self, context): - super(ReadStorageNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'Key') self.add_input('ArmStringSocket', 'Default') diff --git a/blender/arm/logicnode/native/LN_script.py b/blender/arm/logicnode/native/LN_script.py index 4d04ddc9..da0fb05d 100644 --- a/blender/arm/logicnode/native/LN_script.py +++ b/blender/arm/logicnode/native/LN_script.py @@ -17,8 +17,7 @@ class ScriptNode(ArmLogicTreeNode): property0_: HaxeStringProperty('property0', name='Text', default='') - def init(self, context): - super(ScriptNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') diff --git a/blender/arm/logicnode/native/LN_set_haxe_property.py b/blender/arm/logicnode/native/LN_set_haxe_property.py index 664fbc0a..bba925b3 100644 --- a/blender/arm/logicnode/native/LN_set_haxe_property.py +++ b/blender/arm/logicnode/native/LN_set_haxe_property.py @@ -9,8 +9,7 @@ class SetHaxePropertyNode(ArmLogicTreeNode): arm_section = 'haxe' arm_version = 1 - def init(self, context): - super(SetHaxePropertyNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Dynamic') self.add_input('ArmStringSocket', 'Property') diff --git a/blender/arm/logicnode/native/LN_set_vibrate.py b/blender/arm/logicnode/native/LN_set_vibrate.py index bc340e96..17ba464c 100644 --- a/blender/arm/logicnode/native/LN_set_vibrate.py +++ b/blender/arm/logicnode/native/LN_set_vibrate.py @@ -8,8 +8,7 @@ class SetVibrateNode(ArmLogicTreeNode): arm_section = 'Native' arm_version = 1 - def init(self, context): - super(SetVibrateNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmIntSocket', 'Milliseconds') self.inputs[-1].default_value = 100 diff --git a/blender/arm/logicnode/native/LN_shutdown.py b/blender/arm/logicnode/native/LN_shutdown.py index 48b8587f..6292eafa 100644 --- a/blender/arm/logicnode/native/LN_shutdown.py +++ b/blender/arm/logicnode/native/LN_shutdown.py @@ -6,8 +6,7 @@ class ShutdownNode(ArmLogicTreeNode): bl_label = 'Shutdown' arm_version = 1 - def init(self, context): - super(ShutdownNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/native/LN_write_file.py b/blender/arm/logicnode/native/LN_write_file.py index 683cec21..2f5c4996 100644 --- a/blender/arm/logicnode/native/LN_write_file.py +++ b/blender/arm/logicnode/native/LN_write_file.py @@ -9,8 +9,7 @@ class WriteFileNode(ArmLogicTreeNode): arm_section = 'file' arm_version = 1 - def init(self, context): - super(WriteFileNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'File') self.add_input('ArmStringSocket', 'String') diff --git a/blender/arm/logicnode/native/LN_write_json.py b/blender/arm/logicnode/native/LN_write_json.py index 1694e353..3feff3fa 100644 --- a/blender/arm/logicnode/native/LN_write_json.py +++ b/blender/arm/logicnode/native/LN_write_json.py @@ -9,8 +9,7 @@ class WriteJsonNode(ArmLogicTreeNode): arm_section = 'file' arm_version = 1 - def init(self, context): - super(WriteJsonNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'File') self.add_input('ArmDynamicSocket', 'Dynamic') diff --git a/blender/arm/logicnode/native/LN_write_storage.py b/blender/arm/logicnode/native/LN_write_storage.py index bc9a58b0..727cbca9 100644 --- a/blender/arm/logicnode/native/LN_write_storage.py +++ b/blender/arm/logicnode/native/LN_write_storage.py @@ -9,8 +9,7 @@ class WriteStorageNode(ArmLogicTreeNode): arm_section = 'file' arm_version = 1 - def init(self, context): - super(WriteStorageNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Key') self.add_input('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/navmesh/LN_go_to_location.py b/blender/arm/logicnode/navmesh/LN_go_to_location.py index be97f2eb..7285c2cf 100644 --- a/blender/arm/logicnode/navmesh/LN_go_to_location.py +++ b/blender/arm/logicnode/navmesh/LN_go_to_location.py @@ -6,8 +6,7 @@ class GoToLocationNode(ArmLogicTreeNode): bl_label = 'Go to Location' arm_version = 1 - def init(self, context): - super(GoToLocationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmDynamicSocket', 'Location') diff --git a/blender/arm/logicnode/navmesh/LN_navigable_location.py b/blender/arm/logicnode/navmesh/LN_navigable_location.py index f6850bbc..3e8b8f8b 100644 --- a/blender/arm/logicnode/navmesh/LN_navigable_location.py +++ b/blender/arm/logicnode/navmesh/LN_navigable_location.py @@ -6,6 +6,5 @@ class NavigableLocationNode(ArmLogicTreeNode): bl_label = 'Navigable Location' arm_version = 1 - def init(self, context): - super(NavigableLocationNode, self).init(context) + def arm_init(self, context): self.add_output('ArmDynamicSocket', 'Location') diff --git a/blender/arm/logicnode/navmesh/LN_pick_navmesh_location.py b/blender/arm/logicnode/navmesh/LN_pick_navmesh_location.py index 063174c7..2ae40119 100644 --- a/blender/arm/logicnode/navmesh/LN_pick_navmesh_location.py +++ b/blender/arm/logicnode/navmesh/LN_pick_navmesh_location.py @@ -6,8 +6,7 @@ class PickLocationNode(ArmLogicTreeNode): bl_label = 'Pick NavMesh Location' arm_version = 1 - def init(self, context): - super(PickLocationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'NavMesh') self.add_input('ArmVectorSocket', 'Screen Coords') diff --git a/blender/arm/logicnode/navmesh/LN_stop_agent.py b/blender/arm/logicnode/navmesh/LN_stop_agent.py index d7740fcf..ff49fc9f 100644 --- a/blender/arm/logicnode/navmesh/LN_stop_agent.py +++ b/blender/arm/logicnode/navmesh/LN_stop_agent.py @@ -6,8 +6,7 @@ class StopAgentNode(ArmLogicTreeNode): bl_label = 'Stop Agent' arm_version = 1 - def init(self, context): - super(StopAgentNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') diff --git a/blender/arm/logicnode/object/LN_get_distance.py b/blender/arm/logicnode/object/LN_get_distance.py index 13b6a5be..5885e890 100644 --- a/blender/arm/logicnode/object/LN_get_distance.py +++ b/blender/arm/logicnode/object/LN_get_distance.py @@ -9,8 +9,7 @@ class GetDistanceNode(ArmLogicTreeNode): bl_label = 'Get Distance' arm_version = 1 - def init(self, context): - super(GetDistanceNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketObject', 'Object') diff --git a/blender/arm/logicnode/object/LN_get_object_by_name.py b/blender/arm/logicnode/object/LN_get_object_by_name.py index 92c7220d..a19bdf06 100644 --- a/blender/arm/logicnode/object/LN_get_object_by_name.py +++ b/blender/arm/logicnode/object/LN_get_object_by_name.py @@ -5,13 +5,12 @@ from arm.logicnode.arm_nodes import * class GetObjectNode(ArmLogicTreeNode): """Searches for a object that uses the given name in the current active scene and returns it.""" - + bl_idname = 'LNGetObjectNode' bl_label = 'Get Object by Name' arm_version = 1 - def init(self, context): - super(GetObjectNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'Name') self.add_output('ArmNodeSocketObject', 'Object') diff --git a/blender/arm/logicnode/object/LN_get_object_child.py b/blender/arm/logicnode/object/LN_get_object_child.py index 8ff69a55..76409006 100644 --- a/blender/arm/logicnode/object/LN_get_object_child.py +++ b/blender/arm/logicnode/object/LN_get_object_child.py @@ -16,8 +16,7 @@ class GetChildNode(ArmLogicTreeNode): ], name='', default='By Name') - def init(self, context): - super(GetChildNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Parent') self.add_input('ArmStringSocket', 'Child Name') diff --git a/blender/arm/logicnode/object/LN_get_object_children.py b/blender/arm/logicnode/object/LN_get_object_children.py index 2ccbcecb..a23bf33f 100644 --- a/blender/arm/logicnode/object/LN_get_object_children.py +++ b/blender/arm/logicnode/object/LN_get_object_children.py @@ -7,8 +7,7 @@ class GetChildrenNode(ArmLogicTreeNode): arm_section = 'relations' arm_version = 1 - def init(self, context): - super(GetChildrenNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Parent') self.add_output('ArmNodeSocketArray', 'Children') diff --git a/blender/arm/logicnode/object/LN_get_object_mesh.py b/blender/arm/logicnode/object/LN_get_object_mesh.py index 83d45e35..9339134e 100644 --- a/blender/arm/logicnode/object/LN_get_object_mesh.py +++ b/blender/arm/logicnode/object/LN_get_object_mesh.py @@ -7,8 +7,7 @@ class GetMeshNode(ArmLogicTreeNode): arm_section = 'props' arm_version = 1 - def init(self, context): - super(GetMeshNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmDynamicSocket', 'Mesh') diff --git a/blender/arm/logicnode/object/LN_get_object_name.py b/blender/arm/logicnode/object/LN_get_object_name.py index e6938510..bb242d32 100644 --- a/blender/arm/logicnode/object/LN_get_object_name.py +++ b/blender/arm/logicnode/object/LN_get_object_name.py @@ -7,8 +7,7 @@ class GetNameNode(ArmLogicTreeNode): arm_section = 'props' arm_version = 1 - def init(self, context): - super(GetNameNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmStringSocket', 'Name') diff --git a/blender/arm/logicnode/object/LN_get_object_offscreen.py b/blender/arm/logicnode/object/LN_get_object_offscreen.py index 1eb38bd8..6bd85f8b 100644 --- a/blender/arm/logicnode/object/LN_get_object_offscreen.py +++ b/blender/arm/logicnode/object/LN_get_object_offscreen.py @@ -7,8 +7,7 @@ class GetObjectOffscreenNode(ArmLogicTreeNode): arm_section = 'props' arm_version = 1 - def init(self, context): - super(GetObjectOffscreenNode, self).init(context) + def arm_init(self, context): self.inputs.new('ArmNodeSocketObject', 'Object') self.outputs.new('ArmBoolSocket', 'Is Object Offscreen') diff --git a/blender/arm/logicnode/object/LN_get_object_parent.py b/blender/arm/logicnode/object/LN_get_object_parent.py index d856d008..5ca239a6 100644 --- a/blender/arm/logicnode/object/LN_get_object_parent.py +++ b/blender/arm/logicnode/object/LN_get_object_parent.py @@ -9,8 +9,7 @@ class GetParentNode(ArmLogicTreeNode): arm_section = 'relations' arm_version = 1 - def init(self, context): - super(GetParentNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Child') self.add_output('ArmNodeSocketObject', 'Parent') diff --git a/blender/arm/logicnode/object/LN_get_object_property.py b/blender/arm/logicnode/object/LN_get_object_property.py index ecd62857..3332677b 100644 --- a/blender/arm/logicnode/object/LN_get_object_property.py +++ b/blender/arm/logicnode/object/LN_get_object_property.py @@ -9,8 +9,7 @@ class GetPropertyNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'props' - def init(self, context): - super(GetPropertyNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmStringSocket', 'Property') diff --git a/blender/arm/logicnode/object/LN_get_object_visible.py b/blender/arm/logicnode/object/LN_get_object_visible.py index 0f3e1b1c..e01cbf57 100644 --- a/blender/arm/logicnode/object/LN_get_object_visible.py +++ b/blender/arm/logicnode/object/LN_get_object_visible.py @@ -10,8 +10,7 @@ class GetVisibleNode(ArmLogicTreeNode): arm_section = 'props' arm_version = 1 - def init(self, context): - super(GetVisibleNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmBoolSocket', 'Is Object Visible') diff --git a/blender/arm/logicnode/object/LN_mesh.py b/blender/arm/logicnode/object/LN_mesh.py index cefcca05..3f05dda2 100644 --- a/blender/arm/logicnode/object/LN_mesh.py +++ b/blender/arm/logicnode/object/LN_mesh.py @@ -11,8 +11,7 @@ class MeshNode(ArmLogicTreeNode): property0_get: HaxePointerProperty('property0_get', name='', type=bpy.types.Mesh) - def init(self, context): - super(MeshNode, self).init(context) + def arm_init(self, context): self.add_output('ArmDynamicSocket', 'Mesh', is_var=True) def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/object/LN_object.py b/blender/arm/logicnode/object/LN_object.py index 3992bb40..8b9b0636 100644 --- a/blender/arm/logicnode/object/LN_object.py +++ b/blender/arm/logicnode/object/LN_object.py @@ -6,8 +6,7 @@ class ObjectNode(ArmLogicTreeNode): bl_label = 'Object' arm_version = 1 - def init(self, context): - super(ObjectNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object In') self.add_output('ArmNodeSocketObject', 'Object Out', is_var=True) diff --git a/blender/arm/logicnode/object/LN_remove_object.py b/blender/arm/logicnode/object/LN_remove_object.py index 7783da82..78d0f956 100644 --- a/blender/arm/logicnode/object/LN_remove_object.py +++ b/blender/arm/logicnode/object/LN_remove_object.py @@ -6,8 +6,7 @@ class RemoveObjectNode(ArmLogicTreeNode): bl_label = 'Remove Object' arm_version = 1 - def init(self, context): - super(RemoveObjectNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') diff --git a/blender/arm/logicnode/object/LN_remove_object_parent.py b/blender/arm/logicnode/object/LN_remove_object_parent.py index cbfdb84a..80439051 100644 --- a/blender/arm/logicnode/object/LN_remove_object_parent.py +++ b/blender/arm/logicnode/object/LN_remove_object_parent.py @@ -7,8 +7,7 @@ class ClearParentNode(ArmLogicTreeNode): arm_section = 'relations' arm_version = 1 - def init(self, context): - super(ClearParentNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmBoolSocket', 'Keep Transform', default_value=True) diff --git a/blender/arm/logicnode/object/LN_self_object.py b/blender/arm/logicnode/object/LN_self_object.py index aa4021ca..0dcbd0d0 100644 --- a/blender/arm/logicnode/object/LN_self_object.py +++ b/blender/arm/logicnode/object/LN_self_object.py @@ -6,6 +6,5 @@ class SelfObjectNode(ArmLogicTreeNode): bl_label = 'Self Object' arm_version = 1 - def init(self, context): - super(SelfObjectNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketObject', 'Object') diff --git a/blender/arm/logicnode/object/LN_set_object_mesh.py b/blender/arm/logicnode/object/LN_set_object_mesh.py index 601f36ae..114e0078 100644 --- a/blender/arm/logicnode/object/LN_set_object_mesh.py +++ b/blender/arm/logicnode/object/LN_set_object_mesh.py @@ -7,8 +7,7 @@ class SetMeshNode(ArmLogicTreeNode): arm_section = 'props' arm_version = 1 - def init(self, context): - super(SetMeshNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmDynamicSocket', 'Mesh') diff --git a/blender/arm/logicnode/object/LN_set_object_name.py b/blender/arm/logicnode/object/LN_set_object_name.py index 05f20794..236e25b6 100644 --- a/blender/arm/logicnode/object/LN_set_object_name.py +++ b/blender/arm/logicnode/object/LN_set_object_name.py @@ -7,8 +7,7 @@ class SetNameNode(ArmLogicTreeNode): arm_section = 'props' arm_version = 1 - def init(self, context): - super(SetNameNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmStringSocket', 'Name') diff --git a/blender/arm/logicnode/object/LN_set_object_parent.py b/blender/arm/logicnode/object/LN_set_object_parent.py index 30b50d1a..c5e425ee 100644 --- a/blender/arm/logicnode/object/LN_set_object_parent.py +++ b/blender/arm/logicnode/object/LN_set_object_parent.py @@ -9,8 +9,7 @@ class SetParentNode(ArmLogicTreeNode): arm_section = 'relations' arm_version = 1 - def init(self, context): - super(SetParentNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketObject', 'Parent', default_value='Parent') diff --git a/blender/arm/logicnode/object/LN_set_object_property.py b/blender/arm/logicnode/object/LN_set_object_property.py index b41494fa..326beb2f 100644 --- a/blender/arm/logicnode/object/LN_set_object_property.py +++ b/blender/arm/logicnode/object/LN_set_object_property.py @@ -14,8 +14,7 @@ class SetPropertyNode(ArmLogicTreeNode): arm_section = 'props' arm_version = 1 - def init(self, context): - super(SetPropertyNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmStringSocket', 'Property') diff --git a/blender/arm/logicnode/object/LN_set_object_visible.py b/blender/arm/logicnode/object/LN_set_object_visible.py index 53e354a6..09107e9e 100644 --- a/blender/arm/logicnode/object/LN_set_object_visible.py +++ b/blender/arm/logicnode/object/LN_set_object_visible.py @@ -17,8 +17,7 @@ class SetVisibleNode(ArmLogicTreeNode): ], name='', default='object') - def init(self, context): - super(SetVisibleNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmBoolSocket', 'Visible') diff --git a/blender/arm/logicnode/object/LN_spawn_object.py b/blender/arm/logicnode/object/LN_spawn_object.py index 49097d86..de4ff22f 100644 --- a/blender/arm/logicnode/object/LN_spawn_object.py +++ b/blender/arm/logicnode/object/LN_spawn_object.py @@ -2,13 +2,12 @@ from arm.logicnode.arm_nodes import * class SpawnObjectNode(ArmLogicTreeNode): """Spawns the given object if present in the current active scene. The spawned object has the same name of its instance, but they are treated as different objects.""" - + bl_idname = 'LNSpawnObjectNode' bl_label = 'Spawn Object' arm_version = 1 - def init(self, context): - super(SpawnObjectNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmDynamicSocket', 'Transform') diff --git a/blender/arm/logicnode/object/LN_spawn_object_by_name.py b/blender/arm/logicnode/object/LN_spawn_object_by_name.py index bd629b21..3fed2d76 100644 --- a/blender/arm/logicnode/object/LN_spawn_object_by_name.py +++ b/blender/arm/logicnode/object/LN_spawn_object_by_name.py @@ -11,8 +11,7 @@ class SpawnObjectByNameNode(ArmLogicTreeNode): type=bpy.types.Scene, name='Scene', description='The scene from which to take the object') - def init(self, context): - super(SpawnObjectByNameNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Name') self.add_input('ArmDynamicSocket', 'Transform') diff --git a/blender/arm/logicnode/physics/LN_Add_rigid_body.py b/blender/arm/logicnode/physics/LN_Add_rigid_body.py index 7376c096..97fa8e80 100644 --- a/blender/arm/logicnode/physics/LN_Add_rigid_body.py +++ b/blender/arm/logicnode/physics/LN_Add_rigid_body.py @@ -78,8 +78,7 @@ class AddRigidBodyNode(ArmLogicTreeNode): ('Mesh', 'Mesh', 'Mesh')], name='Shape', default='Box') - def init(self, context): - super(AddRigidBodyNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') diff --git a/blender/arm/logicnode/physics/LN_add_physics_constraint.py b/blender/arm/logicnode/physics/LN_add_physics_constraint.py index 89c2d1e0..192fd804 100644 --- a/blender/arm/logicnode/physics/LN_add_physics_constraint.py +++ b/blender/arm/logicnode/physics/LN_add_physics_constraint.py @@ -137,8 +137,7 @@ class AddPhysicsConstraintNode(ArmLogicTreeNode): def __init__(self): array_nodes[str(id(self))] = self - def init(self, context): - super(AddPhysicsConstraintNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Pivot Object') self.add_input('ArmNodeSocketObject', 'RB 1') diff --git a/blender/arm/logicnode/physics/LN_apply_force.py b/blender/arm/logicnode/physics/LN_apply_force.py index bfe29b07..20aba1b1 100644 --- a/blender/arm/logicnode/physics/LN_apply_force.py +++ b/blender/arm/logicnode/physics/LN_apply_force.py @@ -16,8 +16,7 @@ class ApplyForceNode(ArmLogicTreeNode): arm_section = 'force' arm_version = 1 - def init(self, context): - super(ApplyForceNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmVectorSocket', 'Force') diff --git a/blender/arm/logicnode/physics/LN_apply_force_at_location.py b/blender/arm/logicnode/physics/LN_apply_force_at_location.py index 7a9de48e..145627f4 100644 --- a/blender/arm/logicnode/physics/LN_apply_force_at_location.py +++ b/blender/arm/logicnode/physics/LN_apply_force_at_location.py @@ -19,8 +19,7 @@ class ApplyForceAtLocationNode(ArmLogicTreeNode): arm_section = 'force' arm_version = 1 - def init(self, context): - super(ApplyForceAtLocationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmVectorSocket', 'Force') diff --git a/blender/arm/logicnode/physics/LN_apply_impulse.py b/blender/arm/logicnode/physics/LN_apply_impulse.py index ad41b870..68c2006d 100644 --- a/blender/arm/logicnode/physics/LN_apply_impulse.py +++ b/blender/arm/logicnode/physics/LN_apply_impulse.py @@ -16,8 +16,7 @@ class ApplyImpulseNode(ArmLogicTreeNode): arm_section = 'force' arm_version = 1 - def init(self, context): - super(ApplyImpulseNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmVectorSocket', 'Impulse') diff --git a/blender/arm/logicnode/physics/LN_apply_impulse_at_location.py b/blender/arm/logicnode/physics/LN_apply_impulse_at_location.py index 54a9c0ef..24d55a6d 100644 --- a/blender/arm/logicnode/physics/LN_apply_impulse_at_location.py +++ b/blender/arm/logicnode/physics/LN_apply_impulse_at_location.py @@ -19,8 +19,7 @@ class ApplyImpulseAtLocationNode(ArmLogicTreeNode): arm_section = 'force' arm_version = 1 - def init(self, context): - super(ApplyImpulseAtLocationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmVectorSocket', 'Impulse') diff --git a/blender/arm/logicnode/physics/LN_apply_torque.py b/blender/arm/logicnode/physics/LN_apply_torque.py index 7e00d966..70d2633e 100644 --- a/blender/arm/logicnode/physics/LN_apply_torque.py +++ b/blender/arm/logicnode/physics/LN_apply_torque.py @@ -7,8 +7,7 @@ class ApplyTorqueNode(ArmLogicTreeNode): arm_section = 'force' arm_version = 1 - def init(self, context): - super(ApplyTorqueNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmVectorSocket', 'Torque') diff --git a/blender/arm/logicnode/physics/LN_apply_torque_impulse.py b/blender/arm/logicnode/physics/LN_apply_torque_impulse.py index 91662926..2bf208c2 100644 --- a/blender/arm/logicnode/physics/LN_apply_torque_impulse.py +++ b/blender/arm/logicnode/physics/LN_apply_torque_impulse.py @@ -7,8 +7,7 @@ class ApplyTorqueImpulseNode(ArmLogicTreeNode): arm_section = 'force' arm_version = 1 - def init(self, context): - super(ApplyTorqueImpulseNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmVectorSocket', 'Torque') diff --git a/blender/arm/logicnode/physics/LN_get_rb_contacts.py b/blender/arm/logicnode/physics/LN_get_rb_contacts.py index fd1cf788..9f63fae5 100644 --- a/blender/arm/logicnode/physics/LN_get_rb_contacts.py +++ b/blender/arm/logicnode/physics/LN_get_rb_contacts.py @@ -11,8 +11,7 @@ class GetContactsNode(ArmLogicTreeNode): arm_section = 'contact' arm_version = 1 - def init(self, context): - super(GetContactsNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'RB') self.add_output('ArmNodeSocketArray', 'Contacts') diff --git a/blender/arm/logicnode/physics/LN_get_rb_first_contact.py b/blender/arm/logicnode/physics/LN_get_rb_first_contact.py index 9781c184..ea8ea7af 100644 --- a/blender/arm/logicnode/physics/LN_get_rb_first_contact.py +++ b/blender/arm/logicnode/physics/LN_get_rb_first_contact.py @@ -10,8 +10,7 @@ class GetFirstContactNode(ArmLogicTreeNode): arm_section = 'contact' arm_version = 1 - def init(self, context): - super(GetFirstContactNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'RB') self.add_output('ArmNodeSocketObject', 'First Contact') diff --git a/blender/arm/logicnode/physics/LN_get_rb_velocity.py b/blender/arm/logicnode/physics/LN_get_rb_velocity.py index 33269ccb..18dcadeb 100644 --- a/blender/arm/logicnode/physics/LN_get_rb_velocity.py +++ b/blender/arm/logicnode/physics/LN_get_rb_velocity.py @@ -6,8 +6,7 @@ class GetVelocityNode(ArmLogicTreeNode): bl_label = 'Get RB Velocity' arm_version = 1 - def init(self, context): - super(GetVelocityNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmBoolSocket', 'Linear On Local Axis') self.add_input('ArmBoolSocket', 'Angular On Local Axis') diff --git a/blender/arm/logicnode/physics/LN_get_world_gravity.py b/blender/arm/logicnode/physics/LN_get_world_gravity.py index fe810eec..0fb4aec8 100644 --- a/blender/arm/logicnode/physics/LN_get_world_gravity.py +++ b/blender/arm/logicnode/physics/LN_get_world_gravity.py @@ -9,6 +9,5 @@ class GetGravityNode(ArmLogicTreeNode): bl_label = 'Get World Gravity' arm_version = 1 - def init(self, context): - super(GetGravityNode, self).init(context) + def arm_init(self, context): self.add_output('ArmVectorSocket', 'World Gravity') diff --git a/blender/arm/logicnode/physics/LN_has_contact.py b/blender/arm/logicnode/physics/LN_has_contact.py index 4bd2151f..627180e3 100644 --- a/blender/arm/logicnode/physics/LN_has_contact.py +++ b/blender/arm/logicnode/physics/LN_has_contact.py @@ -7,8 +7,7 @@ class HasContactNode(ArmLogicTreeNode): arm_section = 'contact' arm_version = 1 - def init(self, context): - super(HasContactNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'RB 1') self.add_input('ArmNodeSocketObject', 'RB 2') diff --git a/blender/arm/logicnode/physics/LN_has_contact_array.py b/blender/arm/logicnode/physics/LN_has_contact_array.py index e64d342e..a7a6b759 100644 --- a/blender/arm/logicnode/physics/LN_has_contact_array.py +++ b/blender/arm/logicnode/physics/LN_has_contact_array.py @@ -7,8 +7,7 @@ class HasContactArrayNode(ArmLogicTreeNode): arm_section = 'contact' arm_version = 1 - def init(self, context): - super(HasContactArrayNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmNodeSocketArray', 'RBs') diff --git a/blender/arm/logicnode/physics/LN_on_contact.py b/blender/arm/logicnode/physics/LN_on_contact.py index a96feb01..8ca26aab 100644 --- a/blender/arm/logicnode/physics/LN_on_contact.py +++ b/blender/arm/logicnode/physics/LN_on_contact.py @@ -23,8 +23,7 @@ class OnContactNode(ArmLogicTreeNode): ('end', 'End', 'The contact between the rigid bodies ends')], name='', default='begin') - def init(self, context): - super(OnContactNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'RB 1') self.add_input('ArmNodeSocketObject', 'RB 2') diff --git a/blender/arm/logicnode/physics/LN_on_contact_array.py b/blender/arm/logicnode/physics/LN_on_contact_array.py index 9a35acf1..c39a6ad2 100644 --- a/blender/arm/logicnode/physics/LN_on_contact_array.py +++ b/blender/arm/logicnode/physics/LN_on_contact_array.py @@ -14,8 +14,7 @@ class OnContactArrayNode(ArmLogicTreeNode): ('end', 'End', 'The contact between the rigid bodies ends')], name='', default='begin') - def init(self, context): - super(OnContactArrayNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmNodeSocketArray', 'RBs') diff --git a/blender/arm/logicnode/physics/LN_on_volume_trigger.py b/blender/arm/logicnode/physics/LN_on_volume_trigger.py index 614a7e8f..0c4cf2d5 100644 --- a/blender/arm/logicnode/physics/LN_on_volume_trigger.py +++ b/blender/arm/logicnode/physics/LN_on_volume_trigger.py @@ -17,8 +17,7 @@ class OnVolumeTriggerNode(ArmLogicTreeNode): ('end', 'End', 'The contact between the rigid bodies ends')], name='', default='begin') - def init(self, context): - super(OnVolumeTriggerNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object 1') self.add_input('ArmNodeSocketObject', 'Object 2') diff --git a/blender/arm/logicnode/physics/LN_physics_constraint.py b/blender/arm/logicnode/physics/LN_physics_constraint.py index d4d1c539..f8aafce9 100644 --- a/blender/arm/logicnode/physics/LN_physics_constraint.py +++ b/blender/arm/logicnode/physics/LN_physics_constraint.py @@ -51,8 +51,7 @@ class PhysicsConstraintNode(ArmLogicTreeNode): def __init__(self): array_nodes[str(id(self))] = self - def init(self, context): - super(PhysicsConstraintNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Lower limit') self.add_input('ArmFloatSocket', 'Upper limit') self.add_output('ArmDynamicSocket', 'Constraint') diff --git a/blender/arm/logicnode/physics/LN_pick_rb.py b/blender/arm/logicnode/physics/LN_pick_rb.py index 65e34f54..25d926b0 100644 --- a/blender/arm/logicnode/physics/LN_pick_rb.py +++ b/blender/arm/logicnode/physics/LN_pick_rb.py @@ -3,14 +3,14 @@ from arm.logicnode.arm_nodes import * class PickObjectNode(ArmLogicTreeNode): """Picks the rigid body in the given location using the screen coordinates (2D). - + @seeNode Mask - - @input Screen Coords: the location at which to pick, in screen + + @input Screen Coords: the location at which to pick, in screen coordinates @input Mask: a bit mask value to specify which objects are considered - + @output RB: the object that was hit @output Hit: the hit position in world coordinates """ @@ -19,8 +19,7 @@ class PickObjectNode(ArmLogicTreeNode): arm_section = 'ray' arm_version = 1 - def init(self, context): - super(PickObjectNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'Screen Coords') self.add_input('ArmIntSocket', 'Mask', default_value=1) diff --git a/blender/arm/logicnode/physics/LN_ray_cast.py b/blender/arm/logicnode/physics/LN_ray_cast.py index 79995333..1fa4401a 100644 --- a/blender/arm/logicnode/physics/LN_ray_cast.py +++ b/blender/arm/logicnode/physics/LN_ray_cast.py @@ -22,8 +22,7 @@ class RayCastNode(ArmLogicTreeNode): arm_section = 'ray' arm_version = 1 - def init(self, context): - super(RayCastNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'From') self.add_input('ArmVectorSocket', 'To') self.add_input('ArmIntSocket', 'Mask', default_value=1) diff --git a/blender/arm/logicnode/physics/LN_remove_rb.py b/blender/arm/logicnode/physics/LN_remove_rb.py index 158493ae..7c05c68e 100644 --- a/blender/arm/logicnode/physics/LN_remove_rb.py +++ b/blender/arm/logicnode/physics/LN_remove_rb.py @@ -6,8 +6,7 @@ class RemovePhysicsNode (ArmLogicTreeNode): bl_label = 'Remove RB' arm_version = 1 - def init(self, context): - super(RemovePhysicsNode, self).init(context) + def arm_init(self, context): self.inputs.new('ArmNodeSocketAction', 'In') self.inputs.new('ArmNodeSocketObject', 'RB') diff --git a/blender/arm/logicnode/physics/LN_set_rb_activation_state.py b/blender/arm/logicnode/physics/LN_set_rb_activation_state.py index 120ead99..63eaec4c 100644 --- a/blender/arm/logicnode/physics/LN_set_rb_activation_state.py +++ b/blender/arm/logicnode/physics/LN_set_rb_activation_state.py @@ -16,8 +16,7 @@ class SetActivationStateNode(ArmLogicTreeNode): ], name='', default='inactive') - def init(self, context): - super(SetActivationStateNode, self).init(context) + def arm_init(self, context): self.inputs.new('ArmNodeSocketAction', 'In') self.inputs.new('ArmNodeSocketObject', 'RB') diff --git a/blender/arm/logicnode/physics/LN_set_rb_friction.py b/blender/arm/logicnode/physics/LN_set_rb_friction.py index c2267732..7efdcd79 100644 --- a/blender/arm/logicnode/physics/LN_set_rb_friction.py +++ b/blender/arm/logicnode/physics/LN_set_rb_friction.py @@ -7,8 +7,7 @@ class SetFrictionNode (ArmLogicTreeNode): bl_icon = 'NONE' arm_version = 1 - def init(self, context): - super(SetFrictionNode, self).init(context) + def arm_init(self, context): self.inputs.new('ArmNodeSocketAction', 'In') self.inputs.new('ArmNodeSocketObject', 'RB') self.inputs.new('ArmFloatSocket', 'Friction') diff --git a/blender/arm/logicnode/physics/LN_set_rb_gravity_enabled.py b/blender/arm/logicnode/physics/LN_set_rb_gravity_enabled.py index 73f0405d..27a576a1 100644 --- a/blender/arm/logicnode/physics/LN_set_rb_gravity_enabled.py +++ b/blender/arm/logicnode/physics/LN_set_rb_gravity_enabled.py @@ -6,8 +6,7 @@ class SetGravityEnabledNode(ArmLogicTreeNode): bl_label = 'Set RB Gravity Enabled' arm_version = 1 - def init(self, context): - super(SetGravityEnabledNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmBoolSocket', 'Enabled') diff --git a/blender/arm/logicnode/physics/LN_set_rb_velocity.py b/blender/arm/logicnode/physics/LN_set_rb_velocity.py index 48e95bbc..21980ae8 100644 --- a/blender/arm/logicnode/physics/LN_set_rb_velocity.py +++ b/blender/arm/logicnode/physics/LN_set_rb_velocity.py @@ -6,8 +6,7 @@ class SetVelocityNode(ArmLogicTreeNode): bl_label = 'Set RB Velocity' arm_version = 1 - def init(self, context): - super(SetVelocityNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmVectorSocket', 'Linear') diff --git a/blender/arm/logicnode/physics/LN_set_world_gravity.py b/blender/arm/logicnode/physics/LN_set_world_gravity.py index e8646994..f8923b29 100644 --- a/blender/arm/logicnode/physics/LN_set_world_gravity.py +++ b/blender/arm/logicnode/physics/LN_set_world_gravity.py @@ -9,8 +9,7 @@ class SetGravityNode(ArmLogicTreeNode): bl_label = 'Set World Gravity' arm_version = 1 - def init(self, context): - super(SetGravityNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmVectorSocket', 'Gravity') diff --git a/blender/arm/logicnode/physics/LN_volume_trigger.py b/blender/arm/logicnode/physics/LN_volume_trigger.py index fab5aa3c..af438c32 100644 --- a/blender/arm/logicnode/physics/LN_volume_trigger.py +++ b/blender/arm/logicnode/physics/LN_volume_trigger.py @@ -19,8 +19,7 @@ class VolumeTriggerNode(ArmLogicTreeNode): ('end', 'End', 'The contact between the rigid bodies ends')], name='', default='begin') - def init(self, context): - super(VolumeTriggerNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object 1') self.add_input('ArmNodeSocketObject', 'Object 2') diff --git a/blender/arm/logicnode/postprocess/LN_colorgrading_get_global_node.py b/blender/arm/logicnode/postprocess/LN_colorgrading_get_global_node.py index 5cf34dda..f5f61d73 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_get_global_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_get_global_node.py @@ -7,8 +7,7 @@ class ColorgradingGetGlobalNode(ArmLogicTreeNode): arm_section = 'colorgrading' arm_version = 1 - def init(self, context): - super(ColorgradingGetGlobalNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'Whitebalance') self.add_output('ArmVectorSocket', 'Tint') self.add_output('ArmVectorSocket', 'Saturation') diff --git a/blender/arm/logicnode/postprocess/LN_colorgrading_get_highlight_node.py b/blender/arm/logicnode/postprocess/LN_colorgrading_get_highlight_node.py index 583fe71b..c4f16f9f 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_get_highlight_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_get_highlight_node.py @@ -7,8 +7,7 @@ class ColorgradingGetHighlightNode(ArmLogicTreeNode): arm_section = 'colorgrading' arm_version = 1 - def init(self, context): - super(ColorgradingGetHighlightNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'HightlightMin') self.add_output('ArmVectorSocket', 'Saturation') self.add_output('ArmVectorSocket', 'Contrast') diff --git a/blender/arm/logicnode/postprocess/LN_colorgrading_get_midtone_node.py b/blender/arm/logicnode/postprocess/LN_colorgrading_get_midtone_node.py index cd8d860d..29bab2c2 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_get_midtone_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_get_midtone_node.py @@ -7,8 +7,7 @@ class ColorgradingGetMidtoneNode(ArmLogicTreeNode): arm_section = 'colorgrading' arm_version = 1 - def init(self, context): - super(ColorgradingGetMidtoneNode, self).init(context) + def arm_init(self, context): self.add_output('ArmVectorSocket', 'Saturation') self.add_output('ArmVectorSocket', 'Contrast') self.add_output('ArmVectorSocket', 'Gamma') diff --git a/blender/arm/logicnode/postprocess/LN_colorgrading_get_shadow_node.py b/blender/arm/logicnode/postprocess/LN_colorgrading_get_shadow_node.py index 16c96cb6..06130071 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_get_shadow_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_get_shadow_node.py @@ -7,8 +7,7 @@ class ColorgradingGetShadowNode(ArmLogicTreeNode): arm_section = 'colorgrading' arm_version = 1 - def init(self, context): - super(ColorgradingGetShadowNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'ShadowMax') self.add_output('ArmVectorSocket', 'Saturation') self.add_output('ArmVectorSocket', 'Contrast') diff --git a/blender/arm/logicnode/postprocess/LN_colorgrading_set_global_node.py b/blender/arm/logicnode/postprocess/LN_colorgrading_set_global_node.py index c9258bb6..c4746472 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_global_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_global_node.py @@ -62,8 +62,7 @@ class ColorgradingSetGlobalNode(ArmLogicTreeNode): def draw_nodes_colorwheel(self, context): pass - def init(self, context): - super(ColorgradingSetGlobalNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') self.draw_nodes_uniform(context) diff --git a/blender/arm/logicnode/postprocess/LN_colorgrading_set_highlight_node.py b/blender/arm/logicnode/postprocess/LN_colorgrading_set_highlight_node.py index bc775851..f8a801cb 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_highlight_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_highlight_node.py @@ -60,8 +60,7 @@ class ColorgradingSetHighlightNode(ArmLogicTreeNode): def draw_nodes_colorwheel(self, context): pass - def init(self, context): - super(ColorgradingSetHighlightNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') self.draw_nodes_uniform(context) diff --git a/blender/arm/logicnode/postprocess/LN_colorgrading_set_midtone_node.py b/blender/arm/logicnode/postprocess/LN_colorgrading_set_midtone_node.py index 14dcdbdf..8d8379cb 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_midtone_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_midtone_node.py @@ -59,8 +59,7 @@ class ColorgradingSetMidtoneNode(ArmLogicTreeNode): def draw_nodes_colorwheel(self, context): pass - def init(self, context): - super(ColorgradingSetMidtoneNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') self.draw_nodes_uniform(context) diff --git a/blender/arm/logicnode/postprocess/LN_colorgrading_set_shadow_node.py b/blender/arm/logicnode/postprocess/LN_colorgrading_set_shadow_node.py index a3abd236..84fa8956 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_shadow_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_shadow_node.py @@ -60,8 +60,7 @@ class ColorgradingSetShadowNode(ArmLogicTreeNode): def draw_nodes_colorwheel(self, context): pass - def init(self, context): - super(ColorgradingSetShadowNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') self.draw_nodes_uniform(context) diff --git a/blender/arm/logicnode/postprocess/LN_get_bloom_settings.py b/blender/arm/logicnode/postprocess/LN_get_bloom_settings.py index 744e7721..4dd36c42 100644 --- a/blender/arm/logicnode/postprocess/LN_get_bloom_settings.py +++ b/blender/arm/logicnode/postprocess/LN_get_bloom_settings.py @@ -6,8 +6,7 @@ class BloomGetNode(ArmLogicTreeNode): bl_label = 'Get Bloom Settings' arm_version = 1 - def init(self, context): - super(BloomGetNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'Threshold') self.add_output('ArmFloatSocket', 'Strength') self.add_output('ArmFloatSocket', 'Radius') diff --git a/blender/arm/logicnode/postprocess/LN_get_ca_settings.py b/blender/arm/logicnode/postprocess/LN_get_ca_settings.py index 51fb624d..f4064fb4 100644 --- a/blender/arm/logicnode/postprocess/LN_get_ca_settings.py +++ b/blender/arm/logicnode/postprocess/LN_get_ca_settings.py @@ -6,7 +6,6 @@ class ChromaticAberrationGetNode(ArmLogicTreeNode): bl_label = 'Get CA Settings' arm_version = 1 - def init(self, context): - super(ChromaticAberrationGetNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'Strength') self.add_output('ArmFloatSocket', 'Samples') diff --git a/blender/arm/logicnode/postprocess/LN_get_camera_post_process.py b/blender/arm/logicnode/postprocess/LN_get_camera_post_process.py index 71906eae..786cee06 100644 --- a/blender/arm/logicnode/postprocess/LN_get_camera_post_process.py +++ b/blender/arm/logicnode/postprocess/LN_get_camera_post_process.py @@ -6,8 +6,7 @@ class CameraGetNode(ArmLogicTreeNode): bl_label = 'Get Camera Post Process' arm_version = 1 - def init(self, context): - super(CameraGetNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'F-Stop') self.add_output('ArmFloatSocket', 'Shutter Time') self.add_output('ArmFloatSocket', 'ISO') diff --git a/blender/arm/logicnode/postprocess/LN_get_lenstexture_settings.py b/blender/arm/logicnode/postprocess/LN_get_lenstexture_settings.py index fd93f516..8ffa9a3d 100644 --- a/blender/arm/logicnode/postprocess/LN_get_lenstexture_settings.py +++ b/blender/arm/logicnode/postprocess/LN_get_lenstexture_settings.py @@ -6,8 +6,7 @@ class LenstextureGetNode(ArmLogicTreeNode): bl_label = 'Get Lenstexture Settings' arm_version = 1 - def init(self, context): - super(LenstextureGetNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'Center Min Clip') self.add_output('ArmFloatSocket', 'Center Max Clip') self.add_output('ArmFloatSocket', 'Luminance Min') diff --git a/blender/arm/logicnode/postprocess/LN_get_ssao_settings.py b/blender/arm/logicnode/postprocess/LN_get_ssao_settings.py index 7208d123..d263ae60 100644 --- a/blender/arm/logicnode/postprocess/LN_get_ssao_settings.py +++ b/blender/arm/logicnode/postprocess/LN_get_ssao_settings.py @@ -6,8 +6,7 @@ class SSAOGetNode(ArmLogicTreeNode): bl_label = 'Get SSAO Settings' arm_version = 1 - def init(self, context): - super(SSAOGetNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'Radius') self.add_output('ArmFloatSocket', 'Strength') self.add_output('ArmFloatSocket', 'Max Steps') diff --git a/blender/arm/logicnode/postprocess/LN_get_ssr_settings.py b/blender/arm/logicnode/postprocess/LN_get_ssr_settings.py index 69ac4405..684685c9 100644 --- a/blender/arm/logicnode/postprocess/LN_get_ssr_settings.py +++ b/blender/arm/logicnode/postprocess/LN_get_ssr_settings.py @@ -6,8 +6,7 @@ class SSRGetNode(ArmLogicTreeNode): bl_label = 'Get SSR Settings' arm_version = 1 - def init(self, context): - super(SSRGetNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'SSR Step') self.add_output('ArmFloatSocket', 'SSR Step Min') self.add_output('ArmFloatSocket', 'SSR Search') diff --git a/blender/arm/logicnode/postprocess/LN_lenstexture_set.py b/blender/arm/logicnode/postprocess/LN_lenstexture_set.py index 4ee7380f..53698ccd 100644 --- a/blender/arm/logicnode/postprocess/LN_lenstexture_set.py +++ b/blender/arm/logicnode/postprocess/LN_lenstexture_set.py @@ -6,8 +6,7 @@ class LenstextureSetNode(ArmLogicTreeNode): bl_label = 'Set Lenstexture' arm_version = 1 - def init(self, context): - super(LenstextureSetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmFloatSocket', 'Center Min Clip', default_value=0.1) self.add_input('ArmFloatSocket', 'Center Max Clip', default_value=0.5) diff --git a/blender/arm/logicnode/postprocess/LN_set_bloom_settings.py b/blender/arm/logicnode/postprocess/LN_set_bloom_settings.py index 90c8d5a3..7c463480 100644 --- a/blender/arm/logicnode/postprocess/LN_set_bloom_settings.py +++ b/blender/arm/logicnode/postprocess/LN_set_bloom_settings.py @@ -6,8 +6,7 @@ class BloomSetNode(ArmLogicTreeNode): bl_label = 'Set Bloom Settings' arm_version = 1 - def init(self, context): - super(BloomSetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmFloatSocket', 'Threshold', default_value=1.00) self.add_input('ArmFloatSocket', 'Strength', default_value=3.50) diff --git a/blender/arm/logicnode/postprocess/LN_set_ca_settings.py b/blender/arm/logicnode/postprocess/LN_set_ca_settings.py index be459419..5031cd0a 100644 --- a/blender/arm/logicnode/postprocess/LN_set_ca_settings.py +++ b/blender/arm/logicnode/postprocess/LN_set_ca_settings.py @@ -6,8 +6,7 @@ class ChromaticAberrationSetNode(ArmLogicTreeNode): bl_label = 'Set CA Settings' arm_version = 1 - def init(self, context): - super(ChromaticAberrationSetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmFloatSocket', 'Strength', default_value=2.0) self.add_input('ArmIntSocket', 'Samples', default_value=32) diff --git a/blender/arm/logicnode/postprocess/LN_set_camera_post_process.py b/blender/arm/logicnode/postprocess/LN_set_camera_post_process.py index e589b6c9..e6a59bc4 100644 --- a/blender/arm/logicnode/postprocess/LN_set_camera_post_process.py +++ b/blender/arm/logicnode/postprocess/LN_set_camera_post_process.py @@ -6,8 +6,7 @@ class CameraSetNode(ArmLogicTreeNode): bl_label = 'Set Camera Post Process' arm_version = 1 - def init(self, context): - super(CameraSetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmFloatSocket', 'F-stop', default_value=2.0) self.add_input('ArmFloatSocket', 'Shutter Time', default_value=1.0) diff --git a/blender/arm/logicnode/postprocess/LN_set_ssao_settings.py b/blender/arm/logicnode/postprocess/LN_set_ssao_settings.py index 386e980b..e401b955 100644 --- a/blender/arm/logicnode/postprocess/LN_set_ssao_settings.py +++ b/blender/arm/logicnode/postprocess/LN_set_ssao_settings.py @@ -6,8 +6,7 @@ class SSAOSetNode(ArmLogicTreeNode): bl_label = 'Set SSAO Settings' arm_version = 1 - def init(self, context): - super(SSAOSetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmFloatSocket', 'Radius', default_value=1.0) self.add_input('ArmFloatSocket', 'Strength', default_value=5.0) diff --git a/blender/arm/logicnode/postprocess/LN_set_ssr_settings.py b/blender/arm/logicnode/postprocess/LN_set_ssr_settings.py index fd6bb111..9e3da739 100644 --- a/blender/arm/logicnode/postprocess/LN_set_ssr_settings.py +++ b/blender/arm/logicnode/postprocess/LN_set_ssr_settings.py @@ -6,8 +6,7 @@ class SSRSetNode(ArmLogicTreeNode): bl_label = 'Set SSR Settings' arm_version = 1 - def init(self, context): - super(SSRSetNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmFloatSocket', 'SSR Step', default_value=0.04) self.add_input('ArmFloatSocket', 'SSR Step Min', default_value=0.05) diff --git a/blender/arm/logicnode/random/LN_random_boolean.py b/blender/arm/logicnode/random/LN_random_boolean.py index 039a2c91..1a2f46b3 100644 --- a/blender/arm/logicnode/random/LN_random_boolean.py +++ b/blender/arm/logicnode/random/LN_random_boolean.py @@ -7,6 +7,5 @@ class RandomBooleanNode(ArmLogicTreeNode): bl_label = 'Random Boolean' arm_version = 1 - def init(self, context): - super(RandomBooleanNode, self).init(context) + def arm_init(self, context): self.add_output('ArmBoolSocket', 'Bool') diff --git a/blender/arm/logicnode/random/LN_random_choice.py b/blender/arm/logicnode/random/LN_random_choice.py index ee273513..7ba4749a 100644 --- a/blender/arm/logicnode/random/LN_random_choice.py +++ b/blender/arm/logicnode/random/LN_random_choice.py @@ -7,8 +7,7 @@ class RandomChoiceNode(ArmLogicTreeNode): bl_label = 'Random Choice' arm_version = 1 - def init(self, context): - super().init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketArray', 'Array') self.add_output('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/random/LN_random_color.py b/blender/arm/logicnode/random/LN_random_color.py index 38c36442..9d142b15 100644 --- a/blender/arm/logicnode/random/LN_random_color.py +++ b/blender/arm/logicnode/random/LN_random_color.py @@ -7,6 +7,5 @@ class RandomColorNode(ArmLogicTreeNode): bl_label = 'Random Color' arm_version = 1 - def init(self, context): - super(RandomColorNode, self).init(context) + def arm_init(self, context): self.add_output('ArmColorSocket', 'Color') diff --git a/blender/arm/logicnode/random/LN_random_float.py b/blender/arm/logicnode/random/LN_random_float.py index 22dca241..7bb08dde 100644 --- a/blender/arm/logicnode/random/LN_random_float.py +++ b/blender/arm/logicnode/random/LN_random_float.py @@ -7,8 +7,7 @@ class RandomFloatNode(ArmLogicTreeNode): bl_label = 'Random Float' arm_version = 1 - def init(self, context): - super(RandomFloatNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Min') self.add_input('ArmFloatSocket', 'Max', default_value=1.0) # self.add_input('ArmIntSocket', 'Seed') diff --git a/blender/arm/logicnode/random/LN_random_integer.py b/blender/arm/logicnode/random/LN_random_integer.py index 0b69d5a7..166a2f0a 100644 --- a/blender/arm/logicnode/random/LN_random_integer.py +++ b/blender/arm/logicnode/random/LN_random_integer.py @@ -7,8 +7,7 @@ class RandomIntegerNode(ArmLogicTreeNode): bl_label = 'Random Integer' arm_version = 1 - def init(self, context): - super(RandomIntegerNode, self).init(context) + def arm_init(self, context): self.add_input('ArmIntSocket', 'Min') self.add_input('ArmIntSocket', 'Max', default_value=2) self.add_output('ArmIntSocket', 'Int') diff --git a/blender/arm/logicnode/random/LN_random_output.py b/blender/arm/logicnode/random/LN_random_output.py index fc41b35d..72f249f3 100644 --- a/blender/arm/logicnode/random/LN_random_output.py +++ b/blender/arm/logicnode/random/LN_random_output.py @@ -11,8 +11,7 @@ class RandomOutputNode(ArmLogicTreeNode): def __init__(self): array_nodes[str(id(self))] = self - def init(self, context): - super().init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') diff --git a/blender/arm/logicnode/random/LN_random_vector.py b/blender/arm/logicnode/random/LN_random_vector.py index 11161f8e..b49beabe 100644 --- a/blender/arm/logicnode/random/LN_random_vector.py +++ b/blender/arm/logicnode/random/LN_random_vector.py @@ -7,8 +7,7 @@ class RandomVectorNode(ArmLogicTreeNode): bl_label = 'Random Vector' arm_version = 1 - def init(self, context): - super(RandomVectorNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'Min', default_value=[-1.0, -1.0, -1.0]) self.add_input('ArmVectorSocket', 'Max', default_value=[1.0, 1.0, 1.0]) self.add_output('ArmVectorSocket', 'Vector') diff --git a/blender/arm/logicnode/renderpath/LN_set_msaa_quality.py b/blender/arm/logicnode/renderpath/LN_set_msaa_quality.py index 0578c2d8..81511a03 100644 --- a/blender/arm/logicnode/renderpath/LN_set_msaa_quality.py +++ b/blender/arm/logicnode/renderpath/LN_set_msaa_quality.py @@ -15,8 +15,7 @@ class RpMSAANode(ArmLogicTreeNode): ], name='', default='1') - def init(self, context): - super(RpMSAANode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/renderpath/LN_set_post_process_quality.py b/blender/arm/logicnode/renderpath/LN_set_post_process_quality.py index a2d01c1b..faa883bb 100644 --- a/blender/arm/logicnode/renderpath/LN_set_post_process_quality.py +++ b/blender/arm/logicnode/renderpath/LN_set_post_process_quality.py @@ -15,8 +15,7 @@ class RpConfigNode(ArmLogicTreeNode): ], name='', default='SSGI') - def init(self, context): - super(RpConfigNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmBoolSocket', 'Enable') diff --git a/blender/arm/logicnode/renderpath/LN_set_shader_uniform.py b/blender/arm/logicnode/renderpath/LN_set_shader_uniform.py index 7de5ccfe..8afbcd75 100644 --- a/blender/arm/logicnode/renderpath/LN_set_shader_uniform.py +++ b/blender/arm/logicnode/renderpath/LN_set_shader_uniform.py @@ -33,8 +33,7 @@ class SetShaderUniformNode(ArmLogicTreeNode): description="The type of the uniform", update=on_update_uniform_type) - def init(self, context): - super().init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Uniform Name') self.add_input('ArmFloatSocket', 'Float') diff --git a/blender/arm/logicnode/renderpath/LN_set_shadows_quality.py b/blender/arm/logicnode/renderpath/LN_set_shadows_quality.py index 0d26e950..be16096e 100644 --- a/blender/arm/logicnode/renderpath/LN_set_shadows_quality.py +++ b/blender/arm/logicnode/renderpath/LN_set_shadows_quality.py @@ -13,8 +13,7 @@ class RpShadowQualityNode(ArmLogicTreeNode): ], name='', default='Medium') - def init(self, context): - super(RpShadowQualityNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/renderpath/LN_set_ssaa_quality.py b/blender/arm/logicnode/renderpath/LN_set_ssaa_quality.py index 375b76e2..7608749a 100644 --- a/blender/arm/logicnode/renderpath/LN_set_ssaa_quality.py +++ b/blender/arm/logicnode/renderpath/LN_set_ssaa_quality.py @@ -14,8 +14,7 @@ class RpSuperSampleNode(ArmLogicTreeNode): ], name='', default='1') - def init(self, context): - super(RpSuperSampleNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/scene/LN_collection.py b/blender/arm/logicnode/scene/LN_collection.py index ce4e952c..95d9c5ad 100644 --- a/blender/arm/logicnode/scene/LN_collection.py +++ b/blender/arm/logicnode/scene/LN_collection.py @@ -14,8 +14,7 @@ class GroupNode(ArmLogicTreeNode): property0: HaxePointerProperty('property0', name='', type=bpy.types.Collection) - def init(self, context): - super(GroupNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketArray', 'Array') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/scene/LN_create_collection.py b/blender/arm/logicnode/scene/LN_create_collection.py index 5e6157c3..94e98a01 100644 --- a/blender/arm/logicnode/scene/LN_create_collection.py +++ b/blender/arm/logicnode/scene/LN_create_collection.py @@ -7,8 +7,7 @@ class CreateCollectionNode(ArmLogicTreeNode): arm_section = 'collection' arm_version = 1 - def init(self, context): - super(CreateCollectionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Collection') diff --git a/blender/arm/logicnode/scene/LN_get_collection.py b/blender/arm/logicnode/scene/LN_get_collection.py index 2048650e..74a0f05d 100644 --- a/blender/arm/logicnode/scene/LN_get_collection.py +++ b/blender/arm/logicnode/scene/LN_get_collection.py @@ -10,8 +10,7 @@ class GetGroupNode(ArmLogicTreeNode): arm_section = 'collection' arm_version = 1 - def init(self, context): - super(GetGroupNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'Name') self.add_output('ArmNodeSocketArray', 'Objects') diff --git a/blender/arm/logicnode/scene/LN_get_scene_active.py b/blender/arm/logicnode/scene/LN_get_scene_active.py index 841a3fe1..f99c72c0 100644 --- a/blender/arm/logicnode/scene/LN_get_scene_active.py +++ b/blender/arm/logicnode/scene/LN_get_scene_active.py @@ -6,6 +6,5 @@ class ActiveSceneNode(ArmLogicTreeNode): bl_label = 'Get Scene Active' arm_version = 1 - def init(self, context): - super(ActiveSceneNode, self).init(context) + def arm_init(self, context): self.add_output('ArmDynamicSocket', 'Scene') diff --git a/blender/arm/logicnode/scene/LN_get_scene_root.py b/blender/arm/logicnode/scene/LN_get_scene_root.py index 658cbfa2..2dc4e428 100644 --- a/blender/arm/logicnode/scene/LN_get_scene_root.py +++ b/blender/arm/logicnode/scene/LN_get_scene_root.py @@ -6,6 +6,5 @@ class SceneRootNode(ArmLogicTreeNode): bl_label = 'Get Scene Root' arm_version = 1 - def init(self, context): - super(SceneRootNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketObject', 'Object') diff --git a/blender/arm/logicnode/scene/LN_global_object.py b/blender/arm/logicnode/scene/LN_global_object.py index 015da8ca..ca001743 100644 --- a/blender/arm/logicnode/scene/LN_global_object.py +++ b/blender/arm/logicnode/scene/LN_global_object.py @@ -7,6 +7,5 @@ class GlobalObjectNode(ArmLogicTreeNode): bl_label = 'Global Object' arm_version = 1 - def init(self, context): - super(GlobalObjectNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketObject', 'Object') diff --git a/blender/arm/logicnode/scene/LN_remove_collection.py b/blender/arm/logicnode/scene/LN_remove_collection.py index 3e6d49c5..813c13d6 100644 --- a/blender/arm/logicnode/scene/LN_remove_collection.py +++ b/blender/arm/logicnode/scene/LN_remove_collection.py @@ -7,8 +7,7 @@ class RemoveGroupNode(ArmLogicTreeNode): arm_section = 'collection' arm_version = 1 - def init(self, context): - super(RemoveGroupNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmStringSocket', 'Collection') diff --git a/blender/arm/logicnode/scene/LN_remove_scene_active.py b/blender/arm/logicnode/scene/LN_remove_scene_active.py index 815b941a..4fd2ac66 100644 --- a/blender/arm/logicnode/scene/LN_remove_scene_active.py +++ b/blender/arm/logicnode/scene/LN_remove_scene_active.py @@ -6,8 +6,7 @@ class RemoveActiveSceneNode(ArmLogicTreeNode): bl_label = 'Remove Scene Active' arm_version = 1 - def init(self, context): - super(RemoveActiveSceneNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/scene/LN_scene.py b/blender/arm/logicnode/scene/LN_scene.py index d2ed0b60..c4849838 100644 --- a/blender/arm/logicnode/scene/LN_scene.py +++ b/blender/arm/logicnode/scene/LN_scene.py @@ -11,8 +11,7 @@ class SceneNode(ArmLogicTreeNode): property0_get: HaxePointerProperty('property0_get', name='', type=bpy.types.Scene) - def init(self, context): - super(SceneNode, self).init(context) + def arm_init(self, context): self.add_output('ArmDynamicSocket', 'Scene') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/scene/LN_set_scene_active.py b/blender/arm/logicnode/scene/LN_set_scene_active.py index e839765c..95138c85 100644 --- a/blender/arm/logicnode/scene/LN_set_scene_active.py +++ b/blender/arm/logicnode/scene/LN_set_scene_active.py @@ -6,8 +6,7 @@ class SetSceneNode(ArmLogicTreeNode): bl_label = 'Set Scene Active' arm_version = 1 - def init(self, context): - super(SetSceneNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Scene') diff --git a/blender/arm/logicnode/scene/LN_spawn_collection.py b/blender/arm/logicnode/scene/LN_spawn_collection.py index 72c6db7c..c03ed012 100644 --- a/blender/arm/logicnode/scene/LN_spawn_collection.py +++ b/blender/arm/logicnode/scene/LN_spawn_collection.py @@ -30,8 +30,7 @@ class SpawnCollectionNode(ArmLogicTreeNode): property0: HaxePointerProperty('property0', name='Collection', type=bpy.types.Collection) - def init(self, context): - super(SpawnCollectionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Transform') diff --git a/blender/arm/logicnode/scene/LN_spawn_scene.py b/blender/arm/logicnode/scene/LN_spawn_scene.py index 5a2b50dd..e3df2adb 100644 --- a/blender/arm/logicnode/scene/LN_spawn_scene.py +++ b/blender/arm/logicnode/scene/LN_spawn_scene.py @@ -6,8 +6,7 @@ class SpawnSceneNode(ArmLogicTreeNode): bl_label = 'Spawn Scene' arm_version = 1 - def init(self, context): - super(SpawnSceneNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Scene') self.add_input('ArmDynamicSocket', 'Transform') diff --git a/blender/arm/logicnode/sound/LN_pause_speaker.py b/blender/arm/logicnode/sound/LN_pause_speaker.py index b211a62c..14fb5852 100644 --- a/blender/arm/logicnode/sound/LN_pause_speaker.py +++ b/blender/arm/logicnode/sound/LN_pause_speaker.py @@ -11,8 +11,7 @@ class PauseSpeakerNode(ArmLogicTreeNode): bl_label = 'Pause Speaker' arm_version = 1 - def init(self, context): - super(PauseSpeakerNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Speaker') diff --git a/blender/arm/logicnode/sound/LN_play_sound.py b/blender/arm/logicnode/sound/LN_play_sound.py index ac72729d..47e622d4 100644 --- a/blender/arm/logicnode/sound/LN_play_sound.py +++ b/blender/arm/logicnode/sound/LN_play_sound.py @@ -60,8 +60,7 @@ class PlaySoundNode(ArmLogicTreeNode): default=False ) - def init(self, context): - super(PlaySoundNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'Play') self.add_input('ArmNodeSocketAction', 'Pause') self.add_input('ArmNodeSocketAction', 'Stop') diff --git a/blender/arm/logicnode/sound/LN_play_speaker.py b/blender/arm/logicnode/sound/LN_play_speaker.py index b91446b9..d4fdeb84 100644 --- a/blender/arm/logicnode/sound/LN_play_speaker.py +++ b/blender/arm/logicnode/sound/LN_play_speaker.py @@ -11,8 +11,7 @@ class PlaySpeakerNode(ArmLogicTreeNode): bl_label = 'Play Speaker' arm_version = 1 - def init(self, context): - super(PlaySpeakerNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Speaker') diff --git a/blender/arm/logicnode/sound/LN_stop_speaker.py b/blender/arm/logicnode/sound/LN_stop_speaker.py index 9b5ba8bc..4940133d 100644 --- a/blender/arm/logicnode/sound/LN_stop_speaker.py +++ b/blender/arm/logicnode/sound/LN_stop_speaker.py @@ -11,8 +11,7 @@ class StopSpeakerNode(ArmLogicTreeNode): bl_label = 'Stop Speaker' arm_version = 1 - def init(self, context): - super(StopSpeakerNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Speaker') diff --git a/blender/arm/logicnode/string/LN_concatenate_string.py b/blender/arm/logicnode/string/LN_concatenate_string.py index 0c8c3e13..3467ddee 100644 --- a/blender/arm/logicnode/string/LN_concatenate_string.py +++ b/blender/arm/logicnode/string/LN_concatenate_string.py @@ -10,8 +10,7 @@ class ConcatenateStringNode(ArmLogicTreeNode): super(ConcatenateStringNode, self).__init__() array_nodes[str(id(self))] = self - def init(self, context): - super(ConcatenateStringNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'Input 0') self.add_output('ArmStringSocket', 'String') diff --git a/blender/arm/logicnode/string/LN_parse_float.py b/blender/arm/logicnode/string/LN_parse_float.py index f52fc698..5d14bc34 100644 --- a/blender/arm/logicnode/string/LN_parse_float.py +++ b/blender/arm/logicnode/string/LN_parse_float.py @@ -7,8 +7,7 @@ class ParseFloatNode(ArmLogicTreeNode): arm_section = 'parse' arm_version = 1 - def init(self, context): - super(ParseFloatNode, self).init(context) + def arm_init(self, context): self.add_output('ArmFloatSocket', 'Float') self.add_input('ArmStringSocket', 'String') diff --git a/blender/arm/logicnode/string/LN_split_string.py b/blender/arm/logicnode/string/LN_split_string.py index 79941b81..3b7478aa 100644 --- a/blender/arm/logicnode/string/LN_split_string.py +++ b/blender/arm/logicnode/string/LN_split_string.py @@ -6,8 +6,7 @@ class SplitStringNode(ArmLogicTreeNode): bl_label = 'Split String' arm_version = 1 - def init(self, context): - super(SplitStringNode, self).init(context) + def arm_init(self, context): self.add_output('ArmNodeSocketArray', 'Array') self.add_input('ArmStringSocket', 'String') diff --git a/blender/arm/logicnode/string/LN_string.py b/blender/arm/logicnode/string/LN_string.py index 6b4679c3..d7f4d6c1 100644 --- a/blender/arm/logicnode/string/LN_string.py +++ b/blender/arm/logicnode/string/LN_string.py @@ -6,8 +6,7 @@ class StringNode(ArmLogicTreeNode): bl_label = 'String' arm_version = 1 - def init(self, context): - super(StringNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'String In') self.add_output('ArmStringSocket', 'String Out', is_var=True) diff --git a/blender/arm/logicnode/string/LN_string_case.py b/blender/arm/logicnode/string/LN_string_case.py index 195bb6c1..22619e41 100644 --- a/blender/arm/logicnode/string/LN_string_case.py +++ b/blender/arm/logicnode/string/LN_string_case.py @@ -12,8 +12,7 @@ class CaseStringNode(ArmLogicTreeNode): ], name='', default='Upper Case') - def init(self, context): - super(CaseStringNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'String In') self.add_output('ArmStringSocket', 'String Out') diff --git a/blender/arm/logicnode/string/LN_string_contains.py b/blender/arm/logicnode/string/LN_string_contains.py index aa657ec5..f9811baf 100644 --- a/blender/arm/logicnode/string/LN_string_contains.py +++ b/blender/arm/logicnode/string/LN_string_contains.py @@ -13,8 +13,7 @@ class ContainsStringNode(ArmLogicTreeNode): ], name='', default='Contains') - def init(self, context): - super(ContainsStringNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'String') self.add_input('ArmStringSocket', 'Find') diff --git a/blender/arm/logicnode/string/LN_string_length.py b/blender/arm/logicnode/string/LN_string_length.py index 9037a1ed..5edf39cb 100644 --- a/blender/arm/logicnode/string/LN_string_length.py +++ b/blender/arm/logicnode/string/LN_string_length.py @@ -6,8 +6,7 @@ class LengthStringNode(ArmLogicTreeNode): bl_label = 'String Length' arm_version = 1 - def init(self, context): - super(LengthStringNode, self).init(context) + def arm_init(self, context): self.add_output('ArmIntSocket', 'Length') self.add_input('ArmStringSocket', 'String') diff --git a/blender/arm/logicnode/string/LN_sub_string.py b/blender/arm/logicnode/string/LN_sub_string.py index b3b0a7c0..647d0e64 100644 --- a/blender/arm/logicnode/string/LN_sub_string.py +++ b/blender/arm/logicnode/string/LN_sub_string.py @@ -6,8 +6,7 @@ class SubStringNode(ArmLogicTreeNode): bl_label = 'Sub String' arm_version = 1 - def init(self, context): - super(SubStringNode, self).init(context) + def arm_init(self, context): self.add_input('ArmStringSocket', 'String In') self.add_input('ArmIntSocket', 'Start') self.add_input('ArmIntSocket', 'End') diff --git a/blender/arm/logicnode/trait/LN_add_trait_to_object.py b/blender/arm/logicnode/trait/LN_add_trait_to_object.py index c2fe8847..aac4a5f3 100644 --- a/blender/arm/logicnode/trait/LN_add_trait_to_object.py +++ b/blender/arm/logicnode/trait/LN_add_trait_to_object.py @@ -6,8 +6,7 @@ class AddTraitNode(ArmLogicTreeNode): bl_label = 'Add Trait to Object' arm_version = 1 - def init(self, context): - super(AddTraitNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmDynamicSocket', 'Trait') diff --git a/blender/arm/logicnode/trait/LN_get_object_trait.py b/blender/arm/logicnode/trait/LN_get_object_trait.py index 7014a2f8..b0890ab2 100644 --- a/blender/arm/logicnode/trait/LN_get_object_trait.py +++ b/blender/arm/logicnode/trait/LN_get_object_trait.py @@ -7,8 +7,7 @@ class GetTraitNode(ArmLogicTreeNode): bl_label = 'Get Object Trait' arm_version = 1 - def init(self, context): - super(GetTraitNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmStringSocket', 'Name') diff --git a/blender/arm/logicnode/trait/LN_get_object_traits.py b/blender/arm/logicnode/trait/LN_get_object_traits.py index ab80f3ce..7fd1dfae 100644 --- a/blender/arm/logicnode/trait/LN_get_object_traits.py +++ b/blender/arm/logicnode/trait/LN_get_object_traits.py @@ -6,8 +6,7 @@ class GetObjectTraitsNode(ArmLogicTreeNode): bl_label = 'Get Object Traits' arm_version = 1 - def init(self, context): - super(GetObjectTraitsNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmNodeSocketArray', 'Traits') diff --git a/blender/arm/logicnode/trait/LN_get_trait_name.py b/blender/arm/logicnode/trait/LN_get_trait_name.py index c8156da5..9a34fd70 100644 --- a/blender/arm/logicnode/trait/LN_get_trait_name.py +++ b/blender/arm/logicnode/trait/LN_get_trait_name.py @@ -6,8 +6,7 @@ class GetTraitNameNode(ArmLogicTreeNode): bl_label = 'Get Trait Name' arm_version = 1 - def init(self, context): - super(GetTraitNameNode, self).init(context) + def arm_init(self, context): self.add_input('ArmDynamicSocket', 'Trait') self.add_output('ArmStringSocket', 'Name') diff --git a/blender/arm/logicnode/trait/LN_get_trait_paused.py b/blender/arm/logicnode/trait/LN_get_trait_paused.py index 286df85d..12f1ac0d 100644 --- a/blender/arm/logicnode/trait/LN_get_trait_paused.py +++ b/blender/arm/logicnode/trait/LN_get_trait_paused.py @@ -6,8 +6,7 @@ class GetTraitPausedNode(ArmLogicTreeNode): bl_label = 'Get Trait Paused' arm_version = 1 - def init(self, context): - super(GetTraitPausedNode, self).init(context) + def arm_init(self, context): self.add_input('ArmDynamicSocket', 'Trait') self.add_output('ArmBoolSocket', 'Is Paused') diff --git a/blender/arm/logicnode/trait/LN_remove_trait.py b/blender/arm/logicnode/trait/LN_remove_trait.py index 0d40e82a..7e81f12c 100644 --- a/blender/arm/logicnode/trait/LN_remove_trait.py +++ b/blender/arm/logicnode/trait/LN_remove_trait.py @@ -6,8 +6,7 @@ class RemoveTraitNode(ArmLogicTreeNode): bl_label = 'Remove Trait' arm_version = 1 - def init(self, context): - super(RemoveTraitNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Trait') diff --git a/blender/arm/logicnode/trait/LN_self_trait.py b/blender/arm/logicnode/trait/LN_self_trait.py index 5e3c85b7..41b09676 100644 --- a/blender/arm/logicnode/trait/LN_self_trait.py +++ b/blender/arm/logicnode/trait/LN_self_trait.py @@ -6,6 +6,5 @@ class SelfTraitNode(ArmLogicTreeNode): bl_label = 'Self Trait' arm_version = 1 - def init(self, context): - super(SelfTraitNode, self).init(context) + def arm_init(self, context): self.add_output('ArmDynamicSocket', 'Trait') diff --git a/blender/arm/logicnode/trait/LN_set_trait_paused.py b/blender/arm/logicnode/trait/LN_set_trait_paused.py index 6c4b595c..739692dd 100644 --- a/blender/arm/logicnode/trait/LN_set_trait_paused.py +++ b/blender/arm/logicnode/trait/LN_set_trait_paused.py @@ -6,8 +6,7 @@ class SetTraitPausedNode(ArmLogicTreeNode): bl_label = 'Set Trait Paused' arm_version = 1 - def init(self, context): - super(SetTraitPausedNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Trait') self.add_input('ArmBoolSocket', 'Paused') diff --git a/blender/arm/logicnode/trait/LN_trait.py b/blender/arm/logicnode/trait/LN_trait.py index 4ed2a6dd..bc1b85ef 100644 --- a/blender/arm/logicnode/trait/LN_trait.py +++ b/blender/arm/logicnode/trait/LN_trait.py @@ -10,8 +10,7 @@ class TraitNode(ArmLogicTreeNode): property0: HaxeStringProperty('property0', name='', default='') - def init(self, context): - super(TraitNode, self).init(context) + def arm_init(self, context): self.add_output('ArmDynamicSocket', 'Trait', is_var=True) def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/transform/LN_append_transform.py b/blender/arm/logicnode/transform/LN_append_transform.py index 81a087c0..3a85088e 100644 --- a/blender/arm/logicnode/transform/LN_append_transform.py +++ b/blender/arm/logicnode/transform/LN_append_transform.py @@ -6,8 +6,7 @@ class AppendTransformNode(ArmLogicTreeNode): bl_label = 'Append Transform' arm_version = 1 - def init(self, context): - super(AppendTransformNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmDynamicSocket', 'Transform') diff --git a/blender/arm/logicnode/transform/LN_get_object_location.py b/blender/arm/logicnode/transform/LN_get_object_location.py index 06b15234..f2e3fb58 100644 --- a/blender/arm/logicnode/transform/LN_get_object_location.py +++ b/blender/arm/logicnode/transform/LN_get_object_location.py @@ -7,8 +7,7 @@ class GetLocationNode(ArmLogicTreeNode): arm_section = 'location' arm_version = 1 - def init(self, context): - super(GetLocationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmVectorSocket', 'Location') diff --git a/blender/arm/logicnode/transform/LN_get_object_rotation.py b/blender/arm/logicnode/transform/LN_get_object_rotation.py index 821a47d8..af3ba965 100644 --- a/blender/arm/logicnode/transform/LN_get_object_rotation.py +++ b/blender/arm/logicnode/transform/LN_get_object_rotation.py @@ -7,8 +7,7 @@ class GetRotationNode(ArmLogicTreeNode): arm_section = 'rotation' arm_version = 1 - def init(self, context): - super(GetRotationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmVectorSocket', 'Euler Angles') diff --git a/blender/arm/logicnode/transform/LN_get_object_scale.py b/blender/arm/logicnode/transform/LN_get_object_scale.py index f6f1ff56..67d5d5df 100644 --- a/blender/arm/logicnode/transform/LN_get_object_scale.py +++ b/blender/arm/logicnode/transform/LN_get_object_scale.py @@ -7,8 +7,7 @@ class GetScaleNode(ArmLogicTreeNode): arm_section = 'scale' arm_version = 1 - def init(self, context): - super(GetScaleNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmVectorSocket', 'Scale') diff --git a/blender/arm/logicnode/transform/LN_get_object_transform.py b/blender/arm/logicnode/transform/LN_get_object_transform.py index a10163ae..347dc81b 100644 --- a/blender/arm/logicnode/transform/LN_get_object_transform.py +++ b/blender/arm/logicnode/transform/LN_get_object_transform.py @@ -8,8 +8,7 @@ class GetTransformNode(ArmLogicTreeNode): bl_label = 'Get Object Transform' arm_version = 1 - def init(self, context): - super(GetTransformNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmDynamicSocket', 'Transform') diff --git a/blender/arm/logicnode/transform/LN_get_world_orientation.py b/blender/arm/logicnode/transform/LN_get_world_orientation.py index 28c074c6..9e9b7de4 100644 --- a/blender/arm/logicnode/transform/LN_get_world_orientation.py +++ b/blender/arm/logicnode/transform/LN_get_world_orientation.py @@ -14,8 +14,7 @@ class GetWorldNode(ArmLogicTreeNode): ('Up', 'Up', 'The object up (Z) direction')], name='', default='Look') - def init(self, context): - super(GetWorldNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmVectorSocket', 'Vector') diff --git a/blender/arm/logicnode/transform/LN_look_at.py b/blender/arm/logicnode/transform/LN_look_at.py index a38b20f2..f2bc1bde 100644 --- a/blender/arm/logicnode/transform/LN_look_at.py +++ b/blender/arm/logicnode/transform/LN_look_at.py @@ -17,8 +17,7 @@ class LookAtNode(ArmLogicTreeNode): ('-Z', '-Z', '-Z')], name='With', default='Z') - def init(self, context): - super(LookAtNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'From Location') self.add_input('ArmVectorSocket', 'To Location') diff --git a/blender/arm/logicnode/transform/LN_rotate_object.py b/blender/arm/logicnode/transform/LN_rotate_object.py index 773c245f..0e22ede6 100644 --- a/blender/arm/logicnode/transform/LN_rotate_object.py +++ b/blender/arm/logicnode/transform/LN_rotate_object.py @@ -7,8 +7,7 @@ class RotateObjectNode(ArmLogicTreeNode): arm_section = 'rotation' arm_version = 1 - def init(self, context): - super().init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmVectorSocket', 'Euler Angles') diff --git a/blender/arm/logicnode/transform/LN_separate_transform.py b/blender/arm/logicnode/transform/LN_separate_transform.py index 28762a17..66cb1e7f 100644 --- a/blender/arm/logicnode/transform/LN_separate_transform.py +++ b/blender/arm/logicnode/transform/LN_separate_transform.py @@ -6,8 +6,7 @@ class SeparateTransformNode(ArmLogicTreeNode): bl_label = 'Separate Transform' arm_version = 1 - def init(self, context): - super(SeparateTransformNode, self).init(context) + def arm_init(self, context): self.add_input('ArmDynamicSocket', 'Transform') self.add_output('ArmVectorSocket', 'Location') diff --git a/blender/arm/logicnode/transform/LN_set_object_location.py b/blender/arm/logicnode/transform/LN_set_object_location.py index 36a665b5..84473c80 100644 --- a/blender/arm/logicnode/transform/LN_set_object_location.py +++ b/blender/arm/logicnode/transform/LN_set_object_location.py @@ -7,8 +7,7 @@ class SetLocationNode(ArmLogicTreeNode): arm_section = 'location' arm_version = 1 - def init(self, context): - super(SetLocationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmVectorSocket', 'Location') diff --git a/blender/arm/logicnode/transform/LN_set_object_rotation.py b/blender/arm/logicnode/transform/LN_set_object_rotation.py index ac563ff5..6b7efbd9 100644 --- a/blender/arm/logicnode/transform/LN_set_object_rotation.py +++ b/blender/arm/logicnode/transform/LN_set_object_rotation.py @@ -7,8 +7,7 @@ class SetRotationNode(ArmLogicTreeNode): arm_section = 'rotation' arm_version = 1 - def init(self, context): - super(SetRotationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmVectorSocket', 'Euler Angles / Vector XYZ') diff --git a/blender/arm/logicnode/transform/LN_set_object_scale.py b/blender/arm/logicnode/transform/LN_set_object_scale.py index d797cba3..7f7221d9 100644 --- a/blender/arm/logicnode/transform/LN_set_object_scale.py +++ b/blender/arm/logicnode/transform/LN_set_object_scale.py @@ -7,8 +7,7 @@ class SetScaleNode(ArmLogicTreeNode): arm_section = 'scale' arm_version = 1 - def init(self, context): - super(SetScaleNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmVectorSocket', 'Scale', default_value=[1.0, 1.0, 1.0]) diff --git a/blender/arm/logicnode/transform/LN_set_object_transform.py b/blender/arm/logicnode/transform/LN_set_object_transform.py index 99b08ac7..1a139551 100644 --- a/blender/arm/logicnode/transform/LN_set_object_transform.py +++ b/blender/arm/logicnode/transform/LN_set_object_transform.py @@ -6,8 +6,7 @@ class SetTransformNode(ArmLogicTreeNode): bl_label = 'Set Object Transform' arm_version = 1 - def init(self, context): - super(SetTransformNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmDynamicSocket', 'Transform') diff --git a/blender/arm/logicnode/transform/LN_transform.py b/blender/arm/logicnode/transform/LN_transform.py index 95c1fea4..7e7edd42 100644 --- a/blender/arm/logicnode/transform/LN_transform.py +++ b/blender/arm/logicnode/transform/LN_transform.py @@ -6,8 +6,7 @@ class TransformNode(ArmLogicTreeNode): bl_label = 'Transform' arm_version = 1 - def init(self, context): - super(TransformNode, self).init(context) + def arm_init(self, context): self.add_input('ArmVectorSocket', 'Location') self.add_input('ArmVectorSocket', 'Rotation') self.add_input('ArmVectorSocket', 'Scale', default_value=[1.0, 1.0, 1.0]) diff --git a/blender/arm/logicnode/transform/LN_transform_math.py b/blender/arm/logicnode/transform/LN_transform_math.py index 70a7b5dc..bc5a90a2 100644 --- a/blender/arm/logicnode/transform/LN_transform_math.py +++ b/blender/arm/logicnode/transform/LN_transform_math.py @@ -6,8 +6,7 @@ class TransformMathNode(ArmLogicTreeNode): bl_label = 'Transform Math' arm_version = 1 - def init(self, context): - super(TransformMathNode, self).init(context) + def arm_init(self, context): self.add_input('ArmDynamicSocket', 'Transform 1') self.add_input('ArmDynamicSocket', 'Transform 2') diff --git a/blender/arm/logicnode/transform/LN_transform_to_vector.py b/blender/arm/logicnode/transform/LN_transform_to_vector.py index 9b01681d..222f8abb 100644 --- a/blender/arm/logicnode/transform/LN_transform_to_vector.py +++ b/blender/arm/logicnode/transform/LN_transform_to_vector.py @@ -6,8 +6,7 @@ class VectorFromTransformNode(ArmLogicTreeNode): bl_label = 'Transform to Vector' arm_version = 1 - def init(self, context): - super(VectorFromTransformNode, self).init(context) + def arm_init(self, context): self.add_input('ArmDynamicSocket', 'Transform') self.add_output('ArmVectorSocket', 'Vector') diff --git a/blender/arm/logicnode/transform/LN_translate_object.py b/blender/arm/logicnode/transform/LN_translate_object.py index 9076e9ad..d5964666 100644 --- a/blender/arm/logicnode/transform/LN_translate_object.py +++ b/blender/arm/logicnode/transform/LN_translate_object.py @@ -7,8 +7,7 @@ class TranslateObjectNode(ArmLogicTreeNode): arm_section = 'location' arm_version = 1 - def init(self, context): - super(TranslateObjectNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmVectorSocket', 'Vector') diff --git a/blender/arm/logicnode/transform/LN_translate_on_local_axis.py b/blender/arm/logicnode/transform/LN_translate_on_local_axis.py index 35456dad..08192fe6 100644 --- a/blender/arm/logicnode/transform/LN_translate_on_local_axis.py +++ b/blender/arm/logicnode/transform/LN_translate_on_local_axis.py @@ -8,8 +8,7 @@ class TranslateOnLocalAxisNode(ArmLogicTreeNode): arm_section = 'location' arm_version = 1 - def init(self, context): - super(TranslateOnLocalAxisNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmFloatSocket', 'Speed') diff --git a/blender/arm/logicnode/transform/LN_vector_to_object_orientation.py b/blender/arm/logicnode/transform/LN_vector_to_object_orientation.py index 2b064684..e9f0ef6c 100644 --- a/blender/arm/logicnode/transform/LN_vector_to_object_orientation.py +++ b/blender/arm/logicnode/transform/LN_vector_to_object_orientation.py @@ -1,7 +1,7 @@ from arm.logicnode.arm_nodes import * class VectorToObjectOrientationNode(ArmLogicTreeNode): - """Converts the given world vector to a vector oriented by the given object. + """Converts the given world vector to a vector oriented by the given object. The object scale is taken in count. @seeNode World Vector To Object Space @@ -13,8 +13,7 @@ class VectorToObjectOrientationNode(ArmLogicTreeNode): arm_section = 'location' arm_version = 1 - def init(self, context): - super(VectorToObjectOrientationNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmVectorSocket', 'World') diff --git a/blender/arm/logicnode/transform/LN_world_vector_to_local_space.py b/blender/arm/logicnode/transform/LN_world_vector_to_local_space.py index 0895659e..c0e0d20a 100644 --- a/blender/arm/logicnode/transform/LN_world_vector_to_local_space.py +++ b/blender/arm/logicnode/transform/LN_world_vector_to_local_space.py @@ -1,7 +1,7 @@ from arm.logicnode.arm_nodes import * class WorldVectorToLocalSpaceNode(ArmLogicTreeNode): - """Converts the given world vector to a object space vector. + """Converts the given world vector to a object space vector. The object scale is taken in count. @seeNode Vector To Object Orientation @@ -13,8 +13,7 @@ class WorldVectorToLocalSpaceNode(ArmLogicTreeNode): arm_section = 'location' arm_version = 1 - def init(self, context): - super(WorldVectorToLocalSpaceNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmVectorSocket', 'World') diff --git a/blender/arm/logicnode/variable/LN_boolean.py b/blender/arm/logicnode/variable/LN_boolean.py index 810cdfc9..f1769d8f 100644 --- a/blender/arm/logicnode/variable/LN_boolean.py +++ b/blender/arm/logicnode/variable/LN_boolean.py @@ -7,8 +7,7 @@ class BooleanNode(ArmLogicTreeNode): bl_label = 'Boolean' arm_version = 1 - def init(self, context): - super(BooleanNode, self).init(context) + def arm_init(self, context): self.add_input('ArmBoolSocket', 'Bool In') self.add_output('ArmBoolSocket', 'Bool Out', is_var=True) diff --git a/blender/arm/logicnode/variable/LN_color.py b/blender/arm/logicnode/variable/LN_color.py index 3f7f805e..92ff7140 100644 --- a/blender/arm/logicnode/variable/LN_color.py +++ b/blender/arm/logicnode/variable/LN_color.py @@ -6,8 +6,7 @@ class ColorNode(ArmLogicTreeNode): bl_label = 'Color' arm_version = 1 - def init(self, context): - super(ColorNode, self).init(context) + def arm_init(self, context): self.add_input('ArmColorSocket', 'Color In', default_value=[1.0, 1.0, 1.0, 1.0]) self.add_output('ArmColorSocket', 'Color Out', is_var=True) diff --git a/blender/arm/logicnode/variable/LN_dynamic.py b/blender/arm/logicnode/variable/LN_dynamic.py index 11e1e73e..e1465c99 100644 --- a/blender/arm/logicnode/variable/LN_dynamic.py +++ b/blender/arm/logicnode/variable/LN_dynamic.py @@ -6,6 +6,5 @@ class DynamicNode(ArmLogicTreeNode): bl_label = 'Dynamic' arm_version = 1 - def init(self, context): - super(DynamicNode, self).init(context) + def arm_init(self, context): self.add_output('ArmDynamicSocket', 'Dynamic', is_var=True) diff --git a/blender/arm/logicnode/variable/LN_float.py b/blender/arm/logicnode/variable/LN_float.py index b660e53f..abd2caae 100644 --- a/blender/arm/logicnode/variable/LN_float.py +++ b/blender/arm/logicnode/variable/LN_float.py @@ -9,7 +9,6 @@ class FloatNode(ArmLogicTreeNode): bl_label = 'Float' arm_version = 1 - def init(self, context): - super(FloatNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'Float In') self.add_output('ArmFloatSocket', 'Float Out', is_var=True) diff --git a/blender/arm/logicnode/variable/LN_integer.py b/blender/arm/logicnode/variable/LN_integer.py index fb16b2d5..89dd5d54 100644 --- a/blender/arm/logicnode/variable/LN_integer.py +++ b/blender/arm/logicnode/variable/LN_integer.py @@ -6,7 +6,6 @@ class IntegerNode(ArmLogicTreeNode): bl_label = 'Integer' arm_version = 1 - def init(self, context): - super(IntegerNode, self).init(context) + def arm_init(self, context): self.add_input('ArmIntSocket', 'Int In') self.add_output('ArmIntSocket', 'Int Out', is_var=True) diff --git a/blender/arm/logicnode/variable/LN_mask.py b/blender/arm/logicnode/variable/LN_mask.py index 68ec954f..4be96e2a 100644 --- a/blender/arm/logicnode/variable/LN_mask.py +++ b/blender/arm/logicnode/variable/LN_mask.py @@ -6,8 +6,7 @@ class MaskNode(ArmLogicTreeNode): bl_label = 'Mask' arm_version = 1 - def init(self, context): - super(MaskNode, self).init(context) + def arm_init(self, context): for i in range(1, 21): label = 'Group {:02d}'.format(i) self.inputs.new('ArmBoolSocket', label) diff --git a/blender/arm/logicnode/variable/LN_quaternion.py b/blender/arm/logicnode/variable/LN_quaternion.py index 15eb6ca2..7316dbab 100644 --- a/blender/arm/logicnode/variable/LN_quaternion.py +++ b/blender/arm/logicnode/variable/LN_quaternion.py @@ -7,8 +7,7 @@ class QuaternionNode(ArmLogicTreeNode): arm_section = 'quaternions' arm_version = 1 - def init(self, context): - super(QuaternionNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'X') self.add_input('ArmFloatSocket', 'Y') self.add_input('ArmFloatSocket', 'Z') diff --git a/blender/arm/logicnode/variable/LN_set_variable.py b/blender/arm/logicnode/variable/LN_set_variable.py index ae729ee7..411aca6a 100644 --- a/blender/arm/logicnode/variable/LN_set_variable.py +++ b/blender/arm/logicnode/variable/LN_set_variable.py @@ -13,8 +13,7 @@ class SetVariableNode(ArmLogicTreeNode): arm_section = 'set' arm_version = 1 - def init(self, context): - super(SetVariableNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmDynamicSocket', 'Variable', is_var=True) self.add_input('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/variable/LN_vector.py b/blender/arm/logicnode/variable/LN_vector.py index d93cd2c6..19cf02e7 100644 --- a/blender/arm/logicnode/variable/LN_vector.py +++ b/blender/arm/logicnode/variable/LN_vector.py @@ -6,8 +6,7 @@ class VectorNode(ArmLogicTreeNode): bl_label = 'Vector' arm_version = 1 - def init(self, context): - super(VectorNode, self).init(context) + def arm_init(self, context): self.add_input('ArmFloatSocket', 'X') self.add_input('ArmFloatSocket', 'Y') self.add_input('ArmFloatSocket', 'Z') diff --git a/blender/arm/make_logic.py b/blender/arm/make_logic.py index cc6b9a4d..3299e085 100755 --- a/blender/arm/make_logic.py +++ b/blender/arm/make_logic.py @@ -159,7 +159,7 @@ def build_node(node: bpy.types.Node, f: TextIO) -> Optional[str]: # Properties for prop_name in arm.node_utils.get_haxe_property_names(node): - prop = arm.node_utils.haxe_format_prop(node, prop_name) + prop = arm.node_utils.haxe_format_prop_value(node, prop_name) f.write('\t\t' + name + '.' + prop_name + ' = ' + prop + ';\n') # Create inputs @@ -262,7 +262,6 @@ def get_root_nodes(node_group): def build_default_node(inp: bpy.types.NodeSocket): """Creates a new node to give a not connected input socket a value""" - is_custom_socket = isinstance(inp, arm.logicnode.arm_sockets.ArmCustomSocket) if is_custom_socket: diff --git a/blender/arm/node_utils.py b/blender/arm/node_utils.py index 2a9621fe..747360d5 100755 --- a/blender/arm/node_utils.py +++ b/blender/arm/node_utils.py @@ -151,7 +151,7 @@ def haxe_format_socket_val(socket_val: Any, array_outer_brackets=True) -> str: return str(socket_val) -def haxe_format_prop(node: bpy.types.Node, prop_name: str) -> str: +def haxe_format_prop_value(node: bpy.types.Node, prop_name: str) -> str: """Formats a property value to be valid Haxe syntax.""" prop_value = getattr(node, prop_name) if isinstance(prop_value, str): diff --git a/blender/arm/write_data.py b/blender/arm/write_data.py index 4d2aadda..8e2e01ad 100755 --- a/blender/arm/write_data.py +++ b/blender/arm/write_data.py @@ -174,6 +174,9 @@ project.addSources('Sources'); import_traits.append('armory.trait.internal.Bridge') if live_patch: assets.add_khafile_def('arm_patch') + # Include all logic node classes so that they can later + # get instantiated + khafile.write("""project.addParameter("--macro include('armory.logicnode')");\n""") import_traits = list(set(import_traits)) for i in range(0, len(import_traits)):