diff --git a/blender/arm/logicnode/animation/LN_get_bone_fk_ik_only.py b/blender/arm/logicnode/animation/LN_get_bone_fk_ik_only.py index 165b946d..21afb1ee 100644 --- a/blender/arm/logicnode/animation/LN_get_bone_fk_ik_only.py +++ b/blender/arm/logicnode/animation/LN_get_bone_fk_ik_only.py @@ -7,8 +7,7 @@ class GetBoneFkIkOnlyNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'armature' - def init(self, context): - super(GetBoneFkIkOnlyNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Bone') - self.add_output('NodeSocketBool', 'FK or IK only') \ No newline at end of file + self.add_input('ArmStringSocket', 'Bone') + self.add_output('ArmBoolSocket', 'FK or IK only') diff --git a/blender/arm/logicnode/animation/LN_get_bone_transform.py b/blender/arm/logicnode/animation/LN_get_bone_transform.py index 0d21ea23..1ce69e7a 100644 --- a/blender/arm/logicnode/animation/LN_get_bone_transform.py +++ b/blender/arm/logicnode/animation/LN_get_bone_transform.py @@ -7,8 +7,7 @@ class GetBoneTransformNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'armature' - def init(self, context): - super(GetBoneTransformNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Bone') - self.add_output('NodeSocketShader', 'Transform') \ No newline at end of file + self.add_input('ArmStringSocket', 'Bone') + self.add_output('ArmDynamicSocket', 'Transform') diff --git a/blender/arm/logicnode/animation/LN_set_bone_fk_ik_only.py b/blender/arm/logicnode/animation/LN_set_bone_fk_ik_only.py index 2594183a..8ed6ce45 100644 --- a/blender/arm/logicnode/animation/LN_set_bone_fk_ik_only.py +++ b/blender/arm/logicnode/animation/LN_set_bone_fk_ik_only.py @@ -7,11 +7,10 @@ class SetBoneFkIkOnlyNode(ArmLogicTreeNode): arm_version = 1 arm_section = 'armature' - def init(self, context): - super(SetBoneFkIkOnlyNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Bone') - self.add_input('NodeSocketBool', 'FK or IK only') + self.add_input('ArmStringSocket', 'Bone') + self.add_input('ArmBoolSocket', 'FK or IK only') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/input/LN_get_gamepad_started.py b/blender/arm/logicnode/input/LN_get_gamepad_started.py index edfbc040..08fd5fd0 100644 --- a/blender/arm/logicnode/input/LN_get_gamepad_started.py +++ b/blender/arm/logicnode/input/LN_get_gamepad_started.py @@ -6,10 +6,9 @@ class GetGamepadStartedNode(ArmLogicTreeNode): bl_label = 'Get Gamepad Started' arm_version = 1 - def init(self, context): - super(GetGamepadStartedNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketInt', 'Index') + self.add_input('ArmIntSocket', 'Index') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketString', 'Button') + self.add_output('ArmStringSocket', 'Button') diff --git a/blender/arm/logicnode/input/LN_get_input_map_key.py b/blender/arm/logicnode/input/LN_get_input_map_key.py index 12d98935..5368a9d3 100644 --- a/blender/arm/logicnode/input/LN_get_input_map_key.py +++ b/blender/arm/logicnode/input/LN_get_input_map_key.py @@ -6,10 +6,9 @@ class GetInputMapKeyNode(ArmLogicTreeNode): bl_label = 'Get Input Map Key' arm_version = 1 - def init(self, context): - super(GetInputMapKeyNode, self).init(context) - self.add_input('NodeSocketString', 'Input Map') - self.add_input('NodeSocketString', 'Key') + def arm_init(self, context): + self.add_input('ArmStringSocket', 'Input Map') + self.add_input('ArmStringSocket', 'Key') - self.add_output('NodeSocketFloat', 'Scale', default_value = 1.0) - self.add_output('NodeSocketFloat', 'Deadzone') \ No newline at end of file + self.add_output('ArmFloatSocket', 'Scale', default_value = 1.0) + self.add_output('ArmFloatSocket', 'Deadzone') diff --git a/blender/arm/logicnode/input/LN_get_keyboard_started.py b/blender/arm/logicnode/input/LN_get_keyboard_started.py index 0f655b04..1810c6e0 100644 --- a/blender/arm/logicnode/input/LN_get_keyboard_started.py +++ b/blender/arm/logicnode/input/LN_get_keyboard_started.py @@ -6,9 +6,8 @@ class GetKeyboardStartedNode(ArmLogicTreeNode): bl_label = 'Get Keyboard Started' arm_version = 1 - def init(self, context): - super(GetKeyboardStartedNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketString', 'Key') + self.add_output('ArmStringSocket', 'Key') diff --git a/blender/arm/logicnode/input/LN_get_mouse_started.py b/blender/arm/logicnode/input/LN_get_mouse_started.py index 368aa433..9a6fce1f 100644 --- a/blender/arm/logicnode/input/LN_get_mouse_started.py +++ b/blender/arm/logicnode/input/LN_get_mouse_started.py @@ -6,9 +6,8 @@ class GetMouseStartedNode(ArmLogicTreeNode): bl_label = 'Get Mouse Started' arm_version = 1 - def init(self, context): - super(GetMouseStartedNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketString', 'Button') + self.add_output('ArmStringSocket', 'Button') diff --git a/blender/arm/logicnode/input/LN_on_input_map.py b/blender/arm/logicnode/input/LN_on_input_map.py index 0cc540f5..c851eefe 100644 --- a/blender/arm/logicnode/input/LN_on_input_map.py +++ b/blender/arm/logicnode/input/LN_on_input_map.py @@ -6,11 +6,10 @@ class OnInputMapNode(ArmLogicTreeNode): bl_label = 'On Input Map' arm_version = 1 - def init(self, context): - super(OnInputMapNode, self).init(context) - self.add_input('NodeSocketString', 'Input Map') + def arm_init(self, context): + self.add_input('ArmStringSocket', 'Input Map') self.add_output('ArmNodeSocketAction', 'Started') self.add_output('ArmNodeSocketAction', 'Released') - self.add_output('NodeSocketFloat', 'Value') - self.add_output('NodeSocketString', 'Key Pressed') \ No newline at end of file + self.add_output('ArmFloatSocket', 'Value') + self.add_output('ArmStringSocket', 'Key Pressed') diff --git a/blender/arm/logicnode/input/LN_remove_input_map_key.py b/blender/arm/logicnode/input/LN_remove_input_map_key.py index 8821ef05..8da8562b 100644 --- a/blender/arm/logicnode/input/LN_remove_input_map_key.py +++ b/blender/arm/logicnode/input/LN_remove_input_map_key.py @@ -6,10 +6,9 @@ class RemoveInputMapKeyNode(ArmLogicTreeNode): bl_label = 'Remove Input Map Key' arm_version = 1 - def init(self, context): - super(RemoveInputMapKeyNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Input Map') - self.add_input('NodeSocketString', 'Key') + self.add_input('ArmStringSocket', 'Input Map') + self.add_input('ArmStringSocket', 'Key') - self.add_output('ArmNodeSocketAction', 'Out') \ No newline at end of file + self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/input/LN_set_input_map_key.py b/blender/arm/logicnode/input/LN_set_input_map_key.py index a2157745..75997d7d 100644 --- a/blender/arm/logicnode/input/LN_set_input_map_key.py +++ b/blender/arm/logicnode/input/LN_set_input_map_key.py @@ -6,23 +6,22 @@ class SetInputMapKeyNode(ArmLogicTreeNode): bl_label = 'Set Input Map Key' arm_version = 1 - property0: EnumProperty( + property0: HaxeEnumProperty( + 'property0', items = [('keyboard', 'Keyboard', 'Keyboard input'), ('mouse', 'Mouse', 'Mouse input'), ('gamepad', 'Gamepad', 'Gamepad input')], name='', default='keyboard') - def init(self, context): - super(SetInputMapKeyNode, self).init(context) + def arm_init(self, context): self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Input Map') - self.add_input('NodeSocketString', 'Key') - self.add_input('NodeSocketFloat', 'Scale', default_value=1.0) - self.add_input('NodeSocketFloat', 'Deadzone') - self.add_input('NodeSocketInt', 'Index') + self.add_input('ArmStringSocket', 'Input Map') + self.add_input('ArmStringSocket', 'Key') + self.add_input('ArmFloatSocket', 'Scale', default_value=1.0) + self.add_input('ArmFloatSocket', 'Deadzone') + self.add_input('ArmIntSocket', 'Index') self.add_output('ArmNodeSocketAction', 'Out') - def draw_buttons(self, context, layout): - layout.prop(self, 'property0') \ No newline at end of file + layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/logic/LN_merge.py b/blender/arm/logicnode/logic/LN_merge.py index 5f6b1f73..a209c690 100644 --- a/blender/arm/logicnode/logic/LN_merge.py +++ b/blender/arm/logicnode/logic/LN_merge.py @@ -29,7 +29,8 @@ class MergeNode(ArmLogicTreeNode): def update_exec_mode(self, context): self.outputs['Active Input Index'].hide = self.property0 == 'once_per_frame' - property0: EnumProperty( + property0: HaxeEnumProperty( + 'property0', name='Execution Mode', description='The node\'s behaviour if multiple inputs are active on the same frame', items=[('once_per_input', 'Once Per Input', @@ -47,7 +48,7 @@ class MergeNode(ArmLogicTreeNode): def arm_init(self, context): self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketInt', 'Active Input Index') + self.add_output('ArmIntSocket', 'Active Input Index') def draw_buttons(self, context, layout): layout.prop(self, 'property0', text='') diff --git a/blender/arm/logicnode/logic/LN_once_per_frame.py b/blender/arm/logicnode/logic/LN_once_per_frame.py index b7dba2f1..56c82fc5 100644 --- a/blender/arm/logicnode/logic/LN_once_per_frame.py +++ b/blender/arm/logicnode/logic/LN_once_per_frame.py @@ -9,8 +9,7 @@ class OncePerFrameNode(ArmLogicTreeNode): arm_section = 'flow' arm_version = 1 - def init(self, context): - super(OncePerFrameNode, 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_select.py b/blender/arm/logicnode/logic/LN_select.py index 4ea3762a..55f39a83 100644 --- a/blender/arm/logicnode/logic/LN_select.py +++ b/blender/arm/logicnode/logic/LN_select.py @@ -37,7 +37,8 @@ class SelectNode(ArmLogicTreeNode): def update_exec_mode(self, context): self.set_mode() - property0: EnumProperty( + property0: HaxeEnumProperty( + 'property0', name='Execution Mode', description="The node's behaviour.", items=[ @@ -55,9 +56,7 @@ class SelectNode(ArmLogicTreeNode): super().__init__() array_nodes[str(id(self))] = self - def init(self, context): - super().init(context) - + def arm_init(self, context): self.set_mode() def set_mode(self): @@ -65,8 +64,8 @@ class SelectNode(ArmLogicTreeNode): self.outputs.clear() if self.property0 == 'from_index': - self.add_input('NodeSocketInt', 'Index') - self.add_input('NodeSocketShader', 'Default') + self.add_input('ArmIntSocket', 'Index') + self.add_input('ArmDynamicSocket', 'Default') self.num_choices = 0 # from_input @@ -75,12 +74,12 @@ class SelectNode(ArmLogicTreeNode): # 0 for the "from_index" mode and it makes the code simpler # if we stick to the same convention for both exec modes self.add_input('ArmNodeSocketAction', 'Input 0') - self.add_input('NodeSocketShader', 'Value 0') + self.add_input('ArmDynamicSocket', 'Value 0') self.num_choices = 1 self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketShader', 'Value') + self.add_output('ArmDynamicSocket', 'Value') def draw_buttons(self, context, layout): layout.prop(self, 'property0', text='') @@ -102,7 +101,7 @@ class SelectNode(ArmLogicTreeNode): # Move new action input up to the end of all other action inputs self.inputs.move(from_index=len(self.inputs) - 1, to_index=self.num_choices) - self.add_input('NodeSocketShader', f'Value {self.num_choices}') + self.add_input('ArmDynamicSocket', f'Value {self.num_choices}') self.num_choices += 1 diff --git a/blender/arm/logicnode/physics/LN_get_rb_data.py b/blender/arm/logicnode/physics/LN_get_rb_data.py index 3671516f..76ecb2e2 100644 --- a/blender/arm/logicnode/physics/LN_get_rb_data.py +++ b/blender/arm/logicnode/physics/LN_get_rb_data.py @@ -7,7 +7,7 @@ class GetRigidBodyDataNode(ArmLogicTreeNode): arm_section = 'props' arm_version = 1 - def init(self, context): + def arm_init(self, context): self.inputs.new('ArmNodeSocketObject', 'Object') self.outputs.new('ArmBoolSocket', 'Is RB') 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 c4746472..a72ac52a 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_global_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_global_node.py @@ -37,7 +37,7 @@ class ColorgradingSetGlobalNode(ArmLogicTreeNode): items = [('RGB', 'RGB', 'RGB'), ('Uniform', 'Uniform', 'Uniform')], name='Mode', default='Uniform', update=update_node) - property1 : StringProperty(name="Loaded Data", description="Loaded data - Just ignore", default="") + property1 : HaxeStringProperty('property1', name="Loaded Data", description="Loaded data - Just ignore", default="") filepath : StringProperty(name="Preset File", description="Postprocess colorgrading preset file", default="", subtype="FILE_PATH", update=set_data) 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 f8a801cb..01b23cd1 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_highlight_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_highlight_node.py @@ -37,7 +37,7 @@ class ColorgradingSetHighlightNode(ArmLogicTreeNode): items = [('RGB', 'RGB', 'RGB'), ('Uniform', 'Uniform', 'Uniform')], name='Mode', default='Uniform', update=update_node) - property1 : StringProperty(name="Loaded Data", description="Loaded data - Just ignore", default="") + property1 : HaxeStringProperty('property1', name="Loaded Data", description="Loaded data - Just ignore", default="") filepath : StringProperty(name="Preset File", description="Postprocess colorgrading preset file", default="", subtype="FILE_PATH", update=set_data) 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 8d8379cb..8a5bd19c 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_midtone_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_midtone_node.py @@ -37,7 +37,7 @@ class ColorgradingSetMidtoneNode(ArmLogicTreeNode): items = [('RGB', 'RGB', 'RGB'), ('Uniform', 'Uniform', 'Uniform')], name='Mode', default='Uniform', update=update_node) - property1 : StringProperty(name="Loaded Data", description="Loaded data - Just ignore", default="") + property1 : HaxeStringProperty('property1', name="Loaded Data", description="Loaded data - Just ignore", default="") filepath : StringProperty(name="Preset File", description="Postprocess colorgrading preset file", default="", subtype="FILE_PATH", update=set_data) 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 84fa8956..bc05651d 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_shadow_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_shadow_node.py @@ -37,7 +37,7 @@ class ColorgradingSetShadowNode(ArmLogicTreeNode): items = [('RGB', 'RGB', 'RGB'), ('Uniform', 'Uniform', 'Uniform')], name='Mode', default='Uniform', update=update_node) - property1 : StringProperty(name="Loaded Data", description="Loaded data - Just ignore", default="") + property1 : HaxeStringProperty('property1', name="Loaded Data", description="Loaded data - Just ignore", default="") filepath : StringProperty(name="Preset File", description="Postprocess colorgrading preset file", default="", subtype="FILE_PATH", update=set_data) diff --git a/blender/arm/logicnode/transform/LN_get_object_location.py b/blender/arm/logicnode/transform/LN_get_object_location.py index 0f12aa5b..d4af86b4 100644 --- a/blender/arm/logicnode/transform/LN_get_object_location.py +++ b/blender/arm/logicnode/transform/LN_get_object_location.py @@ -2,7 +2,7 @@ from arm.logicnode.arm_nodes import * class GetLocationNode(ArmLogicTreeNode): """Get the location of the given object in world coordinates. - + @input Parent Relative: If enabled, transforms the world coordinates into object parent local coordinates @seeNode Set Object Location @@ -16,7 +16,7 @@ class GetLocationNode(ArmLogicTreeNode): def arm_init(self, context): self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketBool', 'Parent Relative') + self.add_input('ArmBoolSocket', 'Parent Relative') 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 5ee43596..5c9e4ac9 100644 --- a/blender/arm/logicnode/transform/LN_set_object_location.py +++ b/blender/arm/logicnode/transform/LN_set_object_location.py @@ -18,11 +18,11 @@ class SetLocationNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmVectorSocket', 'Location') - self.add_input('NodeSocketBool', 'Parent Relative') + self.add_input('ArmBoolSocket', 'Parent Relative') self.add_output('ArmNodeSocketAction', 'Out') def get_replacement_node(self, node_tree: bpy.types.NodeTree): if self.arm_version not in (0, 1): raise LookupError() - return NodeReplacement.Identity(self) \ No newline at end of file + return NodeReplacement.Identity(self)