From 413951cb6273cc252caa603c47e5e9891d96d43e Mon Sep 17 00:00:00 2001 From: Henrique Date: Mon, 26 Oct 2020 11:20:50 -0300 Subject: [PATCH] cleanups --- Sources/armory/logicnode/GetWorldNode.hx | 4 ++-- blender/arm/logicnode/input/LN_get_mouse_movement.py | 4 ++-- blender/arm/logicnode/input/LN_get_touch_movement.py | 2 +- .../logic/{LN_invert_bool.py => LN_invert_boolean.py} | 2 +- .../arm/logicnode/logic/{LN_switch.py => LN_switch_output.py} | 2 +- .../arm/logicnode/logic/{LN_to_bool.py => LN_to_boolean.py} | 2 +- .../miscellaneous/{LN_time.py => LN_get_application_time.py} | 2 +- .../object/{LN_get_object.py => LN_get_object_by_name.py} | 4 ++-- .../{LN_remove_active_scene.py => LN_remove_scene_active.py} | 2 +- blender/arm/logicnode/trait/LN_get_object_traits.py | 4 ++-- blender/arm/logicnode/trait/LN_get_trait_name.py | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) rename blender/arm/logicnode/logic/{LN_invert_bool.py => LN_invert_boolean.py} (93%) rename blender/arm/logicnode/logic/{LN_switch.py => LN_switch_output.py} (97%) rename blender/arm/logicnode/logic/{LN_to_bool.py => LN_to_boolean.py} (94%) rename blender/arm/logicnode/miscellaneous/{LN_time.py => LN_get_application_time.py} (91%) rename blender/arm/logicnode/object/{LN_get_object.py => LN_get_object_by_name.py} (85%) rename blender/arm/logicnode/scene/{LN_remove_active_scene.py => LN_remove_scene_active.py} (92%) diff --git a/Sources/armory/logicnode/GetWorldNode.hx b/Sources/armory/logicnode/GetWorldNode.hx index f29ac2f1..c7fa234e 100644 --- a/Sources/armory/logicnode/GetWorldNode.hx +++ b/Sources/armory/logicnode/GetWorldNode.hx @@ -18,8 +18,8 @@ class GetWorldNode extends LogicNode { return switch (property0) { case "Right": object.transform.world.right(); - case "Look": return object.transform.world.look(); - case "Up": return object.transform.world.up(); + case "Look": object.transform.world.look(); + case "Up": object.transform.world.up(); default: null; } } diff --git a/blender/arm/logicnode/input/LN_get_mouse_movement.py b/blender/arm/logicnode/input/LN_get_mouse_movement.py index 63b3eb7d..66345ec7 100644 --- a/blender/arm/logicnode/input/LN_get_mouse_movement.py +++ b/blender/arm/logicnode/input/LN_get_mouse_movement.py @@ -8,9 +8,9 @@ class GetMouseMovementNode(ArmLogicTreeNode): def init(self, context): super(GetMouseMovementNode, self).init(context) - self.add_input('NodeSocketFloat', 'X Multiplier' , default_value=1.0) + self.add_input('NodeSocketFloat', 'X Multiplier' , default_value=-1.0) self.add_input('NodeSocketFloat', 'Y Multiplier', default_value=-1.0) - self.add_input('NodeSocketFloat', 'Delta Multiplier', default_value=1.0) + self.add_input('NodeSocketFloat', 'Delta Multiplier', default_value=-1.0) self.add_output('NodeSocketFloat', 'X') self.add_output('NodeSocketFloat', 'Y') self.add_output('NodeSocketInt', 'Delta') diff --git a/blender/arm/logicnode/input/LN_get_touch_movement.py b/blender/arm/logicnode/input/LN_get_touch_movement.py index f6c0ad28..95845a0f 100644 --- a/blender/arm/logicnode/input/LN_get_touch_movement.py +++ b/blender/arm/logicnode/input/LN_get_touch_movement.py @@ -8,7 +8,7 @@ class GetTouchMovementNode(ArmLogicTreeNode): def init(self, context): super(GetTouchMovementNode, self).init(context) - self.add_input('NodeSocketFloat', 'X Multiplier', default_value=1.0) + self.add_input('NodeSocketFloat', 'X Multiplier', default_value=-1.0) self.add_input('NodeSocketFloat', 'Y Multiplier', default_value=-1.0) self.add_output('NodeSocketFloat', 'X') self.add_output('NodeSocketFloat', 'Y') diff --git a/blender/arm/logicnode/logic/LN_invert_bool.py b/blender/arm/logicnode/logic/LN_invert_boolean.py similarity index 93% rename from blender/arm/logicnode/logic/LN_invert_bool.py rename to blender/arm/logicnode/logic/LN_invert_boolean.py index 81cd38ba..bce7217f 100644 --- a/blender/arm/logicnode/logic/LN_invert_bool.py +++ b/blender/arm/logicnode/logic/LN_invert_boolean.py @@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import * class NotNode(ArmLogicTreeNode): """Inverts the plugged-in boolean. If its input is `true` it outputs `false`.""" bl_idname = 'LNNotNode' - bl_label = 'Invert Bool' + bl_label = 'Invert Boolean' arm_version = 1 def init(self, context): diff --git a/blender/arm/logicnode/logic/LN_switch.py b/blender/arm/logicnode/logic/LN_switch_output.py similarity index 97% rename from blender/arm/logicnode/logic/LN_switch.py rename to blender/arm/logicnode/logic/LN_switch_output.py index 77c3157c..2ec47eac 100644 --- a/blender/arm/logicnode/logic/LN_switch.py +++ b/blender/arm/logicnode/logic/LN_switch_output.py @@ -6,7 +6,7 @@ class SwitchNode(ArmLogicTreeNode): @output Default: Activated if the input value does not match any case. """ bl_idname = 'LNSwitchNode' - bl_label = 'Switch' + bl_label = 'Switch Output' arm_version = 1 min_inputs = 2 min_outputs = 1 diff --git a/blender/arm/logicnode/logic/LN_to_bool.py b/blender/arm/logicnode/logic/LN_to_boolean.py similarity index 94% rename from blender/arm/logicnode/logic/LN_to_bool.py rename to blender/arm/logicnode/logic/LN_to_boolean.py index 22bb5f93..15140017 100644 --- a/blender/arm/logicnode/logic/LN_to_bool.py +++ b/blender/arm/logicnode/logic/LN_to_boolean.py @@ -4,7 +4,7 @@ class ToBoolNode(ArmLogicTreeNode): """Converts a signal to a boolean value. If the input signal is active, the boolean is `true`; if not, the boolean is `false`.""" bl_idname = 'LNToBoolNode' - bl_label = 'To Bool' + bl_label = 'To Boolean' arm_version = 1 def init(self, context): diff --git a/blender/arm/logicnode/miscellaneous/LN_time.py b/blender/arm/logicnode/miscellaneous/LN_get_application_time.py similarity index 91% rename from blender/arm/logicnode/miscellaneous/LN_time.py rename to blender/arm/logicnode/miscellaneous/LN_get_application_time.py index 28085fd9..cabc754a 100644 --- a/blender/arm/logicnode/miscellaneous/LN_time.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_application_time.py @@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import * class TimeNode(ArmLogicTreeNode): """Returns the application execution time and the delta time.""" bl_idname = 'LNTimeNode' - bl_label = 'Time' + bl_label = 'Get Application Time' arm_version = 1 def init(self, context): diff --git a/blender/arm/logicnode/object/LN_get_object.py b/blender/arm/logicnode/object/LN_get_object_by_name.py similarity index 85% rename from blender/arm/logicnode/object/LN_get_object.py rename to blender/arm/logicnode/object/LN_get_object_by_name.py index cff7dc38..f84831f9 100644 --- a/blender/arm/logicnode/object/LN_get_object.py +++ b/blender/arm/logicnode/object/LN_get_object_by_name.py @@ -4,9 +4,9 @@ from arm.logicnode.arm_nodes import * class GetObjectNode(ArmLogicTreeNode): - """Search for the given object by its name and returns it.""" + """Searches for a object that uses the given name and returns it.""" bl_idname = 'LNGetObjectNode' - bl_label = 'Get Object' + bl_label = 'Get Object By Name' arm_version = 1 property0: PointerProperty( diff --git a/blender/arm/logicnode/scene/LN_remove_active_scene.py b/blender/arm/logicnode/scene/LN_remove_scene_active.py similarity index 92% rename from blender/arm/logicnode/scene/LN_remove_active_scene.py rename to blender/arm/logicnode/scene/LN_remove_scene_active.py index dd8389e7..b44126f3 100644 --- a/blender/arm/logicnode/scene/LN_remove_active_scene.py +++ b/blender/arm/logicnode/scene/LN_remove_scene_active.py @@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import * class RemoveActiveSceneNode(ArmLogicTreeNode): """Removes the active scene.""" bl_idname = 'LNRemoveActiveSceneNode' - bl_label = 'Remove Active Scene' + bl_label = 'Remove Scene Active' arm_version = 1 def init(self, context): diff --git a/blender/arm/logicnode/trait/LN_get_object_traits.py b/blender/arm/logicnode/trait/LN_get_object_traits.py index 1fcfd330..4978d171 100644 --- a/blender/arm/logicnode/trait/LN_get_object_traits.py +++ b/blender/arm/logicnode/trait/LN_get_object_traits.py @@ -1,7 +1,7 @@ from arm.logicnode.arm_nodes import * class GetObjectTraitsNode(ArmLogicTreeNode): - """Returns the children of the given object.""" + """Returns all traits from the given object.""" bl_idname = 'LNGetObjectTraitsNode' bl_label = 'Get Object Traits' arm_version = 1 @@ -11,4 +11,4 @@ class GetObjectTraitsNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmNodeSocketArray', 'Traits') -add_node(GetObjectTraitsNode, category=PKG_AS_CATEGORY) \ No newline at end of file +add_node(GetObjectTraitsNode, category=PKG_AS_CATEGORY) diff --git a/blender/arm/logicnode/trait/LN_get_trait_name.py b/blender/arm/logicnode/trait/LN_get_trait_name.py index 2dc0a263..1b0adfe0 100644 --- a/blender/arm/logicnode/trait/LN_get_trait_name.py +++ b/blender/arm/logicnode/trait/LN_get_trait_name.py @@ -1,7 +1,7 @@ from arm.logicnode.arm_nodes import * class GetTraitNameNode(ArmLogicTreeNode): - """Getting the name Trait.""" + """Returns the name and the class type of the given trait.""" bl_idname = 'LNGetTraitNameNode' bl_label = 'Get Trait Name' arm_version = 1 @@ -12,4 +12,4 @@ class GetTraitNameNode(ArmLogicTreeNode): self.add_output('NodeSocketString', 'Name') self.add_output('NodeSocketString', 'Class Type') -add_node(GetTraitNameNode, category=PKG_AS_CATEGORY) \ No newline at end of file +add_node(GetTraitNameNode, category=PKG_AS_CATEGORY)