From 96aa0ee890cc5c7e71853534dd828168b3c33299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20Br=C3=BCckner?= Date: Sat, 10 Jul 2021 21:46:44 +0200 Subject: [PATCH] Use custom sockets for default data types This allows to listen for socket updates for the live patch system --- .../logicnode/animation/LN_blend_action.py | 2 +- blender/arm/logicnode/animation/LN_bone_fk.py | 4 +- blender/arm/logicnode/animation/LN_bone_ik.py | 4 +- .../animation/LN_get_action_state.py | 6 +- .../animation/LN_get_tilesheet_state.py | 6 +- .../animation/LN_on_action_marker.py | 2 +- .../animation/LN_play_action_from.py | 8 +- .../logicnode/animation/LN_play_tilesheet.py | 2 +- .../animation/LN_set_action_paused.py | 2 +- .../animation/LN_set_action_speed.py | 2 +- .../logicnode/animation/LN_set_parent_bone.py | 2 +- .../animation/LN_set_particle_speed.py | 2 +- .../animation/LN_set_tilesheet_paused.py | 2 +- blender/arm/logicnode/arm_nodes.py | 21 +- blender/arm/logicnode/arm_sockets.py | 198 ++++++++++++++++-- blender/arm/logicnode/array/LN_array.py | 4 +- blender/arm/logicnode/array/LN_array_add.py | 8 +- .../arm/logicnode/array/LN_array_boolean.py | 4 +- blender/arm/logicnode/array/LN_array_color.py | 4 +- .../arm/logicnode/array/LN_array_contains.py | 4 +- blender/arm/logicnode/array/LN_array_float.py | 4 +- blender/arm/logicnode/array/LN_array_get.py | 4 +- .../arm/logicnode/array/LN_array_integer.py | 4 +- .../arm/logicnode/array/LN_array_length.py | 2 +- .../arm/logicnode/array/LN_array_loop_node.py | 4 +- .../arm/logicnode/array/LN_array_object.py | 2 +- blender/arm/logicnode/array/LN_array_pop.py | 2 +- .../array/LN_array_remove_by_index.py | 4 +- .../array/LN_array_remove_by_value.py | 6 +- blender/arm/logicnode/array/LN_array_set.py | 4 +- blender/arm/logicnode/array/LN_array_shift.py | 2 +- blender/arm/logicnode/array/LN_array_slice.py | 4 +- .../arm/logicnode/array/LN_array_splice.py | 4 +- .../arm/logicnode/array/LN_array_string.py | 4 +- .../arm/logicnode/array/LN_array_vector.py | 4 +- .../arm/logicnode/camera/LN_get_camera_fov.py | 2 +- .../arm/logicnode/camera/LN_set_camera_fov.py | 2 +- .../canvas/LN_get_canvas_checkbox.py | 4 +- .../canvas/LN_get_canvas_input_text.py | 4 +- .../canvas/LN_get_canvas_location.py | 6 +- .../canvas/LN_get_canvas_position.py | 4 +- .../canvas/LN_get_canvas_progress_bar.py | 6 +- .../canvas/LN_get_canvas_rotation.py | 4 +- .../logicnode/canvas/LN_get_canvas_scale.py | 6 +- .../logicnode/canvas/LN_get_canvas_slider.py | 4 +- .../logicnode/canvas/LN_get_canvas_visible.py | 4 +- .../logicnode/canvas/LN_on_canvas_element.py | 2 +- .../logicnode/canvas/LN_set_canvas_asset.py | 4 +- .../canvas/LN_set_canvas_checkbox.py | 4 +- .../canvas/LN_set_canvas_location.py | 6 +- .../canvas/LN_set_canvas_progress_bar.py | 6 +- .../canvas/LN_set_canvas_rotation.py | 4 +- .../logicnode/canvas/LN_set_canvas_scale.py | 6 +- .../logicnode/canvas/LN_set_canvas_slider.py | 4 +- .../logicnode/canvas/LN_set_canvas_text.py | 4 +- .../canvas/LN_set_canvas_text_color.py | 10 +- .../logicnode/canvas/LN_set_canvas_visible.py | 4 +- .../logicnode/deprecated/LN_get_mouse_lock.py | 2 +- .../deprecated/LN_get_mouse_visible.py | 2 +- .../logicnode/deprecated/LN_mouse_coords.py | 6 +- .../arm/logicnode/deprecated/LN_on_gamepad.py | 2 +- .../logicnode/deprecated/LN_pause_trait.py | 2 +- .../logicnode/deprecated/LN_play_action.py | 2 +- .../logicnode/deprecated/LN_resume_trait.py | 2 +- .../LN_rotate_object_around_axis.py | 4 +- .../logicnode/deprecated/LN_scale_object.py | 2 +- .../logicnode/deprecated/LN_set_mouse_lock.py | 2 +- .../deprecated/LN_set_mouse_visible.py | 2 +- .../deprecated/LN_set_object_material.py | 2 +- .../logicnode/deprecated/LN_surface_coords.py | 4 +- blender/arm/logicnode/event/LN_on_timer.py | 4 +- .../event/LN_send_event_to_object.py | 2 +- .../logicnode/event/LN_send_global_event.py | 2 +- blender/arm/logicnode/input/LN_gamepad.py | 4 +- .../arm/logicnode/input/LN_gamepad_coords.py | 14 +- .../logicnode/input/LN_get_cursor_location.py | 8 +- .../logicnode/input/LN_get_cursor_state.py | 6 +- .../logicnode/input/LN_get_mouse_movement.py | 18 +- .../logicnode/input/LN_get_touch_location.py | 8 +- .../logicnode/input/LN_get_touch_movement.py | 12 +- blender/arm/logicnode/input/LN_keyboard.py | 2 +- blender/arm/logicnode/input/LN_mouse.py | 2 +- blender/arm/logicnode/input/LN_on_swipe.py | 20 +- .../arm/logicnode/input/LN_on_tap_screen.py | 10 +- .../arm/logicnode/input/LN_sensor_coords.py | 2 +- .../logicnode/input/LN_set_cursor_state.py | 2 +- blender/arm/logicnode/input/LN_touch.py | 2 +- .../arm/logicnode/input/LN_virtual_button.py | 2 +- .../arm/logicnode/light/LN_set_light_color.py | 2 +- .../logicnode/light/LN_set_light_strength.py | 2 +- blender/arm/logicnode/logic/LN_branch.py | 2 +- .../arm/logicnode/logic/LN_call_function.py | 8 +- blender/arm/logicnode/logic/LN_function.py | 2 +- .../arm/logicnode/logic/LN_function_output.py | 2 +- blender/arm/logicnode/logic/LN_gate.py | 6 +- .../arm/logicnode/logic/LN_invert_boolean.py | 4 +- blender/arm/logicnode/logic/LN_is_false.py | 2 +- blender/arm/logicnode/logic/LN_is_not_null.py | 2 +- blender/arm/logicnode/logic/LN_is_null.py | 2 +- blender/arm/logicnode/logic/LN_is_true.py | 2 +- blender/arm/logicnode/logic/LN_loop.py | 6 +- blender/arm/logicnode/logic/LN_null.py | 2 +- .../logicnode/logic/LN_output_to_boolean.py | 2 +- .../arm/logicnode/logic/LN_switch_output.py | 4 +- .../arm/logicnode/logic/LN_value_changed.py | 2 +- blender/arm/logicnode/logic/LN_while_true.py | 2 +- .../material/LN_get_object_material.py | 4 +- blender/arm/logicnode/material/LN_material.py | 2 +- .../material/LN_set_material_image_param.py | 6 +- .../material/LN_set_material_rgb_param.py | 6 +- .../material/LN_set_material_value_param.py | 6 +- .../material/LN_set_object_material_slot.py | 4 +- blender/arm/logicnode/math/LN_clamp.py | 8 +- blender/arm/logicnode/math/LN_compare.py | 8 +- blender/arm/logicnode/math/LN_deg_to_rad.py | 4 +- blender/arm/logicnode/math/LN_map_range.py | 12 +- blender/arm/logicnode/math/LN_math.py | 12 +- .../arm/logicnode/math/LN_math_expression.py | 8 +- blender/arm/logicnode/math/LN_matrix_math.py | 6 +- blender/arm/logicnode/math/LN_mix.py | 8 +- blender/arm/logicnode/math/LN_mix_vector.py | 8 +- .../arm/logicnode/math/LN_quaternion_math.py | 74 +++---- blender/arm/logicnode/math/LN_rad_to_deg.py | 4 +- .../math/LN_screen_to_world_space.py | 24 +-- .../logicnode/math/LN_separate_quaternion.py | 10 +- blender/arm/logicnode/math/LN_separate_rgb.py | 8 +- blender/arm/logicnode/math/LN_separate_xyz.py | 8 +- blender/arm/logicnode/math/LN_vector_clamp.py | 8 +- blender/arm/logicnode/math/LN_vector_math.py | 40 ++-- .../math/LN_world_to_screen_space.py | 4 +- .../miscellaneous/LN_boolean_to_vector.py | 14 +- .../miscellaneous/LN_default_if_null.py | 6 +- .../miscellaneous/LN_get_application_time.py | 4 +- .../LN_get_debug_console_settings.py | 6 +- .../LN_get_display_resolution.py | 4 +- .../arm/logicnode/miscellaneous/LN_get_fps.py | 2 +- .../miscellaneous/LN_get_window_resolution.py | 4 +- .../LN_set_debug_console_settings.py | 4 +- .../miscellaneous/LN_set_time_scale.py | 2 +- .../arm/logicnode/miscellaneous/LN_sleep.py | 2 +- .../arm/logicnode/miscellaneous/LN_timer.py | 14 +- .../logicnode/native/LN_call_haxe_static.py | 4 +- .../native/LN_detect_mobile_browser.py | 2 +- blender/arm/logicnode/native/LN_expression.py | 2 +- .../logicnode/native/LN_get_haxe_property.py | 6 +- .../native/LN_get_system_language.py | 2 +- .../logicnode/native/LN_get_system_name.py | 12 +- blender/arm/logicnode/native/LN_loadUrl.py | 2 +- blender/arm/logicnode/native/LN_print.py | 2 +- blender/arm/logicnode/native/LN_read_file.py | 6 +- blender/arm/logicnode/native/LN_read_json.py | 6 +- .../arm/logicnode/native/LN_read_storage.py | 6 +- blender/arm/logicnode/native/LN_script.py | 2 +- .../logicnode/native/LN_set_haxe_property.py | 6 +- .../arm/logicnode/native/LN_set_vibrate.py | 2 +- blender/arm/logicnode/native/LN_write_file.py | 4 +- blender/arm/logicnode/native/LN_write_json.py | 4 +- .../arm/logicnode/native/LN_write_storage.py | 4 +- .../logicnode/navmesh/LN_go_to_location.py | 2 +- .../navmesh/LN_navigable_location.py | 2 +- .../navmesh/LN_pick_navmesh_location.py | 4 +- .../arm/logicnode/object/LN_get_distance.py | 2 +- .../logicnode/object/LN_get_object_by_name.py | 2 +- .../logicnode/object/LN_get_object_child.py | 2 +- .../logicnode/object/LN_get_object_mesh.py | 2 +- .../logicnode/object/LN_get_object_name.py | 2 +- .../object/LN_get_object_offscreen.py | 6 +- .../object/LN_get_object_property.py | 6 +- .../logicnode/object/LN_get_object_visible.py | 6 +- blender/arm/logicnode/object/LN_mesh.py | 2 +- .../object/LN_remove_object_parent.py | 2 +- .../logicnode/object/LN_set_object_mesh.py | 2 +- .../logicnode/object/LN_set_object_name.py | 2 +- .../object/LN_set_object_property.py | 4 +- .../logicnode/object/LN_set_object_visible.py | 4 +- .../arm/logicnode/object/LN_spawn_object.py | 4 +- .../object/LN_spawn_object_by_name.py | 6 +- .../logicnode/physics/LN_Add_rigid_body.py | 32 +-- .../physics/LN_add_physics_constraint.py | 32 +-- .../arm/logicnode/physics/LN_apply_force.py | 4 +- .../physics/LN_apply_force_at_location.py | 8 +- .../arm/logicnode/physics/LN_apply_impulse.py | 4 +- .../physics/LN_apply_impulse_at_location.py | 8 +- .../arm/logicnode/physics/LN_apply_torque.py | 4 +- .../physics/LN_apply_torque_impulse.py | 4 +- .../arm/logicnode/physics/LN_get_rb_data.py | 28 +-- .../logicnode/physics/LN_get_rb_velocity.py | 8 +- .../logicnode/physics/LN_get_world_gravity.py | 2 +- .../arm/logicnode/physics/LN_has_contact.py | 2 +- .../logicnode/physics/LN_has_contact_array.py | 2 +- .../physics/LN_physics_constraint.py | 14 +- blender/arm/logicnode/physics/LN_pick_rb.py | 6 +- blender/arm/logicnode/physics/LN_ray_cast.py | 10 +- .../logicnode/physics/LN_set_rb_friction.py | 2 +- .../physics/LN_set_rb_gravity_enabled.py | 2 +- .../logicnode/physics/LN_set_rb_velocity.py | 8 +- .../logicnode/physics/LN_set_world_gravity.py | 2 +- .../logicnode/physics/LN_volume_trigger.py | 2 +- .../LN_colorgrading_get_global_node.py | 14 +- .../LN_colorgrading_get_highlight_node.py | 12 +- .../LN_colorgrading_get_midtone_node.py | 10 +- .../LN_colorgrading_get_shadow_node.py | 12 +- .../LN_colorgrading_set_global_node.py | 28 +-- .../LN_colorgrading_set_highlight_node.py | 24 +-- .../LN_colorgrading_set_midtone_node.py | 22 +- .../LN_colorgrading_set_shadow_node.py | 24 +-- .../postprocess/LN_get_bloom_settings.py | 6 +- .../postprocess/LN_get_ca_settings.py | 4 +- .../postprocess/LN_get_camera_post_process.py | 20 +- .../LN_get_lenstexture_settings.py | 10 +- .../postprocess/LN_get_ssao_settings.py | 6 +- .../postprocess/LN_get_ssr_settings.py | 10 +- .../postprocess/LN_lenstexture_set.py | 10 +- .../postprocess/LN_set_bloom_settings.py | 6 +- .../postprocess/LN_set_ca_settings.py | 4 +- .../postprocess/LN_set_camera_post_process.py | 22 +- .../postprocess/LN_set_ssao_settings.py | 6 +- .../postprocess/LN_set_ssr_settings.py | 10 +- .../arm/logicnode/random/LN_random_boolean.py | 2 +- .../arm/logicnode/random/LN_random_choice.py | 2 +- .../arm/logicnode/random/LN_random_color.py | 2 +- .../arm/logicnode/random/LN_random_float.py | 8 +- .../arm/logicnode/random/LN_random_integer.py | 6 +- .../arm/logicnode/random/LN_random_vector.py | 6 +- .../renderpath/LN_set_post_process_quality.py | 2 +- .../renderpath/LN_set_shader_uniform.py | 10 +- blender/arm/logicnode/replacement.py | 77 +++++++ .../logicnode/scene/LN_create_collection.py | 2 +- .../arm/logicnode/scene/LN_get_collection.py | 2 +- .../logicnode/scene/LN_get_scene_active.py | 2 +- .../logicnode/scene/LN_remove_collection.py | 2 +- blender/arm/logicnode/scene/LN_scene.py | 2 +- .../logicnode/scene/LN_set_scene_active.py | 2 +- .../logicnode/scene/LN_spawn_collection.py | 2 +- blender/arm/logicnode/scene/LN_spawn_scene.py | 4 +- .../logicnode/string/LN_concatenate_string.py | 6 +- .../arm/logicnode/string/LN_parse_float.py | 4 +- .../arm/logicnode/string/LN_split_string.py | 4 +- blender/arm/logicnode/string/LN_string.py | 4 +- .../arm/logicnode/string/LN_string_case.py | 4 +- .../logicnode/string/LN_string_contains.py | 6 +- .../arm/logicnode/string/LN_string_length.py | 4 +- blender/arm/logicnode/string/LN_sub_string.py | 8 +- .../logicnode/trait/LN_add_trait_to_object.py | 2 +- .../logicnode/trait/LN_get_object_trait.py | 4 +- .../arm/logicnode/trait/LN_get_trait_name.py | 6 +- .../logicnode/trait/LN_get_trait_paused.py | 4 +- .../arm/logicnode/trait/LN_remove_trait.py | 2 +- blender/arm/logicnode/trait/LN_self_trait.py | 2 +- .../logicnode/trait/LN_set_trait_paused.py | 4 +- blender/arm/logicnode/trait/LN_trait.py | 2 +- .../transform/LN_append_transform.py | 2 +- .../transform/LN_get_object_location.py | 2 +- .../transform/LN_get_object_rotation.py | 12 +- .../transform/LN_get_object_scale.py | 2 +- .../transform/LN_get_object_transform.py | 2 +- .../transform/LN_get_world_orientation.py | 2 +- blender/arm/logicnode/transform/LN_look_at.py | 6 +- .../logicnode/transform/LN_rotate_object.py | 4 +- .../transform/LN_separate_transform.py | 8 +- .../transform/LN_set_object_location.py | 2 +- .../transform/LN_set_object_rotation.py | 4 +- .../transform/LN_set_object_scale.py | 2 +- .../transform/LN_set_object_transform.py | 2 +- .../arm/logicnode/transform/LN_transform.py | 8 +- .../logicnode/transform/LN_transform_math.py | 6 +- .../transform/LN_transform_to_vector.py | 8 +- .../transform/LN_translate_object.py | 4 +- .../transform/LN_translate_on_local_axis.py | 6 +- .../LN_vector_to_object_orientation.py | 4 +- .../LN_world_vector_to_local_space.py | 4 +- blender/arm/logicnode/variable/LN_boolean.py | 4 +- blender/arm/logicnode/variable/LN_color.py | 4 +- blender/arm/logicnode/variable/LN_dynamic.py | 2 +- blender/arm/logicnode/variable/LN_float.py | 4 +- blender/arm/logicnode/variable/LN_integer.py | 4 +- blender/arm/logicnode/variable/LN_mask.py | 4 +- .../arm/logicnode/variable/LN_quaternion.py | 14 +- .../arm/logicnode/variable/LN_set_variable.py | 4 +- blender/arm/logicnode/variable/LN_vector.py | 8 +- blender/arm/node_utils.py | 25 +++ blender/arm/nodes_logic.py | 2 +- blender/arm/props.py | 17 +- blender/arm/utils.py | 4 + 284 files changed, 1122 insertions(+), 834 deletions(-) diff --git a/blender/arm/logicnode/animation/LN_blend_action.py b/blender/arm/logicnode/animation/LN_blend_action.py index 087301e2..0d98d693 100644 --- a/blender/arm/logicnode/animation/LN_blend_action.py +++ b/blender/arm/logicnode/animation/LN_blend_action.py @@ -12,6 +12,6 @@ class BlendActionNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketAnimAction', 'Action 1') self.add_input('ArmNodeSocketAnimAction', 'Action 2') - self.add_input('NodeSocketFloat', 'Factor', default_value = 0.5) + self.add_input('ArmFloatSocket', 'Factor', default_value = 0.5) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/animation/LN_bone_fk.py b/blender/arm/logicnode/animation/LN_bone_fk.py index e5aceff7..58f59910 100644 --- a/blender/arm/logicnode/animation/LN_bone_fk.py +++ b/blender/arm/logicnode/animation/LN_bone_fk.py @@ -11,7 +11,7 @@ class BoneFKNode(ArmLogicTreeNode): super(BoneFKNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Bone') - self.add_input('NodeSocketShader', 'Transform') + self.add_input('ArmStringSocket', 'Bone') + self.add_input('ArmDynamicSocket', 'Transform') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/animation/LN_bone_ik.py b/blender/arm/logicnode/animation/LN_bone_ik.py index dd155015..00577537 100644 --- a/blender/arm/logicnode/animation/LN_bone_ik.py +++ b/blender/arm/logicnode/animation/LN_bone_ik.py @@ -11,7 +11,7 @@ class BoneIKNode(ArmLogicTreeNode): super(BoneIKNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Bone') - self.add_input('NodeSocketVector', 'Goal') + self.add_input('ArmStringSocket', 'Bone') + self.add_input('ArmVectorSocket', 'Goal') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/animation/LN_get_action_state.py b/blender/arm/logicnode/animation/LN_get_action_state.py index d2c9f804..51e2d130 100644 --- a/blender/arm/logicnode/animation/LN_get_action_state.py +++ b/blender/arm/logicnode/animation/LN_get_action_state.py @@ -10,6 +10,6 @@ class AnimationStateNode(ArmLogicTreeNode): super(AnimationStateNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketString', 'Action') - self.add_output('NodeSocketInt', 'Frame') - self.add_output('NodeSocketBool', 'Is Paused') + self.add_output('ArmStringSocket', 'Action') + self.add_output('ArmIntSocket', 'Frame') + self.add_output('ArmBoolSocket', 'Is Paused') diff --git a/blender/arm/logicnode/animation/LN_get_tilesheet_state.py b/blender/arm/logicnode/animation/LN_get_tilesheet_state.py index b32e7d25..dadf0888 100644 --- a/blender/arm/logicnode/animation/LN_get_tilesheet_state.py +++ b/blender/arm/logicnode/animation/LN_get_tilesheet_state.py @@ -11,6 +11,6 @@ class GetTilesheetStateNode(ArmLogicTreeNode): super(GetTilesheetStateNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketString', 'Name') - self.add_output('NodeSocketInt', 'Frame') - self.add_output('NodeSocketBool', 'Is Paused') + self.add_output('ArmStringSocket', 'Name') + self.add_output('ArmIntSocket', 'Frame') + self.add_output('ArmBoolSocket', 'Is Paused') diff --git a/blender/arm/logicnode/animation/LN_on_action_marker.py b/blender/arm/logicnode/animation/LN_on_action_marker.py index a935015b..c26abc19 100644 --- a/blender/arm/logicnode/animation/LN_on_action_marker.py +++ b/blender/arm/logicnode/animation/LN_on_action_marker.py @@ -9,6 +9,6 @@ class OnActionMarkerNode(ArmLogicTreeNode): def init(self, context): super(OnActionMarkerNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Marker') + self.add_input('ArmStringSocket', 'Marker') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/animation/LN_play_action_from.py b/blender/arm/logicnode/animation/LN_play_action_from.py index b28221c1..732a7c40 100644 --- a/blender/arm/logicnode/animation/LN_play_action_from.py +++ b/blender/arm/logicnode/animation/LN_play_action_from.py @@ -11,10 +11,10 @@ class PlayActionFromNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketAnimAction', 'Action') - self.add_input('NodeSocketInt', 'Start Frame') - self.add_input('NodeSocketFloat', 'Blend', default_value = 0.25) - self.add_input('NodeSocketFloat', 'Speed', default_value = 1.0) - self.add_input('NodeSocketBool', 'Loop', default_value = False) + self.add_input('ArmIntSocket', 'Start Frame') + self.add_input('ArmFloatSocket', 'Blend', default_value = 0.25) + self.add_input('ArmFloatSocket', 'Speed', default_value = 1.0) + self.add_input('ArmBoolSocket', 'Loop', default_value = False) self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketAction', 'Done') diff --git a/blender/arm/logicnode/animation/LN_play_tilesheet.py b/blender/arm/logicnode/animation/LN_play_tilesheet.py index 533231d8..4af5d10a 100644 --- a/blender/arm/logicnode/animation/LN_play_tilesheet.py +++ b/blender/arm/logicnode/animation/LN_play_tilesheet.py @@ -11,7 +11,7 @@ class PlayTilesheetNode(ArmLogicTreeNode): super(PlayTilesheetNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Name') + self.add_input('ArmStringSocket', 'Name') self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketAction', 'Done') diff --git a/blender/arm/logicnode/animation/LN_set_action_paused.py b/blender/arm/logicnode/animation/LN_set_action_paused.py index 6bdb5535..8df9b9ce 100644 --- a/blender/arm/logicnode/animation/LN_set_action_paused.py +++ b/blender/arm/logicnode/animation/LN_set_action_paused.py @@ -10,6 +10,6 @@ class SetActionPausedNode(ArmLogicTreeNode): super(SetActionPausedNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketBool', 'Paused') + self.add_input('ArmBoolSocket', 'Paused') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/animation/LN_set_action_speed.py b/blender/arm/logicnode/animation/LN_set_action_speed.py index c01fdd00..9a011883 100644 --- a/blender/arm/logicnode/animation/LN_set_action_speed.py +++ b/blender/arm/logicnode/animation/LN_set_action_speed.py @@ -10,6 +10,6 @@ class SetActionSpeedNode(ArmLogicTreeNode): super(SetActionSpeedNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketFloat', 'Speed', default_value=1.0) + self.add_input('ArmFloatSocket', 'Speed', default_value=1.0) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/animation/LN_set_parent_bone.py b/blender/arm/logicnode/animation/LN_set_parent_bone.py index fb954610..dc40384b 100644 --- a/blender/arm/logicnode/animation/LN_set_parent_bone.py +++ b/blender/arm/logicnode/animation/LN_set_parent_bone.py @@ -12,6 +12,6 @@ class SetParentBoneNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketObject', 'Parent', default_value='Parent') - self.add_input('NodeSocketString', 'Bone', default_value='Bone') + self.add_input('ArmStringSocket', 'Bone', default_value='Bone') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/animation/LN_set_particle_speed.py b/blender/arm/logicnode/animation/LN_set_particle_speed.py index 272a11f3..d4e614bd 100644 --- a/blender/arm/logicnode/animation/LN_set_particle_speed.py +++ b/blender/arm/logicnode/animation/LN_set_particle_speed.py @@ -10,6 +10,6 @@ class SetParticleSpeedNode(ArmLogicTreeNode): super(SetParticleSpeedNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketFloat', 'Speed', default_value=1.0) + self.add_input('ArmFloatSocket', 'Speed', default_value=1.0) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/animation/LN_set_tilesheet_paused.py b/blender/arm/logicnode/animation/LN_set_tilesheet_paused.py index 06322ad7..ef7f954a 100644 --- a/blender/arm/logicnode/animation/LN_set_tilesheet_paused.py +++ b/blender/arm/logicnode/animation/LN_set_tilesheet_paused.py @@ -11,6 +11,6 @@ class SetTilesheetPausedNode(ArmLogicTreeNode): super(SetTilesheetPausedNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketBool', 'Paused') + self.add_input('ArmBoolSocket', 'Paused') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/arm_nodes.py b/blender/arm/logicnode/arm_nodes.py index 152901c3..7c929f31 100644 --- a/blender/arm/logicnode/arm_nodes.py +++ b/blender/arm/logicnode/arm_nodes.py @@ -61,6 +61,9 @@ class ArmLogicTreeNode(bpy.types.Node): """ arm.live_patch.send_event('ln_update_prop', (self, prop_name)) + def on_socket_val_update(self, context: bpy.types.Context, socket: bpy.types.NodeSocket): + pass + def insert_link(self, link: bpy.types.NodeLink): """Called on *both* nodes when a link between two nodes is created.""" arm.live_patch.send_event('ln_insert_link', (self, link)) @@ -132,7 +135,7 @@ class ArmNodeAddInputButton(bpy.types.Operator): bl_options = {'UNDO', 'INTERNAL'} node_index: StringProperty(name='Node Index', default='') - socket_type: StringProperty(name='Socket Type', default='NodeSocketShader') + socket_type: StringProperty(name='Socket Type', default='ArmDynamicSocket') name_format: StringProperty(name='Name Format', default='Input {0}') index_name_offset: IntProperty(name='Index Name Offset', default=0) @@ -143,7 +146,7 @@ class ArmNodeAddInputButton(bpy.types.Operator): # Reset to default again for subsequent calls of this operator self.node_index = '' - self.socket_type = 'NodeSocketShader' + self.socket_type = 'ArmDynamicSocket' self.name_format = 'Input {0}' self.index_name_offset = 0 @@ -155,7 +158,7 @@ class ArmNodeAddInputValueButton(bpy.types.Operator): bl_label = 'Add Input' bl_options = {'UNDO', 'INTERNAL'} node_index: StringProperty(name='Node Index', default='') - socket_type: StringProperty(name='Socket Type', default='NodeSocketShader') + socket_type: StringProperty(name='Socket Type', default='ArmDynamicSocket') def execute(self, context): global array_nodes @@ -202,7 +205,7 @@ class ArmNodeAddOutputButton(bpy.types.Operator): bl_options = {'UNDO', 'INTERNAL'} node_index: StringProperty(name='Node Index', default='') - socket_type: StringProperty(name='Socket Type', default='NodeSocketShader') + socket_type: StringProperty(name='Socket Type', default='ArmDynamicSocket') name_format: StringProperty(name='Name Format', default='Output {0}') index_name_offset: IntProperty(name='Index Name Offset', default=0) @@ -213,7 +216,7 @@ class ArmNodeAddOutputButton(bpy.types.Operator): # Reset to default again for subsequent calls of this operator self.node_index = '' - self.socket_type = 'NodeSocketShader' + self.socket_type = 'ArmDynamicSocket' self.name_format = 'Output {0}' self.index_name_offset = 0 @@ -242,8 +245,8 @@ class ArmNodeAddInputOutputButton(bpy.types.Operator): bl_options = {'UNDO', 'INTERNAL'} node_index: StringProperty(name='Node Index', default='') - in_socket_type: StringProperty(name='In Socket Type', default='NodeSocketShader') - out_socket_type: StringProperty(name='Out Socket Type', default='NodeSocketShader') + in_socket_type: StringProperty(name='In Socket Type', default='ArmDynamicSocket') + out_socket_type: StringProperty(name='Out Socket Type', default='ArmDynamicSocket') in_name_format: StringProperty(name='In Name Format', default='Input {0}') out_name_format: StringProperty(name='Out Name Format', default='Output {0}') in_index_name_offset: IntProperty(name='Index Name Offset', default=0) @@ -258,8 +261,8 @@ class ArmNodeAddInputOutputButton(bpy.types.Operator): # Reset to default again for subsequent calls of this operator self.node_index = '' - self.in_socket_type = 'NodeSocketShader' - self.out_socket_type = 'NodeSocketShader' + self.in_socket_type = 'ArmDynamicSocket' + self.out_socket_type = 'ArmDynamicSocket' self.in_name_format = 'Input {0}' self.out_name_format = 'Output {0}' self.in_index_name_offset = 0 diff --git a/blender/arm/logicnode/arm_sockets.py b/blender/arm/logicnode/arm_sockets.py index 91f98476..58f2ea70 100644 --- a/blender/arm/logicnode/arm_sockets.py +++ b/blender/arm/logicnode/arm_sockets.py @@ -1,10 +1,14 @@ import bpy -from bpy.props import PointerProperty +from bpy.props import * from bpy.types import NodeSocket import arm.utils +def _on_update_socket(self, context): + self.node.on_socket_val_update(context, self) + + class ArmCustomSocket(NodeSocket): """ A custom socket that can be used to define more socket types for @@ -41,7 +45,7 @@ class ArmAnimActionSocket(ArmCustomSocket): arm_socket_type = 'STRING' default_value_get: PointerProperty(name='Action', type=bpy.types.Action) # legacy version of the line after this one - default_value_raw: PointerProperty(name='Action', type=bpy.types.Action) + default_value_raw: PointerProperty(name='Action', type=bpy.types.Action, update=_on_update_socket) def __init__(self): super().__init__() @@ -81,13 +85,114 @@ class ArmArraySocket(ArmCustomSocket): return 0.8, 0.4, 0.0, 1 +class ArmBoolSocket(ArmCustomSocket): + bl_idname = 'ArmBoolSocket' + bl_label = 'Boolean Socket' + arm_socket_type = 'BOOLEAN' + + default_value_raw: BoolProperty( + name='Value', + description='Input value used for unconnected socket', + update=_on_update_socket + ) + + def draw(self, context, layout, node, text): + draw_socket_layout(self, layout) + + def draw_color(self, context, node): + return 0.8, 0.651, 0.839, 1 + + def get_default_value(self): + return self.default_value_raw + + +class ArmColorSocket(ArmCustomSocket): + bl_idname = 'ArmColorSocket' + bl_label = 'Color Socket' + arm_socket_type = 'RGBA' + + default_value_raw: FloatVectorProperty( + name='Value', + size=4, + subtype='COLOR', + min=0.0, + max=1.0, + description='Input value used for unconnected socket', + update=_on_update_socket + ) + + def draw(self, context, layout, node, text): + draw_socket_layout(self, layout) + + def draw_color(self, context, node): + return 0.78, 0.78, 0.161, 1 + + def get_default_value(self): + return self.default_value_raw + + +class ArmDynamicSocket(ArmCustomSocket): + bl_idname = 'ArmDynamicSocket' + bl_label = 'Dynamic Socket' + arm_socket_type = 'NONE' + + def draw(self, context, layout, node, text): + layout.label(text=self.name) + + def draw_color(self, context, node): + return 0.388, 0.78, 0.388, 1 + + +class ArmFloatSocket(ArmCustomSocket): + bl_idname = 'ArmFloatSocket' + bl_label = 'Float Socket' + arm_socket_type = 'VALUE' + + default_value_raw: FloatProperty( + name='Value', + description='Input value used for unconnected socket', + precision=3, + update=_on_update_socket + ) + + def draw(self, context, layout, node, text): + draw_socket_layout(self, layout) + + def draw_color(self, context, node): + return 0.631, 0.631, 0.631, 1 + + def get_default_value(self): + return self.default_value_raw + + +class ArmIntSocket(ArmCustomSocket): + bl_idname = 'ArmIntSocket' + bl_label = 'Integer Socket' + arm_socket_type = 'INT' + + default_value_raw: IntProperty( + name='Value', + description='Input value used for unconnected socket', + update=_on_update_socket + ) + + def draw(self, context, layout, node, text): + draw_socket_layout(self, layout) + + def draw_color(self, context, node): + return 0.059, 0.522, 0.149, 1 + + def get_default_value(self): + return self.default_value_raw + + class ArmObjectSocket(ArmCustomSocket): bl_idname = 'ArmNodeSocketObject' bl_label = 'Object Socket' arm_socket_type = 'OBJECT' default_value_get: PointerProperty(name='Object', type=bpy.types.Object) # legacy version of the line after this one - default_value_raw: PointerProperty(name='Object', type=bpy.types.Object) + default_value_raw: PointerProperty(name='Object', type=bpy.types.Object, update=_on_update_socket) def __init__(self): super().__init__() @@ -115,15 +220,82 @@ class ArmObjectSocket(ArmCustomSocket): return 0.15, 0.55, 0.75, 1 -def register(): - bpy.utils.register_class(ArmActionSocket) - bpy.utils.register_class(ArmAnimActionSocket) - bpy.utils.register_class(ArmArraySocket) - bpy.utils.register_class(ArmObjectSocket) +class ArmStringSocket(ArmCustomSocket): + bl_idname = 'ArmStringSocket' + bl_label = 'String Socket' + arm_socket_type = 'STRING' + + default_value_raw: StringProperty( + name='Value', + description='Input value used for unconnected socket', + update=_on_update_socket + ) + + def draw(self, context, layout, node, text): + draw_socket_layout_split(self, layout) + + def draw_color(self, context, node): + return 0.439, 0.698, 1, 1 + + def get_default_value(self): + return self.default_value_raw -def unregister(): - bpy.utils.unregister_class(ArmObjectSocket) - bpy.utils.unregister_class(ArmArraySocket) - bpy.utils.unregister_class(ArmAnimActionSocket) - bpy.utils.unregister_class(ArmActionSocket) +class ArmVectorSocket(ArmCustomSocket): + bl_idname = 'ArmVectorSocket' + bl_label = 'Vector Socket' + arm_socket_type = 'VECTOR' + + default_value_raw: FloatVectorProperty( + name='Value', + size=3, + description='Input value used for unconnected socket', + update=_on_update_socket + ) + + def draw(self, context, layout, node, text): + if not self.is_output and not self.is_linked: + col = layout.column(align=True) + col.prop(self, 'default_value_raw', text='') + else: + layout.label(text=self.name) + + def draw_color(self, context, node): + return 0.388, 0.388, 0.78, 1 + + def get_default_value(self): + return self.default_value_raw + + +def draw_socket_layout(socket: bpy.types.NodeSocket, layout: bpy.types.UILayout, prop_name='default_value_raw'): + if not socket.is_output and not socket.is_linked: + layout.prop(socket, prop_name, text=socket.name) + else: + layout.label(text=socket.name) + + +def draw_socket_layout_split(socket: bpy.types.NodeSocket, layout: bpy.types.UILayout, prop_name='default_value_raw'): + if not socket.is_output and not socket.is_linked: + # Blender layouts use 0.4 splits + layout = layout.split(factor=0.4, align=True) + + layout.label(text=socket.name) + + if not socket.is_output and not socket.is_linked: + layout.prop(socket, prop_name, text='') + + +REG_CLASSES = ( + ArmActionSocket, + ArmAnimActionSocket, + ArmArraySocket, + ArmBoolSocket, + ArmColorSocket, + ArmDynamicSocket, + ArmFloatSocket, + ArmIntSocket, + ArmObjectSocket, + ArmStringSocket, + ArmVectorSocket, +) +register, unregister = bpy.utils.register_classes_factory(REG_CLASSES) diff --git a/blender/arm/logicnode/array/LN_array.py b/blender/arm/logicnode/array/LN_array.py index cb5cb451..39326e79 100644 --- a/blender/arm/logicnode/array/LN_array.py +++ b/blender/arm/logicnode/array/LN_array.py @@ -13,14 +13,14 @@ class ArrayNode(ArmLogicTreeNode): def init(self, context): super(ArrayNode, self).init(context) self.add_output('ArmNodeSocketArray', 'Array', is_var=True) - self.add_output('NodeSocketInt', 'Length') + self.add_output('ArmIntSocket', 'Length') def draw_buttons(self, context, layout): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketShader' + op.socket_type = 'ArmDynamicSocket' op2 = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/array/LN_array_add.py b/blender/arm/logicnode/array/LN_array_add.py index 3bd708ea..acbc5959 100644 --- a/blender/arm/logicnode/array/LN_array_add.py +++ b/blender/arm/logicnode/array/LN_array_add.py @@ -19,9 +19,9 @@ class ArrayAddNode(ArmLogicTreeNode): super(ArrayAddNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') - self.add_input('NodeSocketBool', 'Modify Original', default_value=True) - self.add_input('NodeSocketBool', 'Unique Values') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmBoolSocket', 'Modify Original', default_value=True) + self.add_input('ArmBoolSocket', 'Unique Values') + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketArray', 'Array') @@ -31,6 +31,6 @@ class ArrayAddNode(ArmLogicTreeNode): op = row.operator('arm.node_add_input_value', text='Add Input', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketShader' + op.socket_type = 'ArmDynamicSocket' op2 = row.operator('arm.node_remove_input_value', text='', icon='X', emboss=True) op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/array/LN_array_boolean.py b/blender/arm/logicnode/array/LN_array_boolean.py index 6794a57e..ae355b09 100644 --- a/blender/arm/logicnode/array/LN_array_boolean.py +++ b/blender/arm/logicnode/array/LN_array_boolean.py @@ -14,14 +14,14 @@ class BooleanArrayNode(ArmLogicTreeNode): def init(self, context): super(BooleanArrayNode, self).init(context) self.add_output('ArmNodeSocketArray', 'Array', is_var=True) - self.add_output('NodeSocketInt', 'Length') + self.add_output('ArmIntSocket', 'Length') def draw_buttons(self, context, layout): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketBool' + op.socket_type = 'ArmBoolSocket' op2 = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/array/LN_array_color.py b/blender/arm/logicnode/array/LN_array_color.py index f2066440..f569245a 100644 --- a/blender/arm/logicnode/array/LN_array_color.py +++ b/blender/arm/logicnode/array/LN_array_color.py @@ -14,14 +14,14 @@ class ColorArrayNode(ArmLogicTreeNode): def init(self, context): super(ColorArrayNode, self).init(context) self.add_output('ArmNodeSocketArray', 'Array', is_var=True) - self.add_output('NodeSocketInt', 'Length') + self.add_output('ArmIntSocket', 'Length') def draw_buttons(self, context, layout): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketColor' + op.socket_type = 'ArmColorSocket' op2 = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/array/LN_array_contains.py b/blender/arm/logicnode/array/LN_array_contains.py index a9a3e463..b0a2bc53 100644 --- a/blender/arm/logicnode/array/LN_array_contains.py +++ b/blender/arm/logicnode/array/LN_array_contains.py @@ -9,6 +9,6 @@ class ArrayContainsNode(ArmLogicTreeNode): def init(self, context): super(ArrayContainsNode, self).init(context) self.add_input('ArmNodeSocketArray', 'Array') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmDynamicSocket', 'Value') - self.add_output('NodeSocketBool', 'Contains') + self.add_output('ArmBoolSocket', 'Contains') diff --git a/blender/arm/logicnode/array/LN_array_float.py b/blender/arm/logicnode/array/LN_array_float.py index 1eeaf132..22e2019b 100644 --- a/blender/arm/logicnode/array/LN_array_float.py +++ b/blender/arm/logicnode/array/LN_array_float.py @@ -14,14 +14,14 @@ class FloatArrayNode(ArmLogicTreeNode): def init(self, context): super(FloatArrayNode, self).init(context) self.add_output('ArmNodeSocketArray', 'Array', is_var=True) - self.add_output('NodeSocketInt', 'Length') + self.add_output('ArmIntSocket', 'Length') def draw_buttons(self, context, layout): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketFloat' + op.socket_type = 'ArmFloatSocket' op2 = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/array/LN_array_get.py b/blender/arm/logicnode/array/LN_array_get.py index 2ccfe176..bda50633 100644 --- a/blender/arm/logicnode/array/LN_array_get.py +++ b/blender/arm/logicnode/array/LN_array_get.py @@ -9,6 +9,6 @@ class ArrayGetNode(ArmLogicTreeNode): def init(self, context): super(ArrayGetNode, self).init(context) self.add_input('ArmNodeSocketArray', 'Array') - self.add_input('NodeSocketInt', 'Index') + self.add_input('ArmIntSocket', 'Index') - self.add_output('NodeSocketShader', 'Value') + self.add_output('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/array/LN_array_integer.py b/blender/arm/logicnode/array/LN_array_integer.py index 5e6cb2f1..f4e0aab8 100644 --- a/blender/arm/logicnode/array/LN_array_integer.py +++ b/blender/arm/logicnode/array/LN_array_integer.py @@ -14,14 +14,14 @@ class IntegerArrayNode(ArmLogicTreeNode): def init(self, context): super(IntegerArrayNode, self).init(context) self.add_output('ArmNodeSocketArray', 'Array') - self.add_output('NodeSocketInt', 'Length') + self.add_output('ArmIntSocket', 'Length') def draw_buttons(self, context, layout): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketInt' + op.socket_type = 'ArmIntSocket' op2 = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/array/LN_array_length.py b/blender/arm/logicnode/array/LN_array_length.py index b6666533..c655ac86 100644 --- a/blender/arm/logicnode/array/LN_array_length.py +++ b/blender/arm/logicnode/array/LN_array_length.py @@ -10,4 +10,4 @@ class ArrayLengthNode(ArmLogicTreeNode): super(ArrayLengthNode, self).init(context) self.add_input('ArmNodeSocketArray', 'Array') - self.add_output('NodeSocketInt', 'Length') + 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 1e791989..18207c8e 100644 --- a/blender/arm/logicnode/array/LN_array_loop_node.py +++ b/blender/arm/logicnode/array/LN_array_loop_node.py @@ -13,6 +13,6 @@ class ArrayLoopNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketArray', 'Array') self.add_output('ArmNodeSocketAction', 'Loop') - self.add_output('NodeSocketShader', 'Value') - self.add_output('NodeSocketInt', 'Index') + self.add_output('ArmDynamicSocket', 'Value') + self.add_output('ArmIntSocket', 'Index') self.add_output('ArmNodeSocketAction', 'Done') diff --git a/blender/arm/logicnode/array/LN_array_object.py b/blender/arm/logicnode/array/LN_array_object.py index 8328ebc7..71c55d89 100644 --- a/blender/arm/logicnode/array/LN_array_object.py +++ b/blender/arm/logicnode/array/LN_array_object.py @@ -14,7 +14,7 @@ class ObjectArrayNode(ArmLogicTreeNode): def init(self, context): super(ObjectArrayNode, self).init(context) self.add_output('ArmNodeSocketArray', 'Array', is_var=True) - self.add_output('NodeSocketInt', 'Length') + self.add_output('ArmIntSocket', 'Length') def draw_buttons(self, context, layout): row = layout.row(align=True) diff --git a/blender/arm/logicnode/array/LN_array_pop.py b/blender/arm/logicnode/array/LN_array_pop.py index 8bd93a8d..9708b343 100644 --- a/blender/arm/logicnode/array/LN_array_pop.py +++ b/blender/arm/logicnode/array/LN_array_pop.py @@ -12,4 +12,4 @@ class ArrayPopNode(ArmLogicTreeNode): super(ArrayPopNode, self).init(context) self.add_input('ArmNodeSocketArray', 'Array') - self.add_output('NodeSocketShader', 'Value') + 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 9a81760b..a07c864c 100644 --- a/blender/arm/logicnode/array/LN_array_remove_by_index.py +++ b/blender/arm/logicnode/array/LN_array_remove_by_index.py @@ -12,7 +12,7 @@ class ArrayRemoveIndexNode(ArmLogicTreeNode): super(ArrayRemoveIndexNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') - self.add_input('NodeSocketInt', 'Index') + self.add_input('ArmIntSocket', 'Index') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketShader', 'Value') + self.add_output('ArmDynamicSocket', 'Value') 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 f7634ea7..8ab646fd 100644 --- a/blender/arm/logicnode/array/LN_array_remove_by_value.py +++ b/blender/arm/logicnode/array/LN_array_remove_by_value.py @@ -15,16 +15,16 @@ class ArrayRemoveValueNode(ArmLogicTreeNode): super(ArrayRemoveValueNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketShader', 'Value') + self.add_output('ArmDynamicSocket', 'Value') # def draw_buttons(self, context, layout): # row = layout.row(align=True) # op = row.operator('arm.node_add_input_value', text='New', icon='PLUS', emboss=True) # op.node_index = str(id(self)) - # op.socket_type = 'NodeSocketShader' + # op.socket_type = 'ArmDynamicSocket' # op2 = row.operator('arm.node_remove_input_value', text='', icon='X', emboss=True) # op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/array/LN_array_set.py b/blender/arm/logicnode/array/LN_array_set.py index 7c1f0197..c0fb2293 100644 --- a/blender/arm/logicnode/array/LN_array_set.py +++ b/blender/arm/logicnode/array/LN_array_set.py @@ -10,7 +10,7 @@ class ArraySetNode(ArmLogicTreeNode): super(ArraySetNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') - self.add_input('NodeSocketInt', 'Index') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmIntSocket', 'Index') + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/array/LN_array_shift.py b/blender/arm/logicnode/array/LN_array_shift.py index 6a40faf2..d1d31b37 100644 --- a/blender/arm/logicnode/array/LN_array_shift.py +++ b/blender/arm/logicnode/array/LN_array_shift.py @@ -12,4 +12,4 @@ class ArrayShiftNode(ArmLogicTreeNode): super(ArrayShiftNode, self).init(context) self.add_input('ArmNodeSocketArray', 'Array') - self.add_output('NodeSocketShader', 'Value') + 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 29ca2533..87da4910 100644 --- a/blender/arm/logicnode/array/LN_array_slice.py +++ b/blender/arm/logicnode/array/LN_array_slice.py @@ -11,7 +11,7 @@ class ArraySliceNode(ArmLogicTreeNode): def init(self, context): super(ArraySliceNode, self).init(context) self.add_input('ArmNodeSocketArray', 'Array') - self.add_input('NodeSocketInt', 'Index') - self.add_input('NodeSocketInt', 'End') + self.add_input('ArmIntSocket', 'Index') + self.add_input('ArmIntSocket', 'End') self.add_output('ArmNodeSocketArray', 'Array') diff --git a/blender/arm/logicnode/array/LN_array_splice.py b/blender/arm/logicnode/array/LN_array_splice.py index 06aa7481..ea1c28f8 100644 --- a/blender/arm/logicnode/array/LN_array_splice.py +++ b/blender/arm/logicnode/array/LN_array_splice.py @@ -12,7 +12,7 @@ class ArraySpliceNode(ArmLogicTreeNode): super(ArraySpliceNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketArray', 'Array') - self.add_input('NodeSocketInt', 'Index') - self.add_input('NodeSocketInt', 'Length') + self.add_input('ArmIntSocket', 'Index') + self.add_input('ArmIntSocket', 'Length') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/array/LN_array_string.py b/blender/arm/logicnode/array/LN_array_string.py index d1a82bb4..2052a9db 100644 --- a/blender/arm/logicnode/array/LN_array_string.py +++ b/blender/arm/logicnode/array/LN_array_string.py @@ -14,14 +14,14 @@ class StringArrayNode(ArmLogicTreeNode): def init(self, context): super(StringArrayNode, self).init(context) self.add_output('ArmNodeSocketArray', 'Array', is_var=True) - self.add_output('NodeSocketInt', 'Length') + self.add_output('ArmIntSocket', 'Length') def draw_buttons(self, context, layout): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketString' + op.socket_type = 'ArmStringSocket' op2 = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/array/LN_array_vector.py b/blender/arm/logicnode/array/LN_array_vector.py index 94ac05e0..75b08e59 100644 --- a/blender/arm/logicnode/array/LN_array_vector.py +++ b/blender/arm/logicnode/array/LN_array_vector.py @@ -14,14 +14,14 @@ class VectorArrayNode(ArmLogicTreeNode): def init(self, context): super(VectorArrayNode, self).init(context) self.add_output('ArmNodeSocketArray', 'Array', is_var=True) - self.add_output('NodeSocketInt', 'Length') + self.add_output('ArmIntSocket', 'Length') def draw_buttons(self, context, layout): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketVector' + op.socket_type = 'ArmVectorSocket' op2 = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/camera/LN_get_camera_fov.py b/blender/arm/logicnode/camera/LN_get_camera_fov.py index d35c3181..f6dc4426 100644 --- a/blender/arm/logicnode/camera/LN_get_camera_fov.py +++ b/blender/arm/logicnode/camera/LN_get_camera_fov.py @@ -12,4 +12,4 @@ class GetCameraFovNode(ArmLogicTreeNode): super(GetCameraFovNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketFloat', 'FOV') + self.add_output('ArmFloatSocket', 'FOV') diff --git a/blender/arm/logicnode/camera/LN_set_camera_fov.py b/blender/arm/logicnode/camera/LN_set_camera_fov.py index 4785c18c..2a5103ea 100644 --- a/blender/arm/logicnode/camera/LN_set_camera_fov.py +++ b/blender/arm/logicnode/camera/LN_set_camera_fov.py @@ -12,6 +12,6 @@ class SetCameraFovNode(ArmLogicTreeNode): super(SetCameraFovNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Camera') - self.add_input('NodeSocketFloat', 'FOV', default_value=0.9) + self.add_input('ArmFloatSocket', 'FOV', default_value=0.9) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_checkbox.py b/blender/arm/logicnode/canvas/LN_get_canvas_checkbox.py index 027b2015..a8860a36 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_checkbox.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_checkbox.py @@ -8,6 +8,6 @@ class CanvasGetCheckboxNode(ArmLogicTreeNode): def init(self, context): super(CanvasGetCheckboxNode, self).init(context) - self.add_input('NodeSocketString', 'Element') + self.add_input('ArmStringSocket', 'Element') - self.add_output('NodeSocketBool', 'Is Checked') + 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 09e10e71..69938c5c 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_input_text.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_input_text.py @@ -8,6 +8,6 @@ class CanvasGetInputTextNode(ArmLogicTreeNode): def init(self, context): super(CanvasGetInputTextNode, self).init(context) - self.add_input('NodeSocketString', 'Element') + self.add_input('ArmStringSocket', 'Element') - self.add_output('NodeSocketString', 'Text') + 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 3ea3c2d8..21e38a1b 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_location.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_location.py @@ -9,8 +9,8 @@ class CanvasGetLocationNode(ArmLogicTreeNode): def init(self, context): super(CanvasGetLocationNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') + self.add_input('ArmStringSocket', 'Element') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketInt', 'X') - self.add_output('NodeSocketInt', 'Y') + self.add_output('ArmIntSocket', 'X') + self.add_output('ArmIntSocket', 'Y') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_position.py b/blender/arm/logicnode/canvas/LN_get_canvas_position.py index d7704fd6..66ae4db6 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_position.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_position.py @@ -8,6 +8,6 @@ class CanvasGetPositionNode(ArmLogicTreeNode): def init(self, context): super(CanvasGetPositionNode, self).init(context) - self.add_input('NodeSocketString', 'Element') + self.add_input('ArmStringSocket', 'Element') - self.add_output('NodeSocketInt', 'Position') + 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 b7aa0795..493a740d 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_progress_bar.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_progress_bar.py @@ -9,8 +9,8 @@ class CanvasGetPBNode(ArmLogicTreeNode): def init(self, context): super(CanvasGetPBNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') + self.add_input('ArmStringSocket', 'Element') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketInt', 'At') - self.add_output('NodeSocketInt', 'Max') + self.add_output('ArmIntSocket', 'At') + self.add_output('ArmIntSocket', 'Max') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_rotation.py b/blender/arm/logicnode/canvas/LN_get_canvas_rotation.py index 342c9288..bde56b39 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_rotation.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_rotation.py @@ -9,7 +9,7 @@ class CanvasGetRotationNode(ArmLogicTreeNode): def init(self, context): super(CanvasGetRotationNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') + self.add_input('ArmStringSocket', 'Element') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketFloat', 'Rad') + self.add_output('ArmFloatSocket', 'Rad') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_scale.py b/blender/arm/logicnode/canvas/LN_get_canvas_scale.py index 631a7185..fad278f2 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_scale.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_scale.py @@ -9,8 +9,8 @@ class CanvasGetScaleNode(ArmLogicTreeNode): def init(self, context): super(CanvasGetScaleNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') + self.add_input('ArmStringSocket', 'Element') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketInt', 'Height') - self.add_output('NodeSocketInt', 'Width') + self.add_output('ArmIntSocket', 'Height') + self.add_output('ArmIntSocket', 'Width') diff --git a/blender/arm/logicnode/canvas/LN_get_canvas_slider.py b/blender/arm/logicnode/canvas/LN_get_canvas_slider.py index 70ccbac3..d6d44535 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_slider.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_slider.py @@ -8,6 +8,6 @@ class CanvasGetSliderNode(ArmLogicTreeNode): def init(self, context): super(CanvasGetSliderNode, self).init(context) - self.add_input('NodeSocketString', 'Element') + self.add_input('ArmStringSocket', 'Element') - self.add_output('NodeSocketFloat', 'Float') + 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 6c983e62..f930146f 100644 --- a/blender/arm/logicnode/canvas/LN_get_canvas_visible.py +++ b/blender/arm/logicnode/canvas/LN_get_canvas_visible.py @@ -11,6 +11,6 @@ class CanvasGetVisibleNode(ArmLogicTreeNode): def init(self, context): super(CanvasGetVisibleNode, self).init(context) - self.inputs.new('NodeSocketString', 'Element') + self.inputs.new('ArmStringSocket', 'Element') - self.outputs.new('NodeSocketBool', 'Is Visible') + 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 ba1301c1..a72501a5 100644 --- a/blender/arm/logicnode/canvas/LN_on_canvas_element.py +++ b/blender/arm/logicnode/canvas/LN_on_canvas_element.py @@ -26,7 +26,7 @@ class OnCanvasElementNode(ArmLogicTreeNode): def init(self, context): super(OnCanvasElementNode, self).init(context) - self.add_input('NodeSocketString', 'Element') + 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 174b4b01..077ece2e 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_asset.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_asset.py @@ -9,7 +9,7 @@ class CanvasSetAssetNode(ArmLogicTreeNode): def init(self, context): super(CanvasSetAssetNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') - self.add_input('NodeSocketString', 'Asset') + self.add_input('ArmStringSocket', 'Element') + self.add_input('ArmStringSocket', 'Asset') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_checkbox.py b/blender/arm/logicnode/canvas/LN_set_canvas_checkbox.py index a3759a68..293200a5 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_checkbox.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_checkbox.py @@ -9,7 +9,7 @@ class CanvasSetCheckBoxNode(ArmLogicTreeNode): def init(self, context): super(CanvasSetCheckBoxNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') - self.add_input('NodeSocketBool', 'Check') + self.add_input('ArmStringSocket', 'Element') + self.add_input('ArmBoolSocket', 'Check') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_location.py b/blender/arm/logicnode/canvas/LN_set_canvas_location.py index 12886e37..cfb43449 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_location.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_location.py @@ -9,8 +9,8 @@ class CanvasSetLocationNode(ArmLogicTreeNode): def init(self, context): super(CanvasSetLocationNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') - self.add_input('NodeSocketFloat', 'X') - self.add_input('NodeSocketFloat', 'Y') + self.add_input('ArmStringSocket', 'Element') + self.add_input('ArmFloatSocket', 'X') + self.add_input('ArmFloatSocket', 'Y') self.add_output('ArmNodeSocketAction', 'Out') 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 bd39bd1d..38ae0530 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_progress_bar.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_progress_bar.py @@ -9,8 +9,8 @@ class CanvasSetPBNode(ArmLogicTreeNode): def init(self, context): super(CanvasSetPBNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') - self.add_input('NodeSocketInt', 'At') - self.add_input('NodeSocketInt', 'Max') + self.add_input('ArmStringSocket', 'Element') + self.add_input('ArmIntSocket', 'At') + self.add_input('ArmIntSocket', 'Max') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_rotation.py b/blender/arm/logicnode/canvas/LN_set_canvas_rotation.py index 4379f61a..dae5deaf 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_rotation.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_rotation.py @@ -9,7 +9,7 @@ class CanvasSetRotationNode(ArmLogicTreeNode): def init(self, context): super(CanvasSetRotationNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') - self.add_input('NodeSocketFloat', 'Rad') + self.add_input('ArmStringSocket', 'Element') + self.add_input('ArmFloatSocket', 'Rad') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_scale.py b/blender/arm/logicnode/canvas/LN_set_canvas_scale.py index 1718c9ad..714c0030 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_scale.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_scale.py @@ -9,8 +9,8 @@ class CanvasSetScaleNode(ArmLogicTreeNode): def init(self, context): super(CanvasSetScaleNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') - self.add_input('NodeSocketInt', 'Height') - self.add_input('NodeSocketInt', 'Width') + self.add_input('ArmStringSocket', 'Element') + self.add_input('ArmIntSocket', 'Height') + self.add_input('ArmIntSocket', 'Width') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_slider.py b/blender/arm/logicnode/canvas/LN_set_canvas_slider.py index 7c7cadda..7f48cce3 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_slider.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_slider.py @@ -9,7 +9,7 @@ class CanvasSetSliderNode(ArmLogicTreeNode): def init(self, context): super(CanvasSetSliderNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') - self.add_input('NodeSocketFloat', 'Float') + self.add_input('ArmStringSocket', 'Element') + self.add_input('ArmFloatSocket', 'Float') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_text.py b/blender/arm/logicnode/canvas/LN_set_canvas_text.py index 598a4794..a706b31a 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_text.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_text.py @@ -9,7 +9,7 @@ class CanvasSetTextNode(ArmLogicTreeNode): def init(self, context): super(CanvasSetTextNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') - self.add_input('NodeSocketString', 'Text') + self.add_input('ArmStringSocket', 'Element') + self.add_input('ArmStringSocket', 'Text') self.add_output('ArmNodeSocketAction', 'Out') 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 2ac59b27..b6064691 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_text_color.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_text_color.py @@ -9,10 +9,10 @@ class CanvasSetTextColorNode(ArmLogicTreeNode): def init(self, context): super(CanvasSetTextColorNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') - self.add_input('NodeSocketFloat', 'R') - self.add_input('NodeSocketFloat', 'G') - self.add_input('NodeSocketFloat', 'B') - self.add_input('NodeSocketFloat', 'A') + self.add_input('ArmStringSocket', 'Element') + self.add_input('ArmFloatSocket', 'R') + self.add_input('ArmFloatSocket', 'G') + self.add_input('ArmFloatSocket', 'B') + self.add_input('ArmFloatSocket', 'A') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/canvas/LN_set_canvas_visible.py b/blender/arm/logicnode/canvas/LN_set_canvas_visible.py index 8e8444f4..e9af8266 100644 --- a/blender/arm/logicnode/canvas/LN_set_canvas_visible.py +++ b/blender/arm/logicnode/canvas/LN_set_canvas_visible.py @@ -9,7 +9,7 @@ class CanvasSetVisibleNode(ArmLogicTreeNode): def init(self, context): super(CanvasSetVisibleNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Element') - self.add_input('NodeSocketBool', 'Visible') + self.add_input('ArmStringSocket', 'Element') + self.add_input('ArmBoolSocket', 'Visible') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_get_mouse_lock.py b/blender/arm/logicnode/deprecated/LN_get_mouse_lock.py index 6bf63494..5a651247 100644 --- a/blender/arm/logicnode/deprecated/LN_get_mouse_lock.py +++ b/blender/arm/logicnode/deprecated/LN_get_mouse_lock.py @@ -16,7 +16,7 @@ class GetMouseLockNode(ArmLogicTreeNode): def init(self, context): super(GetMouseLockNode, self).init(context) - self.outputs.new('NodeSocketBool', 'Is Locked') + self.outputs.new('ArmBoolSocket', 'Is Locked') def get_replacement_node(self, node_tree: bpy.types.NodeTree): if self.arm_version not in (0, 1): diff --git a/blender/arm/logicnode/deprecated/LN_get_mouse_visible.py b/blender/arm/logicnode/deprecated/LN_get_mouse_visible.py index 0884b8eb..6f394deb 100644 --- a/blender/arm/logicnode/deprecated/LN_get_mouse_visible.py +++ b/blender/arm/logicnode/deprecated/LN_get_mouse_visible.py @@ -16,7 +16,7 @@ class GetMouseVisibleNode(ArmLogicTreeNode): def init(self, context): super(GetMouseVisibleNode, self).init(context) - self.outputs.new('NodeSocketBool', 'Is Visible') + self.outputs.new('ArmBoolSocket', 'Is Visible') def get_replacement_node(self, node_tree: bpy.types.NodeTree): if self.arm_version not in (0, 1): diff --git a/blender/arm/logicnode/deprecated/LN_mouse_coords.py b/blender/arm/logicnode/deprecated/LN_mouse_coords.py index df0ced8a..1244730d 100644 --- a/blender/arm/logicnode/deprecated/LN_mouse_coords.py +++ b/blender/arm/logicnode/deprecated/LN_mouse_coords.py @@ -13,9 +13,9 @@ class MouseCoordsNode(ArmLogicTreeNode): def init(self, context): super(MouseCoordsNode, self).init(context) - self.add_output('NodeSocketVector', 'Coords') - self.add_output('NodeSocketVector', 'Movement') - self.add_output('NodeSocketInt', 'Wheel') + self.add_output('ArmVectorSocket', 'Coords') + self.add_output('ArmVectorSocket', 'Movement') + self.add_output('ArmIntSocket', 'Wheel') def get_replacement_node(self, node_tree: bpy.types.NodeTree): if self.arm_version not in (0, 1): diff --git a/blender/arm/logicnode/deprecated/LN_on_gamepad.py b/blender/arm/logicnode/deprecated/LN_on_gamepad.py index 39433482..fe1f2913 100644 --- a/blender/arm/logicnode/deprecated/LN_on_gamepad.py +++ b/blender/arm/logicnode/deprecated/LN_on_gamepad.py @@ -45,7 +45,7 @@ class OnGamepadNode(ArmLogicTreeNode): def init(self, context): super(OnGamepadNode, self).init(context) self.add_output('ArmNodeSocketAction', 'Out') - self.add_input('NodeSocketInt', 'Gamepad') + self.add_input('ArmIntSocket', 'Gamepad') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/deprecated/LN_pause_trait.py b/blender/arm/logicnode/deprecated/LN_pause_trait.py index f5e921a7..7baa2d9f 100644 --- a/blender/arm/logicnode/deprecated/LN_pause_trait.py +++ b/blender/arm/logicnode/deprecated/LN_pause_trait.py @@ -13,5 +13,5 @@ class PauseTraitNode(ArmLogicTreeNode): def init(self, context): super(PauseTraitNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Trait') + 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 c914a0b0..a386d7f2 100644 --- a/blender/arm/logicnode/deprecated/LN_play_action.py +++ b/blender/arm/logicnode/deprecated/LN_play_action.py @@ -15,6 +15,6 @@ class PlayActionNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketAnimAction', 'Action') - self.add_input('NodeSocketFloat', 'Blend', default_value=0.2) + self.add_input('ArmFloatSocket', 'Blend', default_value=0.2) self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketAction', 'Done') diff --git a/blender/arm/logicnode/deprecated/LN_resume_trait.py b/blender/arm/logicnode/deprecated/LN_resume_trait.py index 0ea926e9..ccb9e183 100644 --- a/blender/arm/logicnode/deprecated/LN_resume_trait.py +++ b/blender/arm/logicnode/deprecated/LN_resume_trait.py @@ -13,5 +13,5 @@ class ResumeTraitNode(ArmLogicTreeNode): def init(self, context): super(ResumeTraitNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Trait') + 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 a1b2b5c4..49fe997d 100644 --- a/blender/arm/logicnode/deprecated/LN_rotate_object_around_axis.py +++ b/blender/arm/logicnode/deprecated/LN_rotate_object_around_axis.py @@ -15,8 +15,8 @@ class RotateObjectAroundAxisNode(ArmLogicTreeNode): super(RotateObjectAroundAxisNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketVector', 'Axis', default_value=[0, 0, 1]) - self.add_input('NodeSocketFloat', 'Angle') + self.add_input('ArmVectorSocket', 'Axis', default_value=[0, 0, 1]) + self.add_input('ArmFloatSocket', 'Angle') self.add_output('ArmNodeSocketAction', 'Out') def get_replacement_node(self, node_tree: bpy.types.NodeTree): diff --git a/blender/arm/logicnode/deprecated/LN_scale_object.py b/blender/arm/logicnode/deprecated/LN_scale_object.py index 4b3bb898..58f1078f 100644 --- a/blender/arm/logicnode/deprecated/LN_scale_object.py +++ b/blender/arm/logicnode/deprecated/LN_scale_object.py @@ -15,5 +15,5 @@ class ScaleObjectNode(ArmLogicTreeNode): super(ScaleObjectNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketVector', 'Scale') + self.add_input('ArmVectorSocket', 'Scale') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_set_mouse_lock.py b/blender/arm/logicnode/deprecated/LN_set_mouse_lock.py index 5612e87e..bb5ca4bb 100644 --- a/blender/arm/logicnode/deprecated/LN_set_mouse_lock.py +++ b/blender/arm/logicnode/deprecated/LN_set_mouse_lock.py @@ -14,7 +14,7 @@ class SetMouseLockNode(ArmLogicTreeNode): def init(self, context): super(SetMouseLockNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketBool', 'Lock') + self.add_input('ArmBoolSocket', 'Lock') self.add_output('ArmNodeSocketAction', 'Out') def get_replacement_node(self, node_tree: bpy.types.NodeTree): diff --git a/blender/arm/logicnode/deprecated/LN_set_mouse_visible.py b/blender/arm/logicnode/deprecated/LN_set_mouse_visible.py index c85738e6..19c29d1b 100644 --- a/blender/arm/logicnode/deprecated/LN_set_mouse_visible.py +++ b/blender/arm/logicnode/deprecated/LN_set_mouse_visible.py @@ -14,7 +14,7 @@ class ShowMouseNode(ArmLogicTreeNode): def init(self, context): super(ShowMouseNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketBool', 'Show') + self.add_input('ArmBoolSocket', 'Show') self.add_output('ArmNodeSocketAction', 'Out') def get_replacement_node(self, node_tree: bpy.types.NodeTree): diff --git a/blender/arm/logicnode/deprecated/LN_set_object_material.py b/blender/arm/logicnode/deprecated/LN_set_object_material.py index 25dc3f24..4ca6b967 100644 --- a/blender/arm/logicnode/deprecated/LN_set_object_material.py +++ b/blender/arm/logicnode/deprecated/LN_set_object_material.py @@ -14,5 +14,5 @@ class SetMaterialNode(ArmLogicTreeNode): super(SetMaterialNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketShader', 'Material') + self.add_input('ArmDynamicSocket', 'Material') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/deprecated/LN_surface_coords.py b/blender/arm/logicnode/deprecated/LN_surface_coords.py index dff2b872..480d4d95 100644 --- a/blender/arm/logicnode/deprecated/LN_surface_coords.py +++ b/blender/arm/logicnode/deprecated/LN_surface_coords.py @@ -14,5 +14,5 @@ class SurfaceCoordsNode(ArmLogicTreeNode): def init(self, context): super(SurfaceCoordsNode, self).init(context) - self.add_output('NodeSocketVector', 'Coords') - self.add_output('NodeSocketVector', 'Movement') + self.add_output('ArmVectorSocket', 'Coords') + self.add_output('ArmVectorSocket', 'Movement') diff --git a/blender/arm/logicnode/event/LN_on_timer.py b/blender/arm/logicnode/event/LN_on_timer.py index 209c0bc8..603755d2 100644 --- a/blender/arm/logicnode/event/LN_on_timer.py +++ b/blender/arm/logicnode/event/LN_on_timer.py @@ -11,7 +11,7 @@ class OnTimerNode(ArmLogicTreeNode): def init(self, context): super(OnTimerNode, self).init(context) - self.add_input('NodeSocketFloat', 'Duration') - self.add_input('NodeSocketBool', 'Repeat') + self.add_input('ArmFloatSocket', 'Duration') + self.add_input('ArmBoolSocket', 'Repeat') self.add_output('ArmNodeSocketAction', 'Out') 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 e9ebce12..03dd9ed1 100644 --- a/blender/arm/logicnode/event/LN_send_event_to_object.py +++ b/blender/arm/logicnode/event/LN_send_event_to_object.py @@ -16,7 +16,7 @@ class SendEventNode(ArmLogicTreeNode): def init(self, context): super(SendEventNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Event') + self.add_input('ArmStringSocket', 'Event') self.add_input('ArmNodeSocketObject', 'Object') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/event/LN_send_global_event.py b/blender/arm/logicnode/event/LN_send_global_event.py index a85b0b6d..25943b51 100644 --- a/blender/arm/logicnode/event/LN_send_global_event.py +++ b/blender/arm/logicnode/event/LN_send_global_event.py @@ -15,6 +15,6 @@ class SendGlobalEventNode(ArmLogicTreeNode): def init(self, context): super(SendGlobalEventNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Event') + self.add_input('ArmStringSocket', 'Event') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/input/LN_gamepad.py b/blender/arm/logicnode/input/LN_gamepad.py index df8dec2b..09c5cd0e 100644 --- a/blender/arm/logicnode/input/LN_gamepad.py +++ b/blender/arm/logicnode/input/LN_gamepad.py @@ -49,9 +49,9 @@ class GamepadNode(ArmLogicTreeNode): def init(self, context): super(GamepadNode, self).init(context) self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketBool', 'State') + self.add_output('ArmBoolSocket', 'State') - self.add_input('NodeSocketInt', 'Gamepad') + self.add_input('ArmIntSocket', 'Gamepad') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/input/LN_gamepad_coords.py b/blender/arm/logicnode/input/LN_gamepad_coords.py index 959db1e8..fdb61b75 100644 --- a/blender/arm/logicnode/input/LN_gamepad_coords.py +++ b/blender/arm/logicnode/input/LN_gamepad_coords.py @@ -13,11 +13,11 @@ class GamepadCoordsNode(ArmLogicTreeNode): def init(self, context): super(GamepadCoordsNode, self).init(context) - self.add_output('NodeSocketVector', 'Left Stick') - self.add_output('NodeSocketVector', 'Right Stick') - self.add_output('NodeSocketVector', 'Left Movement') - self.add_output('NodeSocketVector', 'Right Movement') - self.add_output('NodeSocketFloat', 'Left Trigger') - self.add_output('NodeSocketFloat', 'Right Trigger') + self.add_output('ArmVectorSocket', 'Left Stick') + self.add_output('ArmVectorSocket', 'Right Stick') + self.add_output('ArmVectorSocket', 'Left Movement') + self.add_output('ArmVectorSocket', 'Right Movement') + self.add_output('ArmFloatSocket', 'Left Trigger') + self.add_output('ArmFloatSocket', 'Right Trigger') - self.add_input('NodeSocketInt', 'Gamepad') + self.add_input('ArmIntSocket', 'Gamepad') diff --git a/blender/arm/logicnode/input/LN_get_cursor_location.py b/blender/arm/logicnode/input/LN_get_cursor_location.py index bc740be7..2d102343 100644 --- a/blender/arm/logicnode/input/LN_get_cursor_location.py +++ b/blender/arm/logicnode/input/LN_get_cursor_location.py @@ -9,7 +9,7 @@ class GetCursorLocationNode(ArmLogicTreeNode): def init(self, context): super(GetCursorLocationNode, self).init(context) - self.add_output('NodeSocketInt', 'X') - self.add_output('NodeSocketInt', 'Y') - self.add_output('NodeSocketInt', 'Inverted X') - self.add_output('NodeSocketInt', 'Inverted Y') + self.add_output('ArmIntSocket', 'X') + self.add_output('ArmIntSocket', 'Y') + self.add_output('ArmIntSocket', 'Inverted X') + self.add_output('ArmIntSocket', 'Inverted Y') diff --git a/blender/arm/logicnode/input/LN_get_cursor_state.py b/blender/arm/logicnode/input/LN_get_cursor_state.py index 221bf550..b09c253a 100644 --- a/blender/arm/logicnode/input/LN_get_cursor_state.py +++ b/blender/arm/logicnode/input/LN_get_cursor_state.py @@ -18,6 +18,6 @@ class GetCursorStateNode(ArmLogicTreeNode): def init(self, context): super(GetCursorStateNode, self).init(context) - self.outputs.new('NodeSocketBool', 'Is Hidden Locked') - self.outputs.new('NodeSocketBool', 'Is Hidden') - self.outputs.new('NodeSocketBool', 'Is Locked') + 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 ee217b5c..a3ac08d2 100644 --- a/blender/arm/logicnode/input/LN_get_mouse_movement.py +++ b/blender/arm/logicnode/input/LN_get_mouse_movement.py @@ -12,13 +12,13 @@ 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', 'Y Multiplier', default_value=-1.0) - self.add_input('NodeSocketFloat', 'Wheel Delta Multiplier', default_value=-1.0) + self.add_input('ArmFloatSocket', 'X Multiplier', default_value=-1.0) + self.add_input('ArmFloatSocket', 'Y Multiplier', default_value=-1.0) + self.add_input('ArmFloatSocket', 'Wheel Delta Multiplier', default_value=-1.0) - self.add_output('NodeSocketFloat', 'X') - self.add_output('NodeSocketFloat', 'Y') - self.add_output('NodeSocketFloat', 'Multiplied X') - self.add_output('NodeSocketFloat', 'Multiplied Y') - self.add_output('NodeSocketInt', 'Wheel Delta') - self.add_output('NodeSocketFloat', 'Multiplied Wheel Delta') + self.add_output('ArmFloatSocket', 'X') + self.add_output('ArmFloatSocket', 'Y') + self.add_output('ArmFloatSocket', 'Multiplied X') + self.add_output('ArmFloatSocket', 'Multiplied Y') + self.add_output('ArmIntSocket', 'Wheel Delta') + self.add_output('ArmFloatSocket', 'Multiplied Wheel Delta') diff --git a/blender/arm/logicnode/input/LN_get_touch_location.py b/blender/arm/logicnode/input/LN_get_touch_location.py index 88d6f6df..1acf6028 100644 --- a/blender/arm/logicnode/input/LN_get_touch_location.py +++ b/blender/arm/logicnode/input/LN_get_touch_location.py @@ -9,7 +9,7 @@ class GetTouchLocationNode(ArmLogicTreeNode): def init(self, context): super(GetTouchLocationNode, self).init(context) - self.add_output('NodeSocketInt', 'X') - self.add_output('NodeSocketInt', 'Y') - self.add_output('NodeSocketInt', 'Inverted X') - self.add_output('NodeSocketInt', 'Inverted Y') + self.add_output('ArmIntSocket', 'X') + self.add_output('ArmIntSocket', 'Y') + self.add_output('ArmIntSocket', 'Inverted X') + self.add_output('ArmIntSocket', 'Inverted Y') diff --git a/blender/arm/logicnode/input/LN_get_touch_movement.py b/blender/arm/logicnode/input/LN_get_touch_movement.py index 80f918f0..6c110679 100644 --- a/blender/arm/logicnode/input/LN_get_touch_movement.py +++ b/blender/arm/logicnode/input/LN_get_touch_movement.py @@ -9,10 +9,10 @@ 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', 'Y Multiplier', default_value=-1.0) + self.add_input('ArmFloatSocket', 'X Multiplier', default_value=-1.0) + self.add_input('ArmFloatSocket', 'Y Multiplier', default_value=-1.0) - self.add_output('NodeSocketFloat', 'X') - self.add_output('NodeSocketFloat', 'Y') - self.add_output('NodeSocketFloat', 'Multiplied X') - self.add_output('NodeSocketFloat', 'Multiplied Y') + self.add_output('ArmFloatSocket', 'X') + self.add_output('ArmFloatSocket', 'Y') + self.add_output('ArmFloatSocket', 'Multiplied X') + self.add_output('ArmFloatSocket', 'Multiplied Y') diff --git a/blender/arm/logicnode/input/LN_keyboard.py b/blender/arm/logicnode/input/LN_keyboard.py index 230425db..b1613b02 100644 --- a/blender/arm/logicnode/input/LN_keyboard.py +++ b/blender/arm/logicnode/input/LN_keyboard.py @@ -73,7 +73,7 @@ class KeyboardNode(ArmLogicTreeNode): def init(self, context): super(KeyboardNode, self).init(context) self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketBool', 'State') + self.add_output('ArmBoolSocket', 'State') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/input/LN_mouse.py b/blender/arm/logicnode/input/LN_mouse.py index 3152a132..69663544 100644 --- a/blender/arm/logicnode/input/LN_mouse.py +++ b/blender/arm/logicnode/input/LN_mouse.py @@ -24,7 +24,7 @@ class MouseNode(ArmLogicTreeNode): def init(self, context): super(MouseNode, self).init(context) self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketBool', 'State') + self.add_output('ArmBoolSocket', 'State') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/input/LN_on_swipe.py b/blender/arm/logicnode/input/LN_on_swipe.py index ed104a41..61c11913 100644 --- a/blender/arm/logicnode/input/LN_on_swipe.py +++ b/blender/arm/logicnode/input/LN_on_swipe.py @@ -7,7 +7,7 @@ class NodeAddOutputButton(bpy.types.Operator): bl_label = 'Add 4 States' bl_options = {'UNDO', 'INTERNAL'} node_index: StringProperty(name='Node Index', default='') - socket_type: StringProperty(name='Socket Type', default='NodeSocketShader') + socket_type: StringProperty(name='Socket Type', default='ArmDynamicSocket') name_format: StringProperty(name='Name Format', default='Output {0}') index_name_offset: IntProperty(name='Index Name Offset', default=0) @@ -21,10 +21,10 @@ class NodeAddOutputButton(bpy.types.Operator): global array_nodes node = array_nodes[self.node_index] outs = node.outputs - outs.new('NodeSocketBool', self.get_name_state(len(outs), node.min_outputs)) - outs.new('NodeSocketBool', self.get_name_state(len(outs), node.min_outputs)) - outs.new('NodeSocketBool', self.get_name_state(len(outs), node.min_outputs)) - outs.new('NodeSocketBool', self.get_name_state(len(outs), node.min_outputs)) + outs.new('ArmBoolSocket', self.get_name_state(len(outs), node.min_outputs)) + outs.new('ArmBoolSocket', self.get_name_state(len(outs), node.min_outputs)) + outs.new('ArmBoolSocket', self.get_name_state(len(outs), node.min_outputs)) + outs.new('ArmBoolSocket', self.get_name_state(len(outs), node.min_outputs)) return{'FINISHED'} # Custom class for remove output parameters (in 4 directions) @@ -61,14 +61,14 @@ class OnSwipeNode(ArmLogicTreeNode): def init(self, context): super(OnSwipeNode, self).init(context) - self.inputs.new('NodeSocketFloat', 'Time') + self.inputs.new('ArmFloatSocket', 'Time') self.inputs[-1].default_value = 0.15 - self.inputs.new('NodeSocketInt', 'Min Length (px)') + self.inputs.new('ArmIntSocket', 'Min Length (px)') self.inputs[-1].default_value = 100 self.outputs.new('ArmNodeSocketAction', 'Out') - self.outputs.new('NodeSocketVector', 'Direction') - self.outputs.new('NodeSocketInt', 'Length (px)') - self.outputs.new('NodeSocketInt', 'Angle (0-360)') + self.outputs.new('ArmVectorSocket', 'Direction') + self.outputs.new('ArmIntSocket', 'Length (px)') + self.outputs.new('ArmIntSocket', 'Angle (0-360)') # Draw node buttons def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/input/LN_on_tap_screen.py b/blender/arm/logicnode/input/LN_on_tap_screen.py index 9d27e05c..c0450ca0 100644 --- a/blender/arm/logicnode/input/LN_on_tap_screen.py +++ b/blender/arm/logicnode/input/LN_on_tap_screen.py @@ -20,15 +20,15 @@ class OnTapScreen(ArmLogicTreeNode): def init(self, context): super(OnTapScreen, self).init(context) - self.add_input('NodeSocketFloat', 'Duration') + self.add_input('ArmFloatSocket', 'Duration') self.inputs[-1].default_value = 0.3 - self.add_input('NodeSocketFloat', 'Interval') + self.add_input('ArmFloatSocket', 'Interval') self.inputs[-1].default_value = 0.0 - self.add_input('NodeSocketInt', 'Repeat') + self.add_input('ArmIntSocket', 'Repeat') self.inputs[-1].default_value = 2 self.add_output('ArmNodeSocketAction', 'Done') self.add_output('ArmNodeSocketAction', 'Fail') self.add_output('ArmNodeSocketAction', 'Tap') - self.add_output('NodeSocketInt', 'Tap Number') - self.add_output('NodeSocketVector', 'Coords') + self.add_output('ArmIntSocket', 'Tap Number') + self.add_output('ArmVectorSocket', 'Coords') diff --git a/blender/arm/logicnode/input/LN_sensor_coords.py b/blender/arm/logicnode/input/LN_sensor_coords.py index 9687630e..439f8eb1 100644 --- a/blender/arm/logicnode/input/LN_sensor_coords.py +++ b/blender/arm/logicnode/input/LN_sensor_coords.py @@ -9,4 +9,4 @@ class SensorCoordsNode(ArmLogicTreeNode): def init(self, context): super(SensorCoordsNode, self).init(context) - self.add_output('NodeSocketVector', 'Coords') + 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 15f280cb..c1f38fde 100644 --- a/blender/arm/logicnode/input/LN_set_cursor_state.py +++ b/blender/arm/logicnode/input/LN_set_cursor_state.py @@ -25,7 +25,7 @@ class SetCursorStateNode(ArmLogicTreeNode): def init(self, context): super(SetCursorStateNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketBool', 'State') + self.add_input('ArmBoolSocket', 'State') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/input/LN_touch.py b/blender/arm/logicnode/input/LN_touch.py index 2beb6ac1..ffbc32c6 100644 --- a/blender/arm/logicnode/input/LN_touch.py +++ b/blender/arm/logicnode/input/LN_touch.py @@ -18,7 +18,7 @@ class SurfaceNode(ArmLogicTreeNode): def init(self, context): super(SurfaceNode, self).init(context) self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketBool', 'State') + self.add_output('ArmBoolSocket', 'State') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/input/LN_virtual_button.py b/blender/arm/logicnode/input/LN_virtual_button.py index 9d4c9c3f..28a52189 100644 --- a/blender/arm/logicnode/input/LN_virtual_button.py +++ b/blender/arm/logicnode/input/LN_virtual_button.py @@ -18,7 +18,7 @@ class VirtualButtonNode(ArmLogicTreeNode): def init(self, context): super(VirtualButtonNode, self).init(context) self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketBool', 'State') + self.add_output('ArmBoolSocket', 'State') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/light/LN_set_light_color.py b/blender/arm/logicnode/light/LN_set_light_color.py index a62d8366..38b3d6ef 100644 --- a/blender/arm/logicnode/light/LN_set_light_color.py +++ b/blender/arm/logicnode/light/LN_set_light_color.py @@ -10,6 +10,6 @@ class SetLightColorNode(ArmLogicTreeNode): super(SetLightColorNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Light') - self.add_input('NodeSocketColor', 'Color', default_value=[1.0, 1.0, 1.0, 1.0]) + self.add_input('ArmColorSocket', 'Color', default_value=[1.0, 1.0, 1.0, 1.0]) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/light/LN_set_light_strength.py b/blender/arm/logicnode/light/LN_set_light_strength.py index cd04b753..cbf11700 100644 --- a/blender/arm/logicnode/light/LN_set_light_strength.py +++ b/blender/arm/logicnode/light/LN_set_light_strength.py @@ -10,6 +10,6 @@ class SetLightStrengthNode(ArmLogicTreeNode): super(SetLightStrengthNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Light') - self.add_input('NodeSocketFloat', 'Strength', default_value=250) + self.add_input('ArmFloatSocket', 'Strength', default_value=250) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/logic/LN_branch.py b/blender/arm/logicnode/logic/LN_branch.py index 45037e1d..d7b5536d 100644 --- a/blender/arm/logicnode/logic/LN_branch.py +++ b/blender/arm/logicnode/logic/LN_branch.py @@ -11,7 +11,7 @@ class BranchNode(ArmLogicTreeNode): def init(self, context): super(BranchNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketBool', 'Bool') + self.add_input('ArmBoolSocket', 'Bool') self.add_output('ArmNodeSocketAction', 'True') self.add_output('ArmNodeSocketAction', 'False') diff --git a/blender/arm/logicnode/logic/LN_call_function.py b/blender/arm/logicnode/logic/LN_call_function.py index 0dce0371..20808c71 100644 --- a/blender/arm/logicnode/logic/LN_call_function.py +++ b/blender/arm/logicnode/logic/LN_call_function.py @@ -16,17 +16,17 @@ class CallFunctionNode(ArmLogicTreeNode): def init(self, context): super(CallFunctionNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Trait/Any') - self.add_input('NodeSocketString', 'Function') + self.add_input('ArmDynamicSocket', 'Trait/Any') + self.add_input('ArmStringSocket', 'Function') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketShader', 'Result') + self.add_output('ArmDynamicSocket', 'Result') def draw_buttons(self, context, layout): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='Add Arg', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketShader' + op.socket_type = 'ArmDynamicSocket' op.name_format = "Arg {0}" op.index_name_offset = -2 op2 = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) diff --git a/blender/arm/logicnode/logic/LN_function.py b/blender/arm/logicnode/logic/LN_function.py index ee2ecc7d..5af1e5e7 100644 --- a/blender/arm/logicnode/logic/LN_function.py +++ b/blender/arm/logicnode/logic/LN_function.py @@ -27,7 +27,7 @@ class FunctionNode(ArmLogicTreeNode): row = layout.row(align=True) op = row.operator('arm.node_add_output', text='Add Arg', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketShader' + op.socket_type = 'ArmDynamicSocket' op.name_format = "Arg {0}" op.index_name_offset = 0 op2 = row.operator('arm.node_remove_output', text='', icon='X', emboss=True) diff --git a/blender/arm/logicnode/logic/LN_function_output.py b/blender/arm/logicnode/logic/LN_function_output.py index 6ac65e7c..87343512 100644 --- a/blender/arm/logicnode/logic/LN_function_output.py +++ b/blender/arm/logicnode/logic/LN_function_output.py @@ -13,7 +13,7 @@ class FunctionOutputNode(ArmLogicTreeNode): def init(self, context): super(FunctionOutputNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmDynamicSocket', 'Value') function_name: StringProperty(name="Name") diff --git a/blender/arm/logicnode/logic/LN_gate.py b/blender/arm/logicnode/logic/LN_gate.py index ad931f7c..286c6580 100644 --- a/blender/arm/logicnode/logic/LN_gate.py +++ b/blender/arm/logicnode/logic/LN_gate.py @@ -41,8 +41,8 @@ class GateNode(ArmLogicTreeNode): def init(self, context): super(GateNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Input 1') - self.add_input('NodeSocketShader', 'Input 2') + self.add_input('ArmDynamicSocket', 'Input 1') + self.add_input('ArmDynamicSocket', 'Input 2') self.add_output('ArmNodeSocketAction', 'True') self.add_output('ArmNodeSocketAction', 'False') @@ -57,6 +57,6 @@ class GateNode(ArmLogicTreeNode): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketShader' + op.socket_type = 'ArmDynamicSocket' op2 = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/logic/LN_invert_boolean.py b/blender/arm/logicnode/logic/LN_invert_boolean.py index 924ab58e..5c5475f1 100644 --- a/blender/arm/logicnode/logic/LN_invert_boolean.py +++ b/blender/arm/logicnode/logic/LN_invert_boolean.py @@ -8,6 +8,6 @@ class NotNode(ArmLogicTreeNode): def init(self, context): super(NotNode, self).init(context) - self.add_input('NodeSocketBool', 'Bool In') + self.add_input('ArmBoolSocket', 'Bool In') - self.add_output('NodeSocketBool', 'Bool Out') + self.add_output('ArmBoolSocket', 'Bool Out') diff --git a/blender/arm/logicnode/logic/LN_is_false.py b/blender/arm/logicnode/logic/LN_is_false.py index 8eb86772..a4ec30df 100644 --- a/blender/arm/logicnode/logic/LN_is_false.py +++ b/blender/arm/logicnode/logic/LN_is_false.py @@ -13,6 +13,6 @@ class IsFalseNode(ArmLogicTreeNode): def init(self, context): super(IsFalseNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketBool', 'Bool') + self.add_input('ArmBoolSocket', 'Bool') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/logic/LN_is_not_null.py b/blender/arm/logicnode/logic/LN_is_not_null.py index 4e7e0cb4..200b4cdf 100644 --- a/blender/arm/logicnode/logic/LN_is_not_null.py +++ b/blender/arm/logicnode/logic/LN_is_not_null.py @@ -12,6 +12,6 @@ class IsNotNoneNode(ArmLogicTreeNode): def init(self, context): super(IsNotNoneNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/logic/LN_is_null.py b/blender/arm/logicnode/logic/LN_is_null.py index b8f77a80..a08e2c32 100644 --- a/blender/arm/logicnode/logic/LN_is_null.py +++ b/blender/arm/logicnode/logic/LN_is_null.py @@ -13,6 +13,6 @@ class IsNoneNode(ArmLogicTreeNode): def init(self, context): super(IsNoneNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/logic/LN_is_true.py b/blender/arm/logicnode/logic/LN_is_true.py index 21f255d0..6e88f6b8 100644 --- a/blender/arm/logicnode/logic/LN_is_true.py +++ b/blender/arm/logicnode/logic/LN_is_true.py @@ -12,6 +12,6 @@ class IsTrueNode(ArmLogicTreeNode): def init(self, context): super(IsTrueNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketBool', 'Bool') + self.add_input('ArmBoolSocket', 'Bool') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/logic/LN_loop.py b/blender/arm/logicnode/logic/LN_loop.py index 9d69085e..d6ef4b0e 100644 --- a/blender/arm/logicnode/logic/LN_loop.py +++ b/blender/arm/logicnode/logic/LN_loop.py @@ -23,11 +23,11 @@ class LoopNode(ArmLogicTreeNode): def init(self, context): super(LoopNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketInt', 'From') - self.add_input('NodeSocketInt', 'To') + self.add_input('ArmIntSocket', 'From') + self.add_input('ArmIntSocket', 'To') self.add_output('ArmNodeSocketAction', 'Loop') - self.add_output('NodeSocketInt', 'Index') + self.add_output('ArmIntSocket', 'Index') self.add_output('ArmNodeSocketAction', 'Done') def draw_label(self) -> str: diff --git a/blender/arm/logicnode/logic/LN_null.py b/blender/arm/logicnode/logic/LN_null.py index 610328a1..7ed6a18f 100644 --- a/blender/arm/logicnode/logic/LN_null.py +++ b/blender/arm/logicnode/logic/LN_null.py @@ -8,4 +8,4 @@ class NoneNode(ArmLogicTreeNode): def init(self, context): super(NoneNode, self).init(context) - self.add_output('NodeSocketShader', 'Null') + self.add_output('ArmDynamicSocket', 'Null') diff --git a/blender/arm/logicnode/logic/LN_output_to_boolean.py b/blender/arm/logicnode/logic/LN_output_to_boolean.py index f7ed282c..e8b040db 100644 --- a/blender/arm/logicnode/logic/LN_output_to_boolean.py +++ b/blender/arm/logicnode/logic/LN_output_to_boolean.py @@ -11,4 +11,4 @@ class ToBoolNode(ArmLogicTreeNode): super(ToBoolNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_output('NodeSocketBool', 'Bool') + 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 95a9ddba..26bd5246 100644 --- a/blender/arm/logicnode/logic/LN_switch_output.py +++ b/blender/arm/logicnode/logic/LN_switch_output.py @@ -18,7 +18,7 @@ class SwitchNode(ArmLogicTreeNode): def init(self, context): super(SwitchNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Default') @@ -26,7 +26,7 @@ class SwitchNode(ArmLogicTreeNode): row = layout.row(align=True) op = row.operator('arm.node_add_input_output', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.in_socket_type = 'NodeSocketShader' + op.in_socket_type = 'ArmDynamicSocket' op.out_socket_type = 'ArmNodeSocketAction' op.in_name_format = 'Case {0}' op.out_name_format = 'Case {0}' diff --git a/blender/arm/logicnode/logic/LN_value_changed.py b/blender/arm/logicnode/logic/LN_value_changed.py index 42b9ae0a..c805d3a1 100644 --- a/blender/arm/logicnode/logic/LN_value_changed.py +++ b/blender/arm/logicnode/logic/LN_value_changed.py @@ -9,7 +9,7 @@ class ValueChangedNode(ArmLogicTreeNode): def init(self, context): super(ValueChangedNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Changed') self.add_output('ArmNodeSocketAction', 'Unchanged') diff --git a/blender/arm/logicnode/logic/LN_while_true.py b/blender/arm/logicnode/logic/LN_while_true.py index ba99b9ad..f817c1fd 100644 --- a/blender/arm/logicnode/logic/LN_while_true.py +++ b/blender/arm/logicnode/logic/LN_while_true.py @@ -18,7 +18,7 @@ class WhileNode(ArmLogicTreeNode): def init(self, context): super(WhileNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketBool', 'Condition') + self.add_input('ArmBoolSocket', 'Condition') self.add_output('ArmNodeSocketAction', 'Loop') self.add_output('ArmNodeSocketAction', 'Done') diff --git a/blender/arm/logicnode/material/LN_get_object_material.py b/blender/arm/logicnode/material/LN_get_object_material.py index 864c48ee..ec560fcf 100644 --- a/blender/arm/logicnode/material/LN_get_object_material.py +++ b/blender/arm/logicnode/material/LN_get_object_material.py @@ -9,6 +9,6 @@ class GetMaterialNode(ArmLogicTreeNode): def init(self, context): super(GetMaterialNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketInt', 'Slot') + self.add_input('ArmIntSocket', 'Slot') - self.add_output('NodeSocketShader', 'Material') + self.add_output('ArmDynamicSocket', 'Material') diff --git a/blender/arm/logicnode/material/LN_material.py b/blender/arm/logicnode/material/LN_material.py index 7b3a4cc0..63cf9c46 100644 --- a/blender/arm/logicnode/material/LN_material.py +++ b/blender/arm/logicnode/material/LN_material.py @@ -22,7 +22,7 @@ class MaterialNode(ArmLogicTreeNode): def init(self, context): super(MaterialNode, self).init(context) - self.add_output('NodeSocketShader', 'Material', is_var=True) + self.add_output('ArmDynamicSocket', 'Material', is_var=True) def draw_buttons(self, context, layout): layout.prop_search(self, 'property0', bpy.data, 'materials', icon='NONE', text='') 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 777794c2..e6188f76 100644 --- a/blender/arm/logicnode/material/LN_set_material_image_param.py +++ b/blender/arm/logicnode/material/LN_set_material_image_param.py @@ -10,8 +10,8 @@ class SetMaterialImageParamNode(ArmLogicTreeNode): def init(self, context): super(SetMaterialImageParamNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Material') - self.add_input('NodeSocketString', 'Node') - self.add_input('NodeSocketString', 'Image') + self.add_input('ArmDynamicSocket', 'Material') + self.add_input('ArmStringSocket', 'Node') + self.add_input('ArmStringSocket', 'Image') self.add_output('ArmNodeSocketAction', 'Out') 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 34948c9d..1b826834 100644 --- a/blender/arm/logicnode/material/LN_set_material_rgb_param.py +++ b/blender/arm/logicnode/material/LN_set_material_rgb_param.py @@ -10,8 +10,8 @@ class SetMaterialRgbParamNode(ArmLogicTreeNode): def init(self, context): super(SetMaterialRgbParamNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Material') - self.add_input('NodeSocketString', 'Node') - self.add_input('NodeSocketColor', 'Color') + self.add_input('ArmDynamicSocket', 'Material') + self.add_input('ArmStringSocket', 'Node') + self.add_input('ArmColorSocket', 'Color') self.add_output('ArmNodeSocketAction', 'Out') 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 426807d1..afae0aa7 100644 --- a/blender/arm/logicnode/material/LN_set_material_value_param.py +++ b/blender/arm/logicnode/material/LN_set_material_value_param.py @@ -10,8 +10,8 @@ class SetMaterialValueParamNode(ArmLogicTreeNode): def init(self, context): super(SetMaterialValueParamNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Material') - self.add_input('NodeSocketString', 'Node') - self.add_input('NodeSocketFloat', 'Float') + self.add_input('ArmDynamicSocket', 'Material') + self.add_input('ArmStringSocket', 'Node') + self.add_input('ArmFloatSocket', 'Float') self.add_output('ArmNodeSocketAction', 'Out') 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 3806c898..acfa6a68 100644 --- a/blender/arm/logicnode/material/LN_set_object_material_slot.py +++ b/blender/arm/logicnode/material/LN_set_object_material_slot.py @@ -10,7 +10,7 @@ class SetMaterialSlotNode(ArmLogicTreeNode): super(SetMaterialSlotNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketShader', 'Material') - self.add_input('NodeSocketInt', 'Slot') + self.add_input('ArmDynamicSocket', 'Material') + self.add_input('ArmIntSocket', 'Slot') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/math/LN_clamp.py b/blender/arm/logicnode/math/LN_clamp.py index 9205d4d9..8337dd97 100644 --- a/blender/arm/logicnode/math/LN_clamp.py +++ b/blender/arm/logicnode/math/LN_clamp.py @@ -11,8 +11,8 @@ class ClampNode(ArmLogicTreeNode): def init(self, context): super(ClampNode, self).init(context) - self.add_input('NodeSocketFloat', 'Value') - self.add_input('NodeSocketFloat', 'Min') - self.add_input('NodeSocketFloat', 'Max') + self.add_input('ArmFloatSocket', 'Value') + self.add_input('ArmFloatSocket', 'Min') + self.add_input('ArmFloatSocket', 'Max') - self.add_output('NodeSocketFloat', 'Result') + self.add_output('ArmFloatSocket', 'Result') diff --git a/blender/arm/logicnode/math/LN_compare.py b/blender/arm/logicnode/math/LN_compare.py index 3081376d..027ee9ed 100644 --- a/blender/arm/logicnode/math/LN_compare.py +++ b/blender/arm/logicnode/math/LN_compare.py @@ -31,10 +31,10 @@ class CompareNode(ArmLogicTreeNode): def init(self, context): super(CompareNode, self).init(context) - self.add_input('NodeSocketShader', 'Value') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmDynamicSocket', 'Value') + self.add_input('ArmDynamicSocket', 'Value') - self.add_output('NodeSocketBool', 'Bool') + self.add_output('ArmBoolSocket', 'Bool') def draw_buttons(self, context, layout): layout.prop(self, 'property0') @@ -46,6 +46,6 @@ class CompareNode(ArmLogicTreeNode): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketShader' + op.socket_type = 'ArmDynamicSocket' op2 = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) op2.node_index = str(id(self)) diff --git a/blender/arm/logicnode/math/LN_deg_to_rad.py b/blender/arm/logicnode/math/LN_deg_to_rad.py index 64e63a61..034e73e9 100644 --- a/blender/arm/logicnode/math/LN_deg_to_rad.py +++ b/blender/arm/logicnode/math/LN_deg_to_rad.py @@ -9,6 +9,6 @@ class DegToRadNode(ArmLogicTreeNode): def init(self, context): super(DegToRadNode, self).init(context) - self.add_input('NodeSocketFloat', 'Degrees') + self.add_input('ArmFloatSocket', 'Degrees') - self.add_output('NodeSocketFloat', 'Radians') + 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 d1d370b8..29de5d67 100644 --- a/blender/arm/logicnode/math/LN_map_range.py +++ b/blender/arm/logicnode/math/LN_map_range.py @@ -11,10 +11,10 @@ class MapRangeNode(ArmLogicTreeNode): def init(self, context): super(MapRangeNode, self).init(context) - self.add_input('NodeSocketFloat', 'Value', default_value=1.0) - self.add_input('NodeSocketFloat', 'From Min') - self.add_input('NodeSocketFloat', 'From Max', default_value=1.0) - self.add_input('NodeSocketFloat', 'To Min') - self.add_input('NodeSocketFloat', 'To Max', default_value=1.0) + 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) + self.add_input('ArmFloatSocket', 'To Min') + self.add_input('ArmFloatSocket', 'To Max', default_value=1.0) - self.add_output('NodeSocketFloat', 'Result') + self.add_output('ArmFloatSocket', 'Result') diff --git a/blender/arm/logicnode/math/LN_math.py b/blender/arm/logicnode/math/LN_math.py index e090811f..ddae6d7f 100644 --- a/blender/arm/logicnode/math/LN_math.py +++ b/blender/arm/logicnode/math/LN_math.py @@ -51,13 +51,13 @@ class MathNode(ArmLogicTreeNode): # Many arguments: Add, Subtract, Multiply, Divide if (self.get_count_in(select_current) == 0): while (len(self.inputs) < 2): - self.add_input('NodeSocketFloat', 'Value ' + str(len(self.inputs))) + self.add_input('ArmFloatSocket', 'Value ' + str(len(self.inputs))) # 2 arguments: Max, Min, Power, Arctan2, Modulo, Less Than, Greater Than if (self.get_count_in(select_current) == 2): while (len(self.inputs) > 2): self.inputs.remove(self.inputs.values()[-1]) while (len(self.inputs) < 2): - self.add_input('NodeSocketFloat', 'Value ' + str(len(self.inputs))) + self.add_input('ArmFloatSocket', 'Value ' + str(len(self.inputs))) # 1 argument: Sine, Cosine, Abs, Tangent, Arcsine, Arccosine, Arctangent, Logarithm, Round, Floor, Ceil, Square Root, Fract, Exponent if (self.get_count_in(select_current) == 1): while (len(self.inputs) > 1): @@ -100,10 +100,10 @@ class MathNode(ArmLogicTreeNode): def init(self, context): super(MathNode, self).init(context) - self.add_input('NodeSocketFloat', 'Value 0', default_value=0.0) - self.add_input('NodeSocketFloat', 'Value 1', default_value=0.0) + self.add_input('ArmFloatSocket', 'Value 0', default_value=0.0) + self.add_input('ArmFloatSocket', 'Value 1', default_value=0.0) - self.add_output('NodeSocketFloat', 'Result') + self.add_output('ArmFloatSocket', 'Result') def draw_buttons(self, context, layout): layout.prop(self, 'property1') @@ -114,7 +114,7 @@ class MathNode(ArmLogicTreeNode): column = row.column(align=True) op = column.operator('arm.node_add_input', text='Add Value', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketFloat' + op.socket_type = 'ArmFloatSocket' op.name_format = 'Value {0}' column = row.column(align=True) op = column.operator('arm.node_remove_input', text='', icon='X', emboss=True) diff --git a/blender/arm/logicnode/math/LN_math_expression.py b/blender/arm/logicnode/math/LN_math_expression.py index 125d3e77..4018b3e1 100644 --- a/blender/arm/logicnode/math/LN_math_expression.py +++ b/blender/arm/logicnode/math/LN_math_expression.py @@ -163,9 +163,9 @@ class MathExpressionNode(ArmLogicTreeNode): def init(self, context): super(MathExpressionNode, self).init(context) - self.add_input('NodeSocketFloat', self.get_variable_name(0), default_value=0.0) - self.add_input('NodeSocketFloat', self.get_variable_name(1), default_value=0.0) - self.add_output('NodeSocketFloat', 'Result') + 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') def draw_buttons(self, context, layout): layout.prop(self, 'property1') @@ -181,7 +181,7 @@ class MathExpressionNode(ArmLogicTreeNode): if len(self.inputs) == 10: column.enabled = False op.node_index = str(id(self)) - op.socket_type = 'NodeSocketFloat' + op.socket_type = 'ArmFloatSocket' op.name_format = self.get_variable_name(len(self.inputs)) column = row.column(align=True) op = column.operator('arm.node_remove_input', text='', icon='X', emboss=True) diff --git a/blender/arm/logicnode/math/LN_matrix_math.py b/blender/arm/logicnode/math/LN_matrix_math.py index 4a05ce3d..903a4e87 100644 --- a/blender/arm/logicnode/math/LN_matrix_math.py +++ b/blender/arm/logicnode/math/LN_matrix_math.py @@ -14,10 +14,10 @@ class MatrixMathNode(ArmLogicTreeNode): def init(self, context): super(MatrixMathNode, self).init(context) - self.add_input('NodeSocketShader', 'Matrix 1') - self.add_input('NodeSocketShader', 'Matrix 2') + self.add_input('ArmDynamicSocket', 'Matrix 1') + self.add_input('ArmDynamicSocket', 'Matrix 2') - self.add_output('NodeSocketShader', 'Result') + self.add_output('ArmDynamicSocket', 'Result') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/math/LN_mix.py b/blender/arm/logicnode/math/LN_mix.py index 92fa80df..0d4a98e3 100644 --- a/blender/arm/logicnode/math/LN_mix.py +++ b/blender/arm/logicnode/math/LN_mix.py @@ -32,11 +32,11 @@ class MixNode(ArmLogicTreeNode): def init(self, context): super(MixNode, self).init(context) - self.add_input('NodeSocketFloat', 'Factor', default_value=0.0) - self.add_input('NodeSocketFloat', 'Value 1', default_value=0.0) - self.add_input('NodeSocketFloat', 'Value 2', default_value=1.0) + 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) - self.add_output('NodeSocketFloat', 'Result') + self.add_output('ArmFloatSocket', 'Result') def draw_buttons(self, context, layout): layout.prop(self, 'property2') diff --git a/blender/arm/logicnode/math/LN_mix_vector.py b/blender/arm/logicnode/math/LN_mix_vector.py index cbab381b..9084d75c 100644 --- a/blender/arm/logicnode/math/LN_mix_vector.py +++ b/blender/arm/logicnode/math/LN_mix_vector.py @@ -34,11 +34,11 @@ class VectorMixNode(ArmLogicTreeNode): def init(self, context): super(VectorMixNode, self).init(context) - self.add_input('NodeSocketFloat', 'Factor', default_value=0.0) - self.add_input('NodeSocketVector', 'Vector 1', default_value=[0.0, 0.0, 0.0]) - self.add_input('NodeSocketVector', 'Vector 2', default_value=[1.0, 1.0, 1.0]) + 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]) - self.add_output('NodeSocketVector', 'Result') + self.add_output('ArmVectorSocket', 'Result') def draw_buttons(self, context, layout): layout.prop(self, 'property2') diff --git a/blender/arm/logicnode/math/LN_quaternion_math.py b/blender/arm/logicnode/math/LN_quaternion_math.py index bcaa7753..8dfdc590 100644 --- a/blender/arm/logicnode/math/LN_quaternion_math.py +++ b/blender/arm/logicnode/math/LN_quaternion_math.py @@ -15,16 +15,16 @@ class QuaternionMathNode(ArmLogicTreeNode): if value: if ((self.property0 == 'Module') or (self.property0 == 'DotProduct') or (self.property0 == 'ToAxisAngle')) and (len(self.outputs) > 1): self.outputs.remove(self.outputs.values()[-1]) # Module/DotProduct/ToAxisAngle - self.add_output('NodeSocketFloat', 'X') # Result X - self.add_output('NodeSocketFloat', 'Y') # Result Y - self.add_output('NodeSocketFloat', 'Z') # Result Z - self.add_output('NodeSocketFloat', 'W') # Result W + self.add_output('ArmFloatSocket', 'X') # Result X + self.add_output('ArmFloatSocket', 'Y') # Result Y + self.add_output('ArmFloatSocket', 'Z') # Result Z + self.add_output('ArmFloatSocket', 'W') # Result W if (self.property0 == 'Module'): - self.add_output('NodeSocketFloat', 'Module') # Module + self.add_output('ArmFloatSocket', 'Module') # Module if (self.property0 == 'DotProduct'): - self.add_output('NodeSocketFloat', 'Scalar') # DotProduct + self.add_output('ArmFloatSocket', 'Scalar') # DotProduct if (self.property0 == 'ToAxisAngle'): - self.add_output('NodeSocketFloat', 'To Axis Angle') # ToAxisAngle + self.add_output('ArmFloatSocket', 'To Axis Angle') # ToAxisAngle else: if ((self.property0 == 'Module') or (self.property0 == 'DotProduct') or (self.property0 == 'ToAxisAngle')) and (len(self.outputs) > 1): self.outputs.remove(self.outputs.values()[-1]) # Module/DotProduct/ToAxisAngle @@ -35,11 +35,11 @@ class QuaternionMathNode(ArmLogicTreeNode): else: break if (self.property0 == 'Module'): - self.add_output('NodeSocketFloat', 'Module') # Module + self.add_output('ArmFloatSocket', 'Module') # Module if (self.property0 == 'DotProduct'): - self.add_output('NodeSocketFloat', 'Scalar') # DotProduct + self.add_output('ArmFloatSocket', 'Scalar') # DotProduct if (self.property0 == 'ToAxisAngle'): - self.add_output('NodeSocketFloat', 'To Axis Angle') # ToAxisAngle + self.add_output('ArmFloatSocket', 'To Axis Angle') # ToAxisAngle property1: HaxeBoolProperty('property1', name='Separator Out', default=False, set=set_bool, get=get_bool) @@ -88,48 +88,48 @@ class QuaternionMathNode(ArmLogicTreeNode): # Many arguments: Add, Subtract, DotProduct, Multiply, MultiplyFloat if (self.get_count_in(select_current) == 0): if (select_current == "MultiplyFloats"): - self.add_input('NodeSocketVector', 'Quaternion ' + str(len(self.inputs))) - self.add_input('NodeSocketFloat', 'Value ' + str(len(self.inputs))) + self.add_input('ArmVectorSocket', 'Quaternion ' + str(len(self.inputs))) + self.add_input('ArmFloatSocket', 'Value ' + str(len(self.inputs))) else: while (len(self.inputs) < 2): - self.add_input('NodeSocketVector', 'Quaternion ' + str(len(self.inputs))) + self.add_input('ArmVectorSocket', 'Quaternion ' + str(len(self.inputs))) if (select_current == 'DotProduct'): - self.add_output('NodeSocketFloat', 'Scalar') + self.add_output('ArmFloatSocket', 'Scalar') # 3 arguments: Lerp, Slerp, FromAxisAngle, FromEuler if (self.get_count_in(select_current) == 3): if (select_current == 'Lerp') or (select_current == 'Slerp'): while (len(self.inputs) < 3): - self.add_input('NodeSocketVector', 'From') - self.add_input('NodeSocketVector', 'To') - self.add_input('NodeSocketFloat', 'T') + self.add_input('ArmVectorSocket', 'From') + self.add_input('ArmVectorSocket', 'To') + self.add_input('ArmFloatSocket', 'T') if (select_current == 'FromAxisAngle'): - self.add_input('NodeSocketVector', 'Quaternion') - self.add_input('NodeSocketVector', 'Axis') - self.add_input('NodeSocketFloat', 'Angle') + self.add_input('ArmVectorSocket', 'Quaternion') + self.add_input('ArmVectorSocket', 'Axis') + self.add_input('ArmFloatSocket', 'Angle') if (select_current == 'FromEuler'): - self.add_input('NodeSocketFloat', 'X') - self.add_input('NodeSocketFloat', 'Y') - self.add_input('NodeSocketFloat', 'Z') + self.add_input('ArmFloatSocket', 'X') + self.add_input('ArmFloatSocket', 'Y') + self.add_input('ArmFloatSocket', 'Z') # 2 arguments: FromTo, FromMat, FromRotationMat, ToAxisAngle if (self.get_count_in(select_current) == 2): if (select_current == 'FromTo'): - self.add_input('NodeSocketVector', 'Vector ' + str(len(self.inputs))) - self.add_input('NodeSocketVector', 'Vector ' + str(len(self.inputs))) + self.add_input('ArmVectorSocket', 'Vector ' + str(len(self.inputs))) + self.add_input('ArmVectorSocket', 'Vector ' + str(len(self.inputs))) if (select_current == 'FromMat') or (select_current == 'FromRotationMat'): - self.add_input('NodeSocketVector', 'Quaternion') - self.add_input('NodeSocketShader', 'Matrix') + self.add_input('ArmVectorSocket', 'Quaternion') + self.add_input('ArmDynamicSocket', 'Matrix') if (select_current == 'ToAxisAngle'): - self.add_input('NodeSocketVector', 'Quaternion') - self.add_input('NodeSocketVector', 'Axis') - self.add_output('NodeSocketFloat', 'Angle') + self.add_input('ArmVectorSocket', 'Quaternion') + self.add_input('ArmVectorSocket', 'Axis') + self.add_output('ArmFloatSocket', 'Angle') # 1 argument: Module, Normalize, GetEuler if (self.get_count_in(select_current) == 1): - self.add_input('NodeSocketVector', 'Quaternion') + self.add_input('ArmVectorSocket', 'Quaternion') if (select_current == 'Module'): - self.add_output('NodeSocketFloat', 'Module') + self.add_output('ArmFloatSocket', 'Module') self['property0'] = value property0: HaxeEnumProperty( @@ -157,9 +157,9 @@ class QuaternionMathNode(ArmLogicTreeNode): def init(self, context): super(QuaternionMathNode, self).init(context) - self.add_input('NodeSocketVector', 'Quaternion 0', default_value=[0.0, 0.0, 0.0]) - self.add_input('NodeSocketVector', 'Quaternion 1', default_value=[0.0, 0.0, 0.0]) - self.add_output('NodeSocketVector', 'Result') + 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') def draw_buttons(self, context, layout): layout.prop(self, 'property1') # Separator Out @@ -175,9 +175,9 @@ class QuaternionMathNode(ArmLogicTreeNode): else: op.name_format = 'Value {0}' if (self.property0 == "MultiplyFloats"): - op.socket_type = 'NodeSocketFloat' + op.socket_type = 'ArmFloatSocket' else: - op.socket_type = 'NodeSocketVector' + op.socket_type = 'ArmVectorSocket' column = row.column(align=True) op = column.operator('arm.node_remove_input', text='', icon='X', emboss=True) op.node_index = str(id(self)) diff --git a/blender/arm/logicnode/math/LN_rad_to_deg.py b/blender/arm/logicnode/math/LN_rad_to_deg.py index 2e13666b..2335acb2 100644 --- a/blender/arm/logicnode/math/LN_rad_to_deg.py +++ b/blender/arm/logicnode/math/LN_rad_to_deg.py @@ -9,6 +9,6 @@ class RadToDegNode(ArmLogicTreeNode): def init(self, context): super(RadToDegNode, self).init(context) - self.add_input('NodeSocketFloat', 'Radians') + self.add_input('ArmFloatSocket', 'Radians') - self.add_output('NodeSocketFloat', 'Degrees') + 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 b01ac4e1..0a6c2375 100644 --- a/blender/arm/logicnode/math/LN_screen_to_world_space.py +++ b/blender/arm/logicnode/math/LN_screen_to_world_space.py @@ -14,24 +14,24 @@ class ScreenToWorldSpaceNode(ArmLogicTreeNode): def init(self, context): super(ScreenToWorldSpaceNode, self).init(context) - self.add_input('NodeSocketInt', 'Screen X') - self.add_input('NodeSocketInt', 'Screen Y') + self.add_input('ArmIntSocket', 'Screen X') + self.add_input('ArmIntSocket', 'Screen Y') - self.add_output('NodeSocketVector', 'World') - self.add_output('NodeSocketVector', 'Direction') + self.add_output('ArmVectorSocket', 'World') + self.add_output('ArmVectorSocket', 'Direction') def draw_buttons(self, context, layout): layout.prop(self, 'property0') # Separator Out if self.property0: if len(self.outputs) < self.max_outputs: self.outputs.remove(self.outputs.values()[-1]) # Direction vector - self.add_output('NodeSocketFloat', 'X') # World X - self.add_output('NodeSocketFloat', 'Y') # World Y - self.add_output('NodeSocketFloat', 'Z') # World Z - self.add_output('NodeSocketVector', 'Direction') # Vector - self.add_output('NodeSocketFloat', 'X') # Direction X - self.add_output('NodeSocketFloat', 'Y') # Direction Y - self.add_output('NodeSocketFloat', 'Z') # Direction Z + self.add_output('ArmFloatSocket', 'X') # World X + self.add_output('ArmFloatSocket', 'Y') # World Y + self.add_output('ArmFloatSocket', 'Z') # World Z + self.add_output('ArmVectorSocket', 'Direction') # Vector + self.add_output('ArmFloatSocket', 'X') # Direction X + self.add_output('ArmFloatSocket', 'Y') # Direction Y + self.add_output('ArmFloatSocket', 'Z') # Direction Z else: if len(self.outputs) == self.max_outputs: self.outputs.remove(self.outputs.values()[-1]) # Z @@ -41,4 +41,4 @@ class ScreenToWorldSpaceNode(ArmLogicTreeNode): self.outputs.remove(self.outputs.values()[-1]) # Z self.outputs.remove(self.outputs.values()[-1]) # Y self.outputs.remove(self.outputs.values()[-1]) # X - self.add_output('NodeSocketVector', 'Direction') + self.add_output('ArmVectorSocket', 'Direction') diff --git a/blender/arm/logicnode/math/LN_separate_quaternion.py b/blender/arm/logicnode/math/LN_separate_quaternion.py index fcd9abf6..10d81ded 100644 --- a/blender/arm/logicnode/math/LN_separate_quaternion.py +++ b/blender/arm/logicnode/math/LN_separate_quaternion.py @@ -9,9 +9,9 @@ class SeparateQuaternionNode(ArmLogicTreeNode): def init(self, context): super(SeparateQuaternionNode, self).init(context) - self.add_input('NodeSocketVector', 'Quaternion') + self.add_input('ArmVectorSocket', 'Quaternion') - self.add_output('NodeSocketFloat', 'X') - self.add_output('NodeSocketFloat', 'Y') - self.add_output('NodeSocketFloat', 'Z') - self.add_output('NodeSocketFloat', 'W') + self.add_output('ArmFloatSocket', 'X') + self.add_output('ArmFloatSocket', 'Y') + self.add_output('ArmFloatSocket', 'Z') + self.add_output('ArmFloatSocket', 'W') diff --git a/blender/arm/logicnode/math/LN_separate_rgb.py b/blender/arm/logicnode/math/LN_separate_rgb.py index b95c3e32..e76766f1 100644 --- a/blender/arm/logicnode/math/LN_separate_rgb.py +++ b/blender/arm/logicnode/math/LN_separate_rgb.py @@ -9,8 +9,8 @@ class SeparateColorNode(ArmLogicTreeNode): def init(self, context): super(SeparateColorNode, self).init(context) - self.add_input('NodeSocketColor', 'Color', default_value=[1.0, 1.0, 1.0, 1.0]) + self.add_input('ArmColorSocket', 'Color', default_value=[1.0, 1.0, 1.0, 1.0]) - self.add_output('NodeSocketFloat', 'R') - self.add_output('NodeSocketFloat', 'G') - self.add_output('NodeSocketFloat', 'B') + self.add_output('ArmFloatSocket', 'R') + self.add_output('ArmFloatSocket', 'G') + self.add_output('ArmFloatSocket', 'B') diff --git a/blender/arm/logicnode/math/LN_separate_xyz.py b/blender/arm/logicnode/math/LN_separate_xyz.py index d1cc1316..c2e33ecd 100644 --- a/blender/arm/logicnode/math/LN_separate_xyz.py +++ b/blender/arm/logicnode/math/LN_separate_xyz.py @@ -9,8 +9,8 @@ class SeparateVectorNode(ArmLogicTreeNode): def init(self, context): super(SeparateVectorNode, self).init(context) - self.add_input('NodeSocketVector', 'Vector') + self.add_input('ArmVectorSocket', 'Vector') - self.add_output('NodeSocketFloat', 'X') - self.add_output('NodeSocketFloat', 'Y') - self.add_output('NodeSocketFloat', 'Z') + self.add_output('ArmFloatSocket', 'X') + self.add_output('ArmFloatSocket', 'Y') + self.add_output('ArmFloatSocket', 'Z') diff --git a/blender/arm/logicnode/math/LN_vector_clamp.py b/blender/arm/logicnode/math/LN_vector_clamp.py index 3a47c025..744880ef 100644 --- a/blender/arm/logicnode/math/LN_vector_clamp.py +++ b/blender/arm/logicnode/math/LN_vector_clamp.py @@ -9,8 +9,8 @@ class VectorClampToSizeNode(ArmLogicTreeNode): def init(self, context): super(VectorClampToSizeNode, self).init(context) - self.add_input('NodeSocketVector', 'Vector In', default_value=[0.0, 0.0, 0.0]) - self.add_input('NodeSocketFloat', 'Min') - self.add_input('NodeSocketFloat', 'Max') + self.add_input('ArmVectorSocket', 'Vector In', default_value=[0.0, 0.0, 0.0]) + self.add_input('ArmFloatSocket', 'Min') + self.add_input('ArmFloatSocket', 'Max') - self.add_output('NodeSocketVector', 'Vector Out') + self.add_output('ArmVectorSocket', 'Vector Out') diff --git a/blender/arm/logicnode/math/LN_vector_math.py b/blender/arm/logicnode/math/LN_vector_math.py index 517babbf..7654d151 100644 --- a/blender/arm/logicnode/math/LN_vector_math.py +++ b/blender/arm/logicnode/math/LN_vector_math.py @@ -17,15 +17,15 @@ class VectorMathNode(ArmLogicTreeNode): if value: if (self.property0 == 'Length') or (self.property0 == 'Distance') or (self.property0 == 'Dot Product'): self.outputs.remove(self.outputs.values()[-1]) # Distance/Length/Scalar - self.add_output('NodeSocketFloat', 'X') # Result X - self.add_output('NodeSocketFloat', 'Y') # Result Y - self.add_output('NodeSocketFloat', 'Z') # Result Z + self.add_output('ArmFloatSocket', 'X') # Result X + self.add_output('ArmFloatSocket', 'Y') # Result Y + self.add_output('ArmFloatSocket', 'Z') # Result Z if (self.property0 == 'Length'): - self.add_output('NodeSocketFloat', 'Length') # Length + self.add_output('ArmFloatSocket', 'Length') # Length if (self.property0 == 'Distance'): - self.add_output('NodeSocketFloat', 'Distance') # Distance + self.add_output('ArmFloatSocket', 'Distance') # Distance if (self.property0 == 'Dot Product'): - self.add_output('NodeSocketFloat', 'Scalar') # Scalar + self.add_output('ArmFloatSocket', 'Scalar') # Scalar else: if ((self.property0 == 'Length') or (self.property0 == 'Distance') or (self.property0 == 'Dot Product')) and (len(self.outputs) > 1): self.outputs.remove(self.outputs.values()[-1]) # Distance/Length/Scalar @@ -36,11 +36,11 @@ class VectorMathNode(ArmLogicTreeNode): else: break if (self.property0 == 'Length'): - self.add_output('NodeSocketFloat', 'Length') # Length + self.add_output('ArmFloatSocket', 'Length') # Length if (self.property0 == 'Distance'): - self.add_output('NodeSocketFloat', 'Distance') # Distance + self.add_output('ArmFloatSocket', 'Distance') # Distance if (self.property0 == 'Dot Product'): - self.add_output('NodeSocketFloat', 'Scalar') # Scalar + self.add_output('ArmFloatSocket', 'Scalar') # Scalar property1: HaxeBoolProperty('property1', name='Separator Out', default=False, set=set_bool, get=get_bool) @@ -80,12 +80,12 @@ class VectorMathNode(ArmLogicTreeNode): while (len(self.inputs) > 1): self.inputs.remove(self.inputs.values()[-1]) if (select_current == "MultiplyFloats"): - self.add_input('NodeSocketFloat', 'Value ' + str(len(self.inputs))) + self.add_input('ArmFloatSocket', 'Value ' + str(len(self.inputs))) else: while (len(self.inputs) < 2): - self.add_input('NodeSocketVector', 'Value ' + str(len(self.inputs))) + self.add_input('ArmVectorSocket', 'Value ' + str(len(self.inputs))) if (select_current == 'Dot Product'): - self.add_output('NodeSocketFloat', 'Scalar') + self.add_output('ArmFloatSocket', 'Scalar') # 2 arguments: Distance, Reflect if (self.get_count_in(select_current) == 2): count = 2 @@ -94,15 +94,15 @@ class VectorMathNode(ArmLogicTreeNode): while (len(self.inputs) > count): self.inputs.remove(self.inputs.values()[-1]) while (len(self.inputs) < 2): - self.add_input('NodeSocketVector', 'Value ' + str(len(self.inputs))) + self.add_input('ArmVectorSocket', 'Value ' + str(len(self.inputs))) if (select_current == 'Distance'): - self.add_output('NodeSocketFloat', 'Distance') + self.add_output('ArmFloatSocket', 'Distance') # 1 argument: Normalize, Length if (self.get_count_in(select_current) == 1): while (len(self.inputs) > 1): self.inputs.remove(self.inputs.values()[-1]) if (select_current == 'Length'): - self.add_output('NodeSocketFloat', 'Length') + self.add_output('ArmFloatSocket', 'Length') self['property0'] = value property0: HaxeEnumProperty( @@ -125,10 +125,10 @@ class VectorMathNode(ArmLogicTreeNode): def init(self, context): super(VectorMathNode, self).init(context) - self.add_input('NodeSocketVector', 'Value 0', default_value=[0.0, 0.0, 0.0]) - self.add_input('NodeSocketVector', 'Value 1', default_value=[0.0, 0.0, 0.0]) + 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]) - self.add_output('NodeSocketVector', 'Result') + self.add_output('ArmVectorSocket', 'Result') def draw_buttons(self, context, layout): layout.prop(self, 'property1') # Separator Out @@ -141,9 +141,9 @@ class VectorMathNode(ArmLogicTreeNode): op.node_index = str(id(self)) op.name_format = 'Value {0}' if (self.property0 == "MultiplyFloats"): - op.socket_type = 'NodeSocketFloat' + op.socket_type = 'ArmFloatSocket' else: - op.socket_type = 'NodeSocketVector' + op.socket_type = 'ArmVectorSocket' column = row.column(align=True) op = column.operator('arm.node_remove_input', text='', icon='X', emboss=True) op.node_index = str(id(self)) 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 53b91b54..6b8f519c 100644 --- a/blender/arm/logicnode/math/LN_world_to_screen_space.py +++ b/blender/arm/logicnode/math/LN_world_to_screen_space.py @@ -9,6 +9,6 @@ class WorldToScreenSpaceNode(ArmLogicTreeNode): def init(self, context): super(WorldToScreenSpaceNode, self).init(context) - self.add_input('NodeSocketVector', 'World') + self.add_input('ArmVectorSocket', 'World') - self.add_output('NodeSocketVector', 'Screen') + 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 acac1ad3..d2999718 100644 --- a/blender/arm/logicnode/miscellaneous/LN_boolean_to_vector.py +++ b/blender/arm/logicnode/miscellaneous/LN_boolean_to_vector.py @@ -8,11 +8,11 @@ class VectorFromBooleanNode(ArmLogicTreeNode): def init(self, context): super(VectorFromBooleanNode, self).init(context) - self.inputs.new('NodeSocketBool', 'X') - self.inputs.new('NodeSocketBool', '-X') - self.inputs.new('NodeSocketBool', 'Y') - self.inputs.new('NodeSocketBool', '-Y') - self.inputs.new('NodeSocketBool', 'Z') - self.inputs.new('NodeSocketBool', '-Z') + self.inputs.new('ArmBoolSocket', 'X') + self.inputs.new('ArmBoolSocket', '-X') + self.inputs.new('ArmBoolSocket', 'Y') + self.inputs.new('ArmBoolSocket', '-Y') + self.inputs.new('ArmBoolSocket', 'Z') + self.inputs.new('ArmBoolSocket', '-Z') - self.outputs.new('NodeSocketVector', 'Vector') + self.outputs.new('ArmVectorSocket', 'Vector') diff --git a/blender/arm/logicnode/miscellaneous/LN_default_if_null.py b/blender/arm/logicnode/miscellaneous/LN_default_if_null.py index 2437c3a2..d2bcf730 100644 --- a/blender/arm/logicnode/miscellaneous/LN_default_if_null.py +++ b/blender/arm/logicnode/miscellaneous/LN_default_if_null.py @@ -12,7 +12,7 @@ class DefaultIfNullNode(ArmLogicTreeNode): def init(self, context): super(DefaultIfNullNode, self).init(context) - self.inputs.new('NodeSocketShader', 'Value In') - self.inputs.new('NodeSocketShader', 'Default') + self.inputs.new('ArmDynamicSocket', 'Value In') + self.inputs.new('ArmDynamicSocket', 'Default') - self.outputs.new('NodeSocketShader', 'Value Out') + self.outputs.new('ArmDynamicSocket', 'Value Out') diff --git a/blender/arm/logicnode/miscellaneous/LN_get_application_time.py b/blender/arm/logicnode/miscellaneous/LN_get_application_time.py index 602d9856..2e4301d6 100644 --- a/blender/arm/logicnode/miscellaneous/LN_get_application_time.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_application_time.py @@ -8,5 +8,5 @@ class TimeNode(ArmLogicTreeNode): def init(self, context): super(TimeNode, self).init(context) - self.add_output('NodeSocketFloat', 'Time') - self.add_output('NodeSocketFloat', 'Delta') + 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 2ea657b0..5bd6653e 100644 --- a/blender/arm/logicnode/miscellaneous/LN_get_debug_console_settings.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_debug_console_settings.py @@ -8,6 +8,6 @@ class GetDebugConsoleSettings(ArmLogicTreeNode): def init(self, context): super(GetDebugConsoleSettings, self).init(context) - self.add_output('NodeSocketBool', 'Visible') - self.add_output('NodeSocketFloat', 'Scale') - self.add_output('NodeSocketString', 'Position') + 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 560d053f..42399587 100644 --- a/blender/arm/logicnode/miscellaneous/LN_get_display_resolution.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_display_resolution.py @@ -12,5 +12,5 @@ class DisplayInfoNode(ArmLogicTreeNode): def init(self, context): super(DisplayInfoNode, self).init(context) - self.add_output('NodeSocketInt', 'Width') - self.add_output('NodeSocketInt', 'Height') + 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 bd2b76ae..cd693644 100644 --- a/blender/arm/logicnode/miscellaneous/LN_get_fps.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_fps.py @@ -8,4 +8,4 @@ class GetFPSNode(ArmLogicTreeNode): def init(self, context): super(GetFPSNode, self).init(context) - self.add_output('NodeSocketInt', 'Count') + 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 8fd5b504..1870da26 100644 --- a/blender/arm/logicnode/miscellaneous/LN_get_window_resolution.py +++ b/blender/arm/logicnode/miscellaneous/LN_get_window_resolution.py @@ -12,5 +12,5 @@ class WindowInfoNode(ArmLogicTreeNode): def init(self, context): super(WindowInfoNode, self).init(context) - self.add_output('NodeSocketInt', 'Width') - self.add_output('NodeSocketInt', 'Height') + self.add_output('ArmIntSocket', 'Width') + self.add_output('ArmIntSocket', 'Height') 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 2a02a150..56d64c89 100644 --- a/blender/arm/logicnode/miscellaneous/LN_set_debug_console_settings.py +++ b/blender/arm/logicnode/miscellaneous/LN_set_debug_console_settings.py @@ -16,8 +16,8 @@ class SetDebugConsoleSettings(ArmLogicTreeNode): def init(self, context): super(SetDebugConsoleSettings, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketBool', 'Visible') - self.add_input('NodeSocketFloat', 'Scale') + self.add_input('ArmBoolSocket', 'Visible') + self.add_input('ArmFloatSocket', 'Scale') self.inputs[-1].default_value = 1.0 self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/miscellaneous/LN_set_time_scale.py b/blender/arm/logicnode/miscellaneous/LN_set_time_scale.py index aff8c194..3cad6073 100644 --- a/blender/arm/logicnode/miscellaneous/LN_set_time_scale.py +++ b/blender/arm/logicnode/miscellaneous/LN_set_time_scale.py @@ -9,6 +9,6 @@ class SetTimeScaleNode(ArmLogicTreeNode): def init(self, context): super(SetTimeScaleNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketFloat', 'Scale', default_value=1.0) + self.add_input('ArmFloatSocket', 'Scale', default_value=1.0) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/miscellaneous/LN_sleep.py b/blender/arm/logicnode/miscellaneous/LN_sleep.py index 0d2e4c82..778bd260 100644 --- a/blender/arm/logicnode/miscellaneous/LN_sleep.py +++ b/blender/arm/logicnode/miscellaneous/LN_sleep.py @@ -10,6 +10,6 @@ class SleepNode(ArmLogicTreeNode): def init(self, context): super(SleepNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketFloat', 'Time') + self.add_input('ArmFloatSocket', 'Time') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/miscellaneous/LN_timer.py b/blender/arm/logicnode/miscellaneous/LN_timer.py index d74d7197..0d9e8ce2 100644 --- a/blender/arm/logicnode/miscellaneous/LN_timer.py +++ b/blender/arm/logicnode/miscellaneous/LN_timer.py @@ -11,16 +11,16 @@ class TimerNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketAction', 'Start') self.add_input('ArmNodeSocketAction', 'Pause') self.add_input('ArmNodeSocketAction', 'Stop') - self.add_input('NodeSocketFloat', 'Duration', default_value=1.0) - self.add_input('NodeSocketInt', 'Repeat') + self.add_input('ArmFloatSocket', 'Duration', default_value=1.0) + self.add_input('ArmIntSocket', 'Repeat') self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketAction', 'Done') - self.add_output('NodeSocketBool', 'Running') - self.add_output('NodeSocketInt', 'Time Passed') - self.add_output('NodeSocketInt', 'Time Left') - self.add_output('NodeSocketFloat', 'Progress') - self.add_output('NodeSocketFloat', 'Repetitions') + self.add_output('ArmBoolSocket', 'Running') + self.add_output('ArmIntSocket', 'Time Passed') + self.add_output('ArmIntSocket', 'Time Left') + self.add_output('ArmFloatSocket', 'Progress') + self.add_output('ArmFloatSocket', 'Repetitions') def draw_label(self) -> str: inp_duration = self.inputs['Duration'] diff --git a/blender/arm/logicnode/native/LN_call_haxe_static.py b/blender/arm/logicnode/native/LN_call_haxe_static.py index eb288074..3b266d22 100644 --- a/blender/arm/logicnode/native/LN_call_haxe_static.py +++ b/blender/arm/logicnode/native/LN_call_haxe_static.py @@ -13,7 +13,7 @@ class CallHaxeStaticNode(ArmLogicTreeNode): def init(self, context): super(CallHaxeStaticNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Function') + self.add_input('ArmStringSocket', 'Function') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketShader', 'Result') + self.add_output('ArmDynamicSocket', 'Result') diff --git a/blender/arm/logicnode/native/LN_detect_mobile_browser.py b/blender/arm/logicnode/native/LN_detect_mobile_browser.py index d49f62cf..e2e7afed 100644 --- a/blender/arm/logicnode/native/LN_detect_mobile_browser.py +++ b/blender/arm/logicnode/native/LN_detect_mobile_browser.py @@ -8,4 +8,4 @@ class DetectMobileBrowserNode(ArmLogicTreeNode): def init(self, context): super(DetectMobileBrowserNode, self).init(context) - self.add_output('NodeSocketBool', 'Mobile') \ No newline at end of file + self.add_output('ArmBoolSocket', 'Mobile') diff --git a/blender/arm/logicnode/native/LN_expression.py b/blender/arm/logicnode/native/LN_expression.py index d2d7e853..092612ed 100644 --- a/blender/arm/logicnode/native/LN_expression.py +++ b/blender/arm/logicnode/native/LN_expression.py @@ -16,7 +16,7 @@ class ExpressionNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketAction', 'In') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketShader', 'Result') + self.add_output('ArmDynamicSocket', 'Result') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/native/LN_get_haxe_property.py b/blender/arm/logicnode/native/LN_get_haxe_property.py index 20721fc7..71d1db4e 100644 --- a/blender/arm/logicnode/native/LN_get_haxe_property.py +++ b/blender/arm/logicnode/native/LN_get_haxe_property.py @@ -11,7 +11,7 @@ class GetHaxePropertyNode(ArmLogicTreeNode): def init(self, context): super(GetHaxePropertyNode, self).init(context) - self.add_input('NodeSocketShader', 'Dynamic') - self.add_input('NodeSocketString', 'Property') + self.add_input('ArmDynamicSocket', 'Dynamic') + self.add_input('ArmStringSocket', 'Property') - self.add_output('NodeSocketShader', 'Value') + self.add_output('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/native/LN_get_system_language.py b/blender/arm/logicnode/native/LN_get_system_language.py index 6989f361..4c0af5e2 100644 --- a/blender/arm/logicnode/native/LN_get_system_language.py +++ b/blender/arm/logicnode/native/LN_get_system_language.py @@ -9,4 +9,4 @@ class GetSystemLanguage(ArmLogicTreeNode): def init(self, context): super(GetSystemLanguage, self).init(context) - self.add_output('NodeSocketString', 'Language') + 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 2f7bf8dc..95f71053 100644 --- a/blender/arm/logicnode/native/LN_get_system_name.py +++ b/blender/arm/logicnode/native/LN_get_system_name.py @@ -10,9 +10,9 @@ class GetSystemName(ArmLogicTreeNode): def init(self, context): super(GetSystemName, self).init(context) - self.add_output('NodeSocketString', 'System Name') - self.add_output('NodeSocketBool', 'Windows') - self.add_output('NodeSocketBool', 'Linux') - self.add_output('NodeSocketBool', 'Mac') - self.add_output('NodeSocketBool', 'HTML5') - self.add_output('NodeSocketBool', 'Android') + self.add_output('ArmStringSocket', 'System Name') + self.add_output('ArmBoolSocket', 'Windows') + self.add_output('ArmBoolSocket', 'Linux') + self.add_output('ArmBoolSocket', 'Mac') + self.add_output('ArmBoolSocket', 'HTML5') + self.add_output('ArmBoolSocket', 'Android') diff --git a/blender/arm/logicnode/native/LN_loadUrl.py b/blender/arm/logicnode/native/LN_loadUrl.py index c180f456..ee885e80 100644 --- a/blender/arm/logicnode/native/LN_loadUrl.py +++ b/blender/arm/logicnode/native/LN_loadUrl.py @@ -9,4 +9,4 @@ class LoadUrlNode(ArmLogicTreeNode): def init(self, context): super(LoadUrlNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'URL') + self.add_input('ArmStringSocket', 'URL') diff --git a/blender/arm/logicnode/native/LN_print.py b/blender/arm/logicnode/native/LN_print.py index b04ea907..8c3310a2 100644 --- a/blender/arm/logicnode/native/LN_print.py +++ b/blender/arm/logicnode/native/LN_print.py @@ -9,6 +9,6 @@ class PrintNode(ArmLogicTreeNode): def init(self, context): super(PrintNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'String') + self.add_input('ArmStringSocket', 'String') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/native/LN_read_file.py b/blender/arm/logicnode/native/LN_read_file.py index e87d152a..a42c269d 100644 --- a/blender/arm/logicnode/native/LN_read_file.py +++ b/blender/arm/logicnode/native/LN_read_file.py @@ -12,8 +12,8 @@ class ReadFileNode(ArmLogicTreeNode): def init(self, context): super(ReadFileNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'File') - self.add_input('NodeSocketBool', 'Use cache', default_value=1) + self.add_input('ArmStringSocket', 'File') + self.add_input('ArmBoolSocket', 'Use cache', default_value=1) self.add_output('ArmNodeSocketAction', 'Loaded') - self.add_output('NodeSocketString', 'String') + self.add_output('ArmStringSocket', 'String') diff --git a/blender/arm/logicnode/native/LN_read_json.py b/blender/arm/logicnode/native/LN_read_json.py index 24192ce8..7bb6b04e 100644 --- a/blender/arm/logicnode/native/LN_read_json.py +++ b/blender/arm/logicnode/native/LN_read_json.py @@ -12,8 +12,8 @@ class ReadJsonNode(ArmLogicTreeNode): def init(self, context): super(ReadJsonNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'File') - self.add_input('NodeSocketBool', 'Use cache', default_value=1) + self.add_input('ArmStringSocket', 'File') + self.add_input('ArmBoolSocket', 'Use cache', default_value=1) self.add_output('ArmNodeSocketAction', 'Loaded') - self.add_output('NodeSocketShader', 'Dynamic') + self.add_output('ArmDynamicSocket', 'Dynamic') diff --git a/blender/arm/logicnode/native/LN_read_storage.py b/blender/arm/logicnode/native/LN_read_storage.py index af9fd7c9..144c5bef 100644 --- a/blender/arm/logicnode/native/LN_read_storage.py +++ b/blender/arm/logicnode/native/LN_read_storage.py @@ -11,7 +11,7 @@ class ReadStorageNode(ArmLogicTreeNode): def init(self, context): super(ReadStorageNode, self).init(context) - self.add_input('NodeSocketString', 'Key') - self.add_input('NodeSocketString', 'Default') + self.add_input('ArmStringSocket', 'Key') + self.add_input('ArmStringSocket', 'Default') - self.add_output('NodeSocketShader', 'Value') + self.add_output('ArmDynamicSocket', 'Value') diff --git a/blender/arm/logicnode/native/LN_script.py b/blender/arm/logicnode/native/LN_script.py index c308bfe6..4d04ddc9 100644 --- a/blender/arm/logicnode/native/LN_script.py +++ b/blender/arm/logicnode/native/LN_script.py @@ -23,7 +23,7 @@ class ScriptNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketArray', 'Array') self.add_output('ArmNodeSocketAction', 'Out') - self.add_output('NodeSocketShader', 'Result') + self.add_output('ArmDynamicSocket', 'Result') def draw_buttons(self, context, layout): layout.prop_search(self, 'property0_', bpy.data, 'texts', icon='NONE', text='') diff --git a/blender/arm/logicnode/native/LN_set_haxe_property.py b/blender/arm/logicnode/native/LN_set_haxe_property.py index 443123ff..664fbc0a 100644 --- a/blender/arm/logicnode/native/LN_set_haxe_property.py +++ b/blender/arm/logicnode/native/LN_set_haxe_property.py @@ -12,8 +12,8 @@ class SetHaxePropertyNode(ArmLogicTreeNode): def init(self, context): super(SetHaxePropertyNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Dynamic') - self.add_input('NodeSocketString', 'Property') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmDynamicSocket', 'Dynamic') + self.add_input('ArmStringSocket', 'Property') + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/native/LN_set_vibrate.py b/blender/arm/logicnode/native/LN_set_vibrate.py index 6136a47e..bc340e96 100644 --- a/blender/arm/logicnode/native/LN_set_vibrate.py +++ b/blender/arm/logicnode/native/LN_set_vibrate.py @@ -11,7 +11,7 @@ class SetVibrateNode(ArmLogicTreeNode): def init(self, context): super(SetVibrateNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketInt', 'Milliseconds') + self.add_input('ArmIntSocket', 'Milliseconds') self.inputs[-1].default_value = 100 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 6b04d57d..683cec21 100644 --- a/blender/arm/logicnode/native/LN_write_file.py +++ b/blender/arm/logicnode/native/LN_write_file.py @@ -12,5 +12,5 @@ class WriteFileNode(ArmLogicTreeNode): def init(self, context): super(WriteFileNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'File') - self.add_input('NodeSocketString', 'String') + 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 366fc008..1694e353 100644 --- a/blender/arm/logicnode/native/LN_write_json.py +++ b/blender/arm/logicnode/native/LN_write_json.py @@ -12,5 +12,5 @@ class WriteJsonNode(ArmLogicTreeNode): def init(self, context): super(WriteJsonNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'File') - self.add_input('NodeSocketShader', 'Dynamic') + 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 b829a2bb..bc9a58b0 100644 --- a/blender/arm/logicnode/native/LN_write_storage.py +++ b/blender/arm/logicnode/native/LN_write_storage.py @@ -12,7 +12,7 @@ class WriteStorageNode(ArmLogicTreeNode): def init(self, context): super(WriteStorageNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Key') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmStringSocket', 'Key') + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/navmesh/LN_go_to_location.py b/blender/arm/logicnode/navmesh/LN_go_to_location.py index eba3cf97..be97f2eb 100644 --- a/blender/arm/logicnode/navmesh/LN_go_to_location.py +++ b/blender/arm/logicnode/navmesh/LN_go_to_location.py @@ -10,7 +10,7 @@ class GoToLocationNode(ArmLogicTreeNode): super(GoToLocationNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketShader', 'Location') + self.add_input('ArmDynamicSocket', 'Location') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/navmesh/LN_navigable_location.py b/blender/arm/logicnode/navmesh/LN_navigable_location.py index 5d25dc36..f6850bbc 100644 --- a/blender/arm/logicnode/navmesh/LN_navigable_location.py +++ b/blender/arm/logicnode/navmesh/LN_navigable_location.py @@ -8,4 +8,4 @@ class NavigableLocationNode(ArmLogicTreeNode): def init(self, context): super(NavigableLocationNode, self).init(context) - self.add_output('NodeSocketShader', 'Location') + 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 c70dfba8..063174c7 100644 --- a/blender/arm/logicnode/navmesh/LN_pick_navmesh_location.py +++ b/blender/arm/logicnode/navmesh/LN_pick_navmesh_location.py @@ -9,6 +9,6 @@ class PickLocationNode(ArmLogicTreeNode): def init(self, context): super(PickLocationNode, self).init(context) self.add_input('ArmNodeSocketObject', 'NavMesh') - self.add_input('NodeSocketVector', 'Screen Coords') + self.add_input('ArmVectorSocket', 'Screen Coords') - self.add_output('NodeSocketVector', 'Location') + self.add_output('ArmVectorSocket', 'Location') diff --git a/blender/arm/logicnode/object/LN_get_distance.py b/blender/arm/logicnode/object/LN_get_distance.py index 0d4b5a3a..13b6a5be 100644 --- a/blender/arm/logicnode/object/LN_get_distance.py +++ b/blender/arm/logicnode/object/LN_get_distance.py @@ -14,4 +14,4 @@ class GetDistanceNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketObject', 'Object') self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketFloat', 'Distance') + self.add_output('ArmFloatSocket', 'Distance') 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 ae39b4e1..92c7220d 100644 --- a/blender/arm/logicnode/object/LN_get_object_by_name.py +++ b/blender/arm/logicnode/object/LN_get_object_by_name.py @@ -12,6 +12,6 @@ class GetObjectNode(ArmLogicTreeNode): def init(self, context): super(GetObjectNode, self).init(context) - self.add_input('NodeSocketString', 'Name') + 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 be1b4de3..8ff69a55 100644 --- a/blender/arm/logicnode/object/LN_get_object_child.py +++ b/blender/arm/logicnode/object/LN_get_object_child.py @@ -19,7 +19,7 @@ class GetChildNode(ArmLogicTreeNode): def init(self, context): super(GetChildNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Parent') - self.add_input('NodeSocketString', 'Child Name') + self.add_input('ArmStringSocket', 'Child Name') self.add_output('ArmNodeSocketObject', 'Child') diff --git a/blender/arm/logicnode/object/LN_get_object_mesh.py b/blender/arm/logicnode/object/LN_get_object_mesh.py index ff9cf047..83d45e35 100644 --- a/blender/arm/logicnode/object/LN_get_object_mesh.py +++ b/blender/arm/logicnode/object/LN_get_object_mesh.py @@ -11,4 +11,4 @@ class GetMeshNode(ArmLogicTreeNode): super(GetMeshNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketShader', 'Mesh') + 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 8cd79d98..e6938510 100644 --- a/blender/arm/logicnode/object/LN_get_object_name.py +++ b/blender/arm/logicnode/object/LN_get_object_name.py @@ -11,4 +11,4 @@ class GetNameNode(ArmLogicTreeNode): super(GetNameNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketString', 'Name') + 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 602ce2d0..1eb38bd8 100644 --- a/blender/arm/logicnode/object/LN_get_object_offscreen.py +++ b/blender/arm/logicnode/object/LN_get_object_offscreen.py @@ -11,6 +11,6 @@ class GetObjectOffscreenNode(ArmLogicTreeNode): super(GetObjectOffscreenNode, self).init(context) self.inputs.new('ArmNodeSocketObject', 'Object') - self.outputs.new('NodeSocketBool', 'Is Object Offscreen') - self.outputs.new('NodeSocketBool', 'Is Mesh Offscreen') - self.outputs.new('NodeSocketBool', 'Is Shadow Offscreen') + self.outputs.new('ArmBoolSocket', 'Is Object Offscreen') + self.outputs.new('ArmBoolSocket', 'Is Mesh Offscreen') + self.outputs.new('ArmBoolSocket', 'Is Shadow Offscreen') diff --git a/blender/arm/logicnode/object/LN_get_object_property.py b/blender/arm/logicnode/object/LN_get_object_property.py index 6c2792cf..ecd62857 100644 --- a/blender/arm/logicnode/object/LN_get_object_property.py +++ b/blender/arm/logicnode/object/LN_get_object_property.py @@ -12,7 +12,7 @@ class GetPropertyNode(ArmLogicTreeNode): def init(self, context): super(GetPropertyNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Property') + self.add_input('ArmStringSocket', 'Property') - self.add_output('NodeSocketShader', 'Value') - self.add_output('NodeSocketString', 'Property') + self.add_output('ArmDynamicSocket', 'Value') + self.add_output('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 b04eb1b7..0f3e1b1c 100644 --- a/blender/arm/logicnode/object/LN_get_object_visible.py +++ b/blender/arm/logicnode/object/LN_get_object_visible.py @@ -14,6 +14,6 @@ class GetVisibleNode(ArmLogicTreeNode): super(GetVisibleNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketBool', 'Is Object Visible') - self.add_output('NodeSocketBool', 'Is Mesh Visible') - self.add_output('NodeSocketBool', 'Is Shadow Visible') + self.add_output('ArmBoolSocket', 'Is Object Visible') + self.add_output('ArmBoolSocket', 'Is Mesh Visible') + self.add_output('ArmBoolSocket', 'Is Shadow Visible') diff --git a/blender/arm/logicnode/object/LN_mesh.py b/blender/arm/logicnode/object/LN_mesh.py index d68f2233..cefcca05 100644 --- a/blender/arm/logicnode/object/LN_mesh.py +++ b/blender/arm/logicnode/object/LN_mesh.py @@ -13,7 +13,7 @@ class MeshNode(ArmLogicTreeNode): def init(self, context): super(MeshNode, self).init(context) - self.add_output('NodeSocketShader', 'Mesh', is_var=True) + self.add_output('ArmDynamicSocket', 'Mesh', is_var=True) def draw_buttons(self, context, layout): layout.prop_search(self, 'property0_get', bpy.data, 'meshes', icon='NONE', text='') diff --git a/blender/arm/logicnode/object/LN_remove_object_parent.py b/blender/arm/logicnode/object/LN_remove_object_parent.py index ffe60c13..cbfdb84a 100644 --- a/blender/arm/logicnode/object/LN_remove_object_parent.py +++ b/blender/arm/logicnode/object/LN_remove_object_parent.py @@ -11,6 +11,6 @@ class ClearParentNode(ArmLogicTreeNode): super(ClearParentNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketBool', 'Keep Transform', default_value=True) + self.add_input('ArmBoolSocket', 'Keep Transform', default_value=True) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/object/LN_set_object_mesh.py b/blender/arm/logicnode/object/LN_set_object_mesh.py index 803b25e1..601f36ae 100644 --- a/blender/arm/logicnode/object/LN_set_object_mesh.py +++ b/blender/arm/logicnode/object/LN_set_object_mesh.py @@ -11,6 +11,6 @@ class SetMeshNode(ArmLogicTreeNode): super(SetMeshNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketShader', 'Mesh') + self.add_input('ArmDynamicSocket', 'Mesh') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/object/LN_set_object_name.py b/blender/arm/logicnode/object/LN_set_object_name.py index 921675b9..05f20794 100644 --- a/blender/arm/logicnode/object/LN_set_object_name.py +++ b/blender/arm/logicnode/object/LN_set_object_name.py @@ -11,6 +11,6 @@ class SetNameNode(ArmLogicTreeNode): super(SetNameNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Name') + self.add_input('ArmStringSocket', 'Name') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/object/LN_set_object_property.py b/blender/arm/logicnode/object/LN_set_object_property.py index f5f17e3f..b41494fa 100644 --- a/blender/arm/logicnode/object/LN_set_object_property.py +++ b/blender/arm/logicnode/object/LN_set_object_property.py @@ -18,7 +18,7 @@ class SetPropertyNode(ArmLogicTreeNode): super(SetPropertyNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Property') - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmStringSocket', 'Property') + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/object/LN_set_object_visible.py b/blender/arm/logicnode/object/LN_set_object_visible.py index 76fe036f..53e354a6 100644 --- a/blender/arm/logicnode/object/LN_set_object_visible.py +++ b/blender/arm/logicnode/object/LN_set_object_visible.py @@ -21,8 +21,8 @@ class SetVisibleNode(ArmLogicTreeNode): super(SetVisibleNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketBool', 'Visible') - self.add_input('NodeSocketBool', 'Children', default_value=True) + self.add_input('ArmBoolSocket', 'Visible') + self.add_input('ArmBoolSocket', 'Children', default_value=True) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/object/LN_spawn_object.py b/blender/arm/logicnode/object/LN_spawn_object.py index e4e3722a..49097d86 100644 --- a/blender/arm/logicnode/object/LN_spawn_object.py +++ b/blender/arm/logicnode/object/LN_spawn_object.py @@ -11,8 +11,8 @@ class SpawnObjectNode(ArmLogicTreeNode): super(SpawnObjectNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketShader', 'Transform') - self.add_input('NodeSocketBool', 'Children', default_value=True) + self.add_input('ArmDynamicSocket', 'Transform') + self.add_input('ArmBoolSocket', 'Children', default_value=True) self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketObject', 'Object') 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 970f0bd7..bd629b21 100644 --- a/blender/arm/logicnode/object/LN_spawn_object_by_name.py +++ b/blender/arm/logicnode/object/LN_spawn_object_by_name.py @@ -14,9 +14,9 @@ class SpawnObjectByNameNode(ArmLogicTreeNode): def init(self, context): super(SpawnObjectByNameNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Name') - self.add_input('NodeSocketShader', 'Transform') - self.add_input('NodeSocketBool', 'Children', default_value=True) + self.add_input('ArmStringSocket', 'Name') + self.add_input('ArmDynamicSocket', 'Transform') + self.add_input('ArmBoolSocket', 'Children', default_value=True) self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketObject', 'Object') diff --git a/blender/arm/logicnode/physics/LN_Add_rigid_body.py b/blender/arm/logicnode/physics/LN_Add_rigid_body.py index 13fbea61..7376c096 100644 --- a/blender/arm/logicnode/physics/LN_Add_rigid_body.py +++ b/blender/arm/logicnode/physics/LN_Add_rigid_body.py @@ -83,13 +83,13 @@ class AddRigidBodyNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketFloat', 'Mass', 1.0) - self.add_input('NodeSocketBool', 'Active', True) - self.add_input('NodeSocketBool', 'Animated', False) - self.add_input('NodeSocketBool', 'Trigger', False) - self.add_input('NodeSocketFloat', 'Friction', 0.5) - self.add_input('NodeSocketFloat', 'Bounciness', 0.0) - self.add_input('NodeSocketBool', 'Continuous Collision Detection', False) + self.add_input('ArmFloatSocket', 'Mass', 1.0) + self.add_input('ArmBoolSocket', 'Active', True) + self.add_input('ArmBoolSocket', 'Animated', False) + self.add_input('ArmBoolSocket', 'Trigger', False) + self.add_input('ArmFloatSocket', 'Friction', 0.5) + self.add_input('ArmFloatSocket', 'Bounciness', 0.0) + self.add_input('ArmBoolSocket', 'Continuous Collision Detection', False) self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketObject', 'Rigid body') @@ -108,15 +108,15 @@ class AddRigidBodyNode(ArmLogicTreeNode): # Add dynamic input sockets if self.property1_: - self.add_input('NodeSocketBool', 'Collision Margin', False) - self.add_input('NodeSocketFloat', 'Margin', 0.04) - self.add_input('NodeSocketFloat', 'Linear Damping', 0.04) - self.add_input('NodeSocketFloat', 'Angular Damping', 0.1) - self.add_input('NodeSocketBool', 'Use Deacivation') - self.add_input('NodeSocketFloat', 'Linear Velocity Threshold', 0.4) - self.add_input('NodeSocketFloat', 'Angular Velocity Threshold', 0.5) - self.add_input('NodeSocketInt', 'Collision Group', 1) - self.add_input('NodeSocketInt', 'Collision Mask', 1) + self.add_input('ArmBoolSocket', 'Collision Margin', False) + self.add_input('ArmFloatSocket', 'Margin', 0.04) + self.add_input('ArmFloatSocket', 'Linear Damping', 0.04) + self.add_input('ArmFloatSocket', 'Angular Damping', 0.1) + self.add_input('ArmBoolSocket', 'Use Deacivation') + self.add_input('ArmFloatSocket', 'Linear Velocity Threshold', 0.4) + self.add_input('ArmFloatSocket', 'Angular Velocity Threshold', 0.5) + self.add_input('ArmIntSocket', 'Collision Group', 1) + self.add_input('ArmIntSocket', 'Collision Mask', 1) def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/physics/LN_add_physics_constraint.py b/blender/arm/logicnode/physics/LN_add_physics_constraint.py index f8537fa9..89c2d1e0 100644 --- a/blender/arm/logicnode/physics/LN_add_physics_constraint.py +++ b/blender/arm/logicnode/physics/LN_add_physics_constraint.py @@ -91,31 +91,31 @@ class AddPhysicsConstraintNode(ArmLogicTreeNode): while (len(self.inputs) > 7): self.inputs.remove(self.inputs.values()[-1]) #Z ang limits - self.add_input('NodeSocketBool', 'Z angle') - self.add_input('NodeSocketFloat', 'Z ang lower', -45.0) - self.add_input('NodeSocketFloat', 'Z ang upper', 45.0) + self.add_input('ArmBoolSocket', 'Z angle') + self.add_input('ArmFloatSocket', 'Z ang lower', -45.0) + self.add_input('ArmFloatSocket', 'Z ang upper', 45.0) #Arguements for type Slider if (self.get_count_in(select_current) == 3): while (len(self.inputs) > 7): self.inputs.remove(self.inputs.values()[-1]) #X lin limits - self.add_input('NodeSocketBool', 'X linear') - self.add_input('NodeSocketFloat', 'X lin lower') - self.add_input('NodeSocketFloat', 'X lin upper') + self.add_input('ArmBoolSocket', 'X linear') + self.add_input('ArmFloatSocket', 'X lin lower') + self.add_input('ArmFloatSocket', 'X lin upper') #Arguements for type Piston if (self.get_count_in(select_current) == 4): while (len(self.inputs) > 7): self.inputs.remove(self.inputs.values()[-1]) #X lin limits - self.add_input('NodeSocketBool', 'X linear') - self.add_input('NodeSocketFloat', 'X lin lower') - self.add_input('NodeSocketFloat', 'X lin upper') + self.add_input('ArmBoolSocket', 'X linear') + self.add_input('ArmFloatSocket', 'X lin lower') + self.add_input('ArmFloatSocket', 'X lin upper') #X ang limits - self.add_input('NodeSocketBool', 'X angle') - self.add_input('NodeSocketFloat', 'X ang lower', -45.0) - self.add_input('NodeSocketFloat', 'X ang upper', 45.0) + self.add_input('ArmBoolSocket', 'X angle') + self.add_input('ArmFloatSocket', 'X ang lower', -45.0) + self.add_input('ArmFloatSocket', 'X ang upper', 45.0) #Arguements for type GenericSpring if (self.get_count_in(select_current) == 5): @@ -143,9 +143,9 @@ class AddPhysicsConstraintNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketObject', 'Pivot Object') self.add_input('ArmNodeSocketObject', 'RB 1') self.add_input('ArmNodeSocketObject', 'RB 2') - self.add_input('NodeSocketBool', 'Disable Collissions') - self.add_input('NodeSocketBool', 'Breakable') - self.add_input('NodeSocketFloat', 'Breaking Threshold') + self.add_input('ArmBoolSocket', 'Disable Collissions') + self.add_input('ArmBoolSocket', 'Breakable') + self.add_input('ArmFloatSocket', 'Breaking Threshold') self.add_output('ArmNodeSocketAction', 'Out') def draw_buttons(self, context, layout): @@ -163,7 +163,7 @@ class AddPhysicsConstraintNode(ArmLogicTreeNode): column = row.column(align=True) op = column.operator('arm.node_add_input', text='Add Constraint', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketShader' + op.socket_type = 'ArmDynamicSocket' op.name_format = 'Constraint {0}'.format(len(self.inputs) - 6) column1 = row.column(align=True) op = column1.operator('arm.node_remove_input', text='', icon='X', emboss=True) diff --git a/blender/arm/logicnode/physics/LN_apply_force.py b/blender/arm/logicnode/physics/LN_apply_force.py index 57c4a9fa..bfe29b07 100644 --- a/blender/arm/logicnode/physics/LN_apply_force.py +++ b/blender/arm/logicnode/physics/LN_apply_force.py @@ -20,7 +20,7 @@ class ApplyForceNode(ArmLogicTreeNode): super(ApplyForceNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') - self.add_input('NodeSocketVector', 'Force') - self.add_input('NodeSocketBool', 'On Local Axis') + self.add_input('ArmVectorSocket', 'Force') + self.add_input('ArmBoolSocket', 'On Local Axis') self.add_output('ArmNodeSocketAction', 'Out') 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 8d83efba..7a9de48e 100644 --- a/blender/arm/logicnode/physics/LN_apply_force_at_location.py +++ b/blender/arm/logicnode/physics/LN_apply_force_at_location.py @@ -23,9 +23,9 @@ class ApplyForceAtLocationNode(ArmLogicTreeNode): super(ApplyForceAtLocationNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') - self.add_input('NodeSocketVector', 'Force') - self.add_input('NodeSocketBool', 'Force On Local Axis') - self.add_input('NodeSocketVector', 'Location') - self.add_input('NodeSocketBool', 'Location On Local Axis') + self.add_input('ArmVectorSocket', 'Force') + self.add_input('ArmBoolSocket', 'Force On Local Axis') + self.add_input('ArmVectorSocket', 'Location') + self.add_input('ArmBoolSocket', 'Location On Local Axis') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/physics/LN_apply_impulse.py b/blender/arm/logicnode/physics/LN_apply_impulse.py index c3ecec3b..ad41b870 100644 --- a/blender/arm/logicnode/physics/LN_apply_impulse.py +++ b/blender/arm/logicnode/physics/LN_apply_impulse.py @@ -20,7 +20,7 @@ class ApplyImpulseNode(ArmLogicTreeNode): super(ApplyImpulseNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') - self.add_input('NodeSocketVector', 'Impulse') - self.add_input('NodeSocketBool', 'On Local Axis') + self.add_input('ArmVectorSocket', 'Impulse') + self.add_input('ArmBoolSocket', 'On Local Axis') self.add_output('ArmNodeSocketAction', 'Out') 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 fbd0c53c..54a9c0ef 100644 --- a/blender/arm/logicnode/physics/LN_apply_impulse_at_location.py +++ b/blender/arm/logicnode/physics/LN_apply_impulse_at_location.py @@ -23,9 +23,9 @@ class ApplyImpulseAtLocationNode(ArmLogicTreeNode): super(ApplyImpulseAtLocationNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') - self.add_input('NodeSocketVector', 'Impulse') - self.add_input('NodeSocketBool', 'Impulse On Local Axis') - self.add_input('NodeSocketVector', 'Location') - self.add_input('NodeSocketBool', 'Location On Local Axis') + self.add_input('ArmVectorSocket', 'Impulse') + self.add_input('ArmBoolSocket', 'Impulse On Local Axis') + self.add_input('ArmVectorSocket', 'Location') + self.add_input('ArmBoolSocket', 'Location On Local Axis') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/physics/LN_apply_torque.py b/blender/arm/logicnode/physics/LN_apply_torque.py index 88ca157e..7e00d966 100644 --- a/blender/arm/logicnode/physics/LN_apply_torque.py +++ b/blender/arm/logicnode/physics/LN_apply_torque.py @@ -11,7 +11,7 @@ class ApplyTorqueNode(ArmLogicTreeNode): super(ApplyTorqueNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') - self.add_input('NodeSocketVector', 'Torque') - self.add_input('NodeSocketBool', 'On Local Axis') + self.add_input('ArmVectorSocket', 'Torque') + self.add_input('ArmBoolSocket', 'On Local Axis') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/physics/LN_apply_torque_impulse.py b/blender/arm/logicnode/physics/LN_apply_torque_impulse.py index f067cf7f..91662926 100644 --- a/blender/arm/logicnode/physics/LN_apply_torque_impulse.py +++ b/blender/arm/logicnode/physics/LN_apply_torque_impulse.py @@ -11,7 +11,7 @@ class ApplyTorqueImpulseNode(ArmLogicTreeNode): super(ApplyTorqueImpulseNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') - self.add_input('NodeSocketVector', 'Torque') - self.add_input('NodeSocketBool', 'On Local Axis') + self.add_input('ArmVectorSocket', 'Torque') + self.add_input('ArmBoolSocket', 'On Local Axis') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/physics/LN_get_rb_data.py b/blender/arm/logicnode/physics/LN_get_rb_data.py index 90637ff5..3671516f 100644 --- a/blender/arm/logicnode/physics/LN_get_rb_data.py +++ b/blender/arm/logicnode/physics/LN_get_rb_data.py @@ -10,17 +10,17 @@ class GetRigidBodyDataNode(ArmLogicTreeNode): def init(self, context): self.inputs.new('ArmNodeSocketObject', 'Object') - self.outputs.new('NodeSocketBool', 'Is RB') - self.outputs.new('NodeSocketInt', 'Collision Group') - self.outputs.new('NodeSocketInt', 'Collision Mask') - self.outputs.new('NodeSocketBool', 'Is Animated') - self.outputs.new('NodeSocketBool', 'Is Static') - self.outputs.new('NodeSocketFloat', 'Angular Damping') - self.outputs.new('NodeSocketFloat', 'Linear Damping') - self.outputs.new('NodeSocketFloat', 'Friction') - self.outputs.new('NodeSocketFloat', 'Mass') - #self.outputs.new('NodeSocketString', 'Collision Shape') - #self.outputs.new('NodeSocketInt', 'Activation State') - #self.outputs.new('NodeSocketBool', 'Is Gravity Enabled') - #self.outputs.new(NodeSocketVector', Angular Factor') - #self.outputs.new('NodeSocketVector', Linear Factor') + self.outputs.new('ArmBoolSocket', 'Is RB') + self.outputs.new('ArmIntSocket', 'Collision Group') + self.outputs.new('ArmIntSocket', 'Collision Mask') + self.outputs.new('ArmBoolSocket', 'Is Animated') + self.outputs.new('ArmBoolSocket', 'Is Static') + self.outputs.new('ArmFloatSocket', 'Angular Damping') + self.outputs.new('ArmFloatSocket', 'Linear Damping') + self.outputs.new('ArmFloatSocket', 'Friction') + self.outputs.new('ArmFloatSocket', 'Mass') + #self.outputs.new('ArmStringSocket', 'Collision Shape') + #self.outputs.new('ArmIntSocket', 'Activation State') + #self.outputs.new('ArmBoolSocket', 'Is Gravity Enabled') + #self.outputs.new(ArmVectorSocket', Angular Factor') + #self.outputs.new('ArmVectorSocket', Linear Factor') diff --git a/blender/arm/logicnode/physics/LN_get_rb_velocity.py b/blender/arm/logicnode/physics/LN_get_rb_velocity.py index e4b889f9..33269ccb 100644 --- a/blender/arm/logicnode/physics/LN_get_rb_velocity.py +++ b/blender/arm/logicnode/physics/LN_get_rb_velocity.py @@ -9,8 +9,8 @@ class GetVelocityNode(ArmLogicTreeNode): def init(self, context): super(GetVelocityNode, self).init(context) self.add_input('ArmNodeSocketObject', 'RB') - self.add_input('NodeSocketBool', 'Linear On Local Axis') - self.add_input('NodeSocketBool', 'Angular On Local Axis') + self.add_input('ArmBoolSocket', 'Linear On Local Axis') + self.add_input('ArmBoolSocket', 'Angular On Local Axis') - self.add_output('NodeSocketVector', 'Linear') - self.add_output('NodeSocketVector', 'Angular') + self.add_output('ArmVectorSocket', 'Linear') + self.add_output('ArmVectorSocket', 'Angular') diff --git a/blender/arm/logicnode/physics/LN_get_world_gravity.py b/blender/arm/logicnode/physics/LN_get_world_gravity.py index e91555f5..fe810eec 100644 --- a/blender/arm/logicnode/physics/LN_get_world_gravity.py +++ b/blender/arm/logicnode/physics/LN_get_world_gravity.py @@ -11,4 +11,4 @@ class GetGravityNode(ArmLogicTreeNode): def init(self, context): super(GetGravityNode, self).init(context) - self.add_output('NodeSocketVector', 'World Gravity') + 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 9a1eb8da..4bd2151f 100644 --- a/blender/arm/logicnode/physics/LN_has_contact.py +++ b/blender/arm/logicnode/physics/LN_has_contact.py @@ -12,4 +12,4 @@ class HasContactNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketObject', 'RB 1') self.add_input('ArmNodeSocketObject', 'RB 2') - self.add_output('NodeSocketBool', 'Has Contact') + self.add_output('ArmBoolSocket', 'Has Contact') diff --git a/blender/arm/logicnode/physics/LN_has_contact_array.py b/blender/arm/logicnode/physics/LN_has_contact_array.py index 7fafd3e9..e64d342e 100644 --- a/blender/arm/logicnode/physics/LN_has_contact_array.py +++ b/blender/arm/logicnode/physics/LN_has_contact_array.py @@ -12,4 +12,4 @@ class HasContactArrayNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketObject', 'RB') self.add_input('ArmNodeSocketArray', 'RBs') - self.add_output('NodeSocketBool', 'Has Contact') + self.add_output('ArmBoolSocket', 'Has Contact') diff --git a/blender/arm/logicnode/physics/LN_physics_constraint.py b/blender/arm/logicnode/physics/LN_physics_constraint.py index 28dd0f6f..d4d1c539 100644 --- a/blender/arm/logicnode/physics/LN_physics_constraint.py +++ b/blender/arm/logicnode/physics/LN_physics_constraint.py @@ -53,9 +53,9 @@ class PhysicsConstraintNode(ArmLogicTreeNode): def init(self, context): super(PhysicsConstraintNode, self).init(context) - self.add_input('NodeSocketFloat', 'Lower limit') - self.add_input('NodeSocketFloat', 'Upper limit') - self.add_output('NodeSocketShader', 'Constraint') + self.add_input('ArmFloatSocket', 'Lower limit') + self.add_input('ArmFloatSocket', 'Upper limit') + self.add_output('ArmDynamicSocket', 'Constraint') def update_sockets(self, context): while len(self.inputs) > 0: @@ -63,11 +63,11 @@ class PhysicsConstraintNode(ArmLogicTreeNode): # Add dynamic input sockets if self.property2: - self.add_input('NodeSocketFloat', 'Stiffness', 10.0) - self.add_input('NodeSocketFloat', 'Damping', 0.5) + self.add_input('ArmFloatSocket', 'Stiffness', 10.0) + self.add_input('ArmFloatSocket', 'Damping', 0.5) else: - self.add_input('NodeSocketFloat', 'Lower limit') - self.add_input('NodeSocketFloat', 'Upper limit') + self.add_input('ArmFloatSocket', 'Lower limit') + self.add_input('ArmFloatSocket', 'Upper limit') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/physics/LN_pick_rb.py b/blender/arm/logicnode/physics/LN_pick_rb.py index 8497e1f9..65e34f54 100644 --- a/blender/arm/logicnode/physics/LN_pick_rb.py +++ b/blender/arm/logicnode/physics/LN_pick_rb.py @@ -21,8 +21,8 @@ class PickObjectNode(ArmLogicTreeNode): def init(self, context): super(PickObjectNode, self).init(context) - self.add_input('NodeSocketVector', 'Screen Coords') - self.add_input('NodeSocketInt', 'Mask', default_value=1) + self.add_input('ArmVectorSocket', 'Screen Coords') + self.add_input('ArmIntSocket', 'Mask', default_value=1) self.add_output('ArmNodeSocketObject', 'RB') - self.add_output('NodeSocketVector', 'Hit') + self.add_output('ArmVectorSocket', 'Hit') diff --git a/blender/arm/logicnode/physics/LN_ray_cast.py b/blender/arm/logicnode/physics/LN_ray_cast.py index 6792bdb5..79995333 100644 --- a/blender/arm/logicnode/physics/LN_ray_cast.py +++ b/blender/arm/logicnode/physics/LN_ray_cast.py @@ -24,10 +24,10 @@ class RayCastNode(ArmLogicTreeNode): def init(self, context): super(RayCastNode, self).init(context) - self.add_input('NodeSocketVector', 'From') - self.add_input('NodeSocketVector', 'To') - self.add_input('NodeSocketInt', 'Mask', default_value=1) + self.add_input('ArmVectorSocket', 'From') + self.add_input('ArmVectorSocket', 'To') + self.add_input('ArmIntSocket', 'Mask', default_value=1) self.add_output('ArmNodeSocketObject', 'RB') - self.add_output('NodeSocketVector', 'Hit') - self.add_output('NodeSocketVector', 'Normal') + self.add_output('ArmVectorSocket', 'Hit') + self.add_output('ArmVectorSocket', 'Normal') diff --git a/blender/arm/logicnode/physics/LN_set_rb_friction.py b/blender/arm/logicnode/physics/LN_set_rb_friction.py index d2c4e929..c2267732 100644 --- a/blender/arm/logicnode/physics/LN_set_rb_friction.py +++ b/blender/arm/logicnode/physics/LN_set_rb_friction.py @@ -11,6 +11,6 @@ class SetFrictionNode (ArmLogicTreeNode): super(SetFrictionNode, self).init(context) self.inputs.new('ArmNodeSocketAction', 'In') self.inputs.new('ArmNodeSocketObject', 'RB') - self.inputs.new('NodeSocketFloat', 'Friction') + self.inputs.new('ArmFloatSocket', 'Friction') self.outputs.new('ArmNodeSocketAction', 'Out') 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 a7109160..73f0405d 100644 --- a/blender/arm/logicnode/physics/LN_set_rb_gravity_enabled.py +++ b/blender/arm/logicnode/physics/LN_set_rb_gravity_enabled.py @@ -10,6 +10,6 @@ class SetGravityEnabledNode(ArmLogicTreeNode): super(SetGravityEnabledNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') - self.add_input('NodeSocketBool', 'Enabled') + self.add_input('ArmBoolSocket', 'Enabled') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/physics/LN_set_rb_velocity.py b/blender/arm/logicnode/physics/LN_set_rb_velocity.py index 024e980c..48e95bbc 100644 --- a/blender/arm/logicnode/physics/LN_set_rb_velocity.py +++ b/blender/arm/logicnode/physics/LN_set_rb_velocity.py @@ -10,9 +10,9 @@ class SetVelocityNode(ArmLogicTreeNode): super(SetVelocityNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'RB') - self.add_input('NodeSocketVector', 'Linear') - self.add_input('NodeSocketVector', 'Linear Factor', default_value=[1.0, 1.0, 1.0]) - self.add_input('NodeSocketVector', 'Angular') - self.add_input('NodeSocketVector', 'Angular Factor', default_value=[1.0, 1.0, 1.0]) + self.add_input('ArmVectorSocket', 'Linear') + self.add_input('ArmVectorSocket', 'Linear Factor', default_value=[1.0, 1.0, 1.0]) + self.add_input('ArmVectorSocket', 'Angular') + self.add_input('ArmVectorSocket', 'Angular Factor', default_value=[1.0, 1.0, 1.0]) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/physics/LN_set_world_gravity.py b/blender/arm/logicnode/physics/LN_set_world_gravity.py index c04fc6c4..e8646994 100644 --- a/blender/arm/logicnode/physics/LN_set_world_gravity.py +++ b/blender/arm/logicnode/physics/LN_set_world_gravity.py @@ -12,6 +12,6 @@ class SetGravityNode(ArmLogicTreeNode): def init(self, context): super(SetGravityNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketVector', 'Gravity') + self.add_input('ArmVectorSocket', 'Gravity') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/physics/LN_volume_trigger.py b/blender/arm/logicnode/physics/LN_volume_trigger.py index 240588aa..fab5aa3c 100644 --- a/blender/arm/logicnode/physics/LN_volume_trigger.py +++ b/blender/arm/logicnode/physics/LN_volume_trigger.py @@ -24,7 +24,7 @@ class VolumeTriggerNode(ArmLogicTreeNode): self.add_input('ArmNodeSocketObject', 'Object 1') self.add_input('ArmNodeSocketObject', 'Object 2') - self.add_output('NodeSocketBool', 'Bool') + self.add_output('ArmBoolSocket', 'Bool') def draw_buttons(self, context, layout): layout.prop(self, 'property0') 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 bf1d7faf..5cf34dda 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_get_global_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_get_global_node.py @@ -9,10 +9,10 @@ class ColorgradingGetGlobalNode(ArmLogicTreeNode): def init(self, context): super(ColorgradingGetGlobalNode, self).init(context) - self.add_output('NodeSocketFloat', 'Whitebalance') - self.add_output('NodeSocketVector', 'Tint') - self.add_output('NodeSocketVector', 'Saturation') - self.add_output('NodeSocketVector', 'Contrast') - self.add_output('NodeSocketVector', 'Gamma') - self.add_output('NodeSocketVector', 'Gain') - self.add_output('NodeSocketVector', 'Offset') + self.add_output('ArmFloatSocket', 'Whitebalance') + self.add_output('ArmVectorSocket', 'Tint') + self.add_output('ArmVectorSocket', 'Saturation') + self.add_output('ArmVectorSocket', 'Contrast') + self.add_output('ArmVectorSocket', 'Gamma') + self.add_output('ArmVectorSocket', 'Gain') + self.add_output('ArmVectorSocket', 'Offset') 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 598aba4f..583fe71b 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_get_highlight_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_get_highlight_node.py @@ -9,9 +9,9 @@ class ColorgradingGetHighlightNode(ArmLogicTreeNode): def init(self, context): super(ColorgradingGetHighlightNode, self).init(context) - self.add_output('NodeSocketFloat', 'HightlightMin') - self.add_output('NodeSocketVector', 'Saturation') - self.add_output('NodeSocketVector', 'Contrast') - self.add_output('NodeSocketVector', 'Gamma') - self.add_output('NodeSocketVector', 'Gain') - self.add_output('NodeSocketVector', 'Offset') + self.add_output('ArmFloatSocket', 'HightlightMin') + self.add_output('ArmVectorSocket', 'Saturation') + self.add_output('ArmVectorSocket', 'Contrast') + self.add_output('ArmVectorSocket', 'Gamma') + self.add_output('ArmVectorSocket', 'Gain') + self.add_output('ArmVectorSocket', 'Offset') 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 fde32c60..cd8d860d 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_get_midtone_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_get_midtone_node.py @@ -9,8 +9,8 @@ class ColorgradingGetMidtoneNode(ArmLogicTreeNode): def init(self, context): super(ColorgradingGetMidtoneNode, self).init(context) - self.add_output('NodeSocketVector', 'Saturation') - self.add_output('NodeSocketVector', 'Contrast') - self.add_output('NodeSocketVector', 'Gamma') - self.add_output('NodeSocketVector', 'Gain') - self.add_output('NodeSocketVector', 'Offset') + self.add_output('ArmVectorSocket', 'Saturation') + self.add_output('ArmVectorSocket', 'Contrast') + self.add_output('ArmVectorSocket', 'Gamma') + self.add_output('ArmVectorSocket', 'Gain') + self.add_output('ArmVectorSocket', 'Offset') 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 c4662185..16c96cb6 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_get_shadow_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_get_shadow_node.py @@ -9,9 +9,9 @@ class ColorgradingGetShadowNode(ArmLogicTreeNode): def init(self, context): super(ColorgradingGetShadowNode, self).init(context) - self.add_output('NodeSocketFloat', 'ShadowMax') - self.add_output('NodeSocketVector', 'Saturation') - self.add_output('NodeSocketVector', 'Contrast') - self.add_output('NodeSocketVector', 'Gamma') - self.add_output('NodeSocketVector', 'Gain') - self.add_output('NodeSocketVector', 'Offset') + self.add_output('ArmFloatSocket', 'ShadowMax') + self.add_output('ArmVectorSocket', 'Saturation') + self.add_output('ArmVectorSocket', 'Contrast') + self.add_output('ArmVectorSocket', 'Gamma') + self.add_output('ArmVectorSocket', 'Gain') + self.add_output('ArmVectorSocket', 'Offset') 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 ee3aaad5..c9258bb6 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_global_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_global_node.py @@ -42,22 +42,22 @@ class ColorgradingSetGlobalNode(ArmLogicTreeNode): def draw_nodes_uniform(self, context): - self.add_input('NodeSocketFloat', 'Whitebalance', default_value=6500.0) - self.add_input('NodeSocketColor', 'Tint', default_value=[1.0, 1.0, 1.0, 1.0]) - self.add_input('NodeSocketFloat', 'Saturation', default_value=1) - self.add_input('NodeSocketFloat', 'Contrast', default_value=1) - self.add_input('NodeSocketFloat', 'Gamma', default_value=1) - self.add_input('NodeSocketFloat', 'Gain', default_value=1) - self.add_input('NodeSocketFloat', 'Offset', default_value=1) + self.add_input('ArmFloatSocket', 'Whitebalance', default_value=6500.0) + self.add_input('ArmColorSocket', 'Tint', default_value=[1.0, 1.0, 1.0, 1.0]) + self.add_input('ArmFloatSocket', 'Saturation', default_value=1) + self.add_input('ArmFloatSocket', 'Contrast', default_value=1) + self.add_input('ArmFloatSocket', 'Gamma', default_value=1) + self.add_input('ArmFloatSocket', 'Gain', default_value=1) + self.add_input('ArmFloatSocket', 'Offset', default_value=1) def draw_nodes_rgb(self, context): - self.add_input('NodeSocketFloat', 'Whitebalance', default_value=6500.0) - self.add_input('NodeSocketVector', 'Tint', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Saturation', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Contrast', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Gamma', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Gain', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Offset', default_value=[1,1,1]) + self.add_input('ArmFloatSocket', 'Whitebalance', default_value=6500.0) + self.add_input('ArmVectorSocket', 'Tint', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Saturation', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Contrast', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Gamma', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Gain', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Offset', default_value=[1,1,1]) def draw_nodes_colorwheel(self, context): pass 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 64144b18..bc775851 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_highlight_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_highlight_node.py @@ -42,20 +42,20 @@ class ColorgradingSetHighlightNode(ArmLogicTreeNode): def draw_nodes_uniform(self, context): - self.add_input('NodeSocketFloat', 'HighlightMin', default_value=0) - self.add_input('NodeSocketFloat', 'Saturation', default_value=1) - self.add_input('NodeSocketFloat', 'Contrast', default_value=1) - self.add_input('NodeSocketFloat', 'Gamma', default_value=1) - self.add_input('NodeSocketFloat', 'Gain', default_value=1) - self.add_input('NodeSocketFloat', 'Offset', default_value=1) + self.add_input('ArmFloatSocket', 'HighlightMin', default_value=0) + self.add_input('ArmFloatSocket', 'Saturation', default_value=1) + self.add_input('ArmFloatSocket', 'Contrast', default_value=1) + self.add_input('ArmFloatSocket', 'Gamma', default_value=1) + self.add_input('ArmFloatSocket', 'Gain', default_value=1) + self.add_input('ArmFloatSocket', 'Offset', default_value=1) def draw_nodes_rgb(self, context): - self.add_input('NodeSocketFloat', 'HighlightMin', default_value=0) - self.add_input('NodeSocketVector', 'Saturation', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Contrast', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Gamma', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Gain', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Offset', default_value=[1,1,1]) + self.add_input('ArmFloatSocket', 'HighlightMin', default_value=0) + self.add_input('ArmVectorSocket', 'Saturation', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Contrast', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Gamma', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Gain', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Offset', default_value=[1,1,1]) def draw_nodes_colorwheel(self, context): pass 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 0845c625..14dcdbdf 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_midtone_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_midtone_node.py @@ -42,19 +42,19 @@ class ColorgradingSetMidtoneNode(ArmLogicTreeNode): def draw_nodes_uniform(self, context): - self.add_input('NodeSocketFloat', 'Saturation', default_value=1) - self.add_input('NodeSocketFloat', 'Contrast', default_value=1) - self.add_input('NodeSocketFloat', 'Gamma', default_value=1) - self.add_input('NodeSocketFloat', 'Gain', default_value=1) - self.add_input('NodeSocketFloat', 'Offset', default_value=1) + self.add_input('ArmFloatSocket', 'Saturation', default_value=1) + self.add_input('ArmFloatSocket', 'Contrast', default_value=1) + self.add_input('ArmFloatSocket', 'Gamma', default_value=1) + self.add_input('ArmFloatSocket', 'Gain', default_value=1) + self.add_input('ArmFloatSocket', 'Offset', default_value=1) def draw_nodes_rgb(self, context): - self.add_input('NodeSocketVector', 'Tint', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Saturation', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Contrast', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Gamma', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Gain', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Offset', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Tint', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Saturation', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Contrast', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Gamma', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Gain', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Offset', default_value=[1,1,1]) def draw_nodes_colorwheel(self, context): pass 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 b32f64e7..a3abd236 100644 --- a/blender/arm/logicnode/postprocess/LN_colorgrading_set_shadow_node.py +++ b/blender/arm/logicnode/postprocess/LN_colorgrading_set_shadow_node.py @@ -42,20 +42,20 @@ class ColorgradingSetShadowNode(ArmLogicTreeNode): def draw_nodes_uniform(self, context): - self.add_input('NodeSocketFloat', 'ShadowMax', default_value=1) - self.add_input('NodeSocketFloat', 'Saturation', default_value=1) - self.add_input('NodeSocketFloat', 'Contrast', default_value=1) - self.add_input('NodeSocketFloat', 'Gamma', default_value=1) - self.add_input('NodeSocketFloat', 'Gain', default_value=1) - self.add_input('NodeSocketFloat', 'Offset', default_value=1) + self.add_input('ArmFloatSocket', 'ShadowMax', default_value=1) + self.add_input('ArmFloatSocket', 'Saturation', default_value=1) + self.add_input('ArmFloatSocket', 'Contrast', default_value=1) + self.add_input('ArmFloatSocket', 'Gamma', default_value=1) + self.add_input('ArmFloatSocket', 'Gain', default_value=1) + self.add_input('ArmFloatSocket', 'Offset', default_value=1) def draw_nodes_rgb(self, context): - self.add_input('NodeSocketFloat', 'ShadowMax', default_value=1) - self.add_input('NodeSocketVector', 'Saturation', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Contrast', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Gamma', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Gain', default_value=[1,1,1]) - self.add_input('NodeSocketVector', 'Offset', default_value=[1,1,1]) + self.add_input('ArmFloatSocket', 'ShadowMax', default_value=1) + self.add_input('ArmVectorSocket', 'Saturation', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Contrast', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Gamma', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Gain', default_value=[1,1,1]) + self.add_input('ArmVectorSocket', 'Offset', default_value=[1,1,1]) def draw_nodes_colorwheel(self, context): pass diff --git a/blender/arm/logicnode/postprocess/LN_get_bloom_settings.py b/blender/arm/logicnode/postprocess/LN_get_bloom_settings.py index e1774cdb..744e7721 100644 --- a/blender/arm/logicnode/postprocess/LN_get_bloom_settings.py +++ b/blender/arm/logicnode/postprocess/LN_get_bloom_settings.py @@ -8,6 +8,6 @@ class BloomGetNode(ArmLogicTreeNode): def init(self, context): super(BloomGetNode, self).init(context) - self.add_output('NodeSocketFloat', 'Threshold') - self.add_output('NodeSocketFloat', 'Strength') - self.add_output('NodeSocketFloat', 'Radius') + 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 60a9a429..51fb624d 100644 --- a/blender/arm/logicnode/postprocess/LN_get_ca_settings.py +++ b/blender/arm/logicnode/postprocess/LN_get_ca_settings.py @@ -8,5 +8,5 @@ class ChromaticAberrationGetNode(ArmLogicTreeNode): def init(self, context): super(ChromaticAberrationGetNode, self).init(context) - self.add_output('NodeSocketFloat', 'Strength') - self.add_output('NodeSocketFloat', 'Samples') + 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 33599052..71906eae 100644 --- a/blender/arm/logicnode/postprocess/LN_get_camera_post_process.py +++ b/blender/arm/logicnode/postprocess/LN_get_camera_post_process.py @@ -8,13 +8,13 @@ class CameraGetNode(ArmLogicTreeNode): def init(self, context): super(CameraGetNode, self).init(context) - self.add_output('NodeSocketFloat', 'F-Stop') - self.add_output('NodeSocketFloat', 'Shutter Time') - self.add_output('NodeSocketFloat', 'ISO') - self.add_output('NodeSocketFloat', 'Exposure Compensation') - self.add_output('NodeSocketFloat', 'Fisheye Distortion') - self.add_output('NodeSocketBool', 'Auto Focus') - self.add_output('NodeSocketFloat', 'DOF Distance') - self.add_output('NodeSocketFloat', 'DOF Length') - self.add_output('NodeSocketFloat', 'DOF F-Stop') - self.add_output('NodeSocketFloat', 'Film Grain') + self.add_output('ArmFloatSocket', 'F-Stop') + self.add_output('ArmFloatSocket', 'Shutter Time') + self.add_output('ArmFloatSocket', 'ISO') + self.add_output('ArmFloatSocket', 'Exposure Compensation') + self.add_output('ArmFloatSocket', 'Fisheye Distortion') + self.add_output('ArmBoolSocket', 'Auto Focus') + self.add_output('ArmFloatSocket', 'DOF Distance') + self.add_output('ArmFloatSocket', 'DOF Length') + self.add_output('ArmFloatSocket', 'DOF F-Stop') + self.add_output('ArmFloatSocket', 'Film Grain') diff --git a/blender/arm/logicnode/postprocess/LN_get_lenstexture_settings.py b/blender/arm/logicnode/postprocess/LN_get_lenstexture_settings.py index 6f8aa6a3..fd93f516 100644 --- a/blender/arm/logicnode/postprocess/LN_get_lenstexture_settings.py +++ b/blender/arm/logicnode/postprocess/LN_get_lenstexture_settings.py @@ -8,8 +8,8 @@ class LenstextureGetNode(ArmLogicTreeNode): def init(self, context): super(LenstextureGetNode, self).init(context) - self.add_output('NodeSocketFloat', 'Center Min Clip') - self.add_output('NodeSocketFloat', 'Center Max Clip') - self.add_output('NodeSocketFloat', 'Luminance Min') - self.add_output('NodeSocketFloat', 'Luminance Max') - self.add_output('NodeSocketFloat', 'Brightness Exponent') + self.add_output('ArmFloatSocket', 'Center Min Clip') + self.add_output('ArmFloatSocket', 'Center Max Clip') + self.add_output('ArmFloatSocket', 'Luminance Min') + self.add_output('ArmFloatSocket', 'Luminance Max') + self.add_output('ArmFloatSocket', 'Brightness Exponent') diff --git a/blender/arm/logicnode/postprocess/LN_get_ssao_settings.py b/blender/arm/logicnode/postprocess/LN_get_ssao_settings.py index 3aecab2c..7208d123 100644 --- a/blender/arm/logicnode/postprocess/LN_get_ssao_settings.py +++ b/blender/arm/logicnode/postprocess/LN_get_ssao_settings.py @@ -8,6 +8,6 @@ class SSAOGetNode(ArmLogicTreeNode): def init(self, context): super(SSAOGetNode, self).init(context) - self.add_output('NodeSocketFloat', 'Radius') - self.add_output('NodeSocketFloat', 'Strength') - self.add_output('NodeSocketFloat', 'Max Steps') + 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 782ce30f..69ac4405 100644 --- a/blender/arm/logicnode/postprocess/LN_get_ssr_settings.py +++ b/blender/arm/logicnode/postprocess/LN_get_ssr_settings.py @@ -8,8 +8,8 @@ class SSRGetNode(ArmLogicTreeNode): def init(self, context): super(SSRGetNode, self).init(context) - self.add_output('NodeSocketFloat', 'SSR Step') - self.add_output('NodeSocketFloat', 'SSR Step Min') - self.add_output('NodeSocketFloat', 'SSR Search') - self.add_output('NodeSocketFloat', 'SSR Falloff') - self.add_output('NodeSocketFloat', 'SSR Jitter') + self.add_output('ArmFloatSocket', 'SSR Step') + self.add_output('ArmFloatSocket', 'SSR Step Min') + self.add_output('ArmFloatSocket', 'SSR Search') + self.add_output('ArmFloatSocket', 'SSR Falloff') + self.add_output('ArmFloatSocket', 'SSR Jitter') diff --git a/blender/arm/logicnode/postprocess/LN_lenstexture_set.py b/blender/arm/logicnode/postprocess/LN_lenstexture_set.py index 2fe8a79d..4ee7380f 100644 --- a/blender/arm/logicnode/postprocess/LN_lenstexture_set.py +++ b/blender/arm/logicnode/postprocess/LN_lenstexture_set.py @@ -9,10 +9,10 @@ class LenstextureSetNode(ArmLogicTreeNode): def init(self, context): super(LenstextureSetNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketFloat', 'Center Min Clip', default_value=0.1) - self.add_input('NodeSocketFloat', 'Center Max Clip', default_value=0.5) - self.add_input('NodeSocketFloat', 'Luminance Min', default_value=0.10) - self.add_input('NodeSocketFloat', 'Luminance Max', default_value=2.50) - self.add_input('NodeSocketFloat', 'Brightness Exponent', default_value=2.0) + self.add_input('ArmFloatSocket', 'Center Min Clip', default_value=0.1) + self.add_input('ArmFloatSocket', 'Center Max Clip', default_value=0.5) + self.add_input('ArmFloatSocket', 'Luminance Min', default_value=0.10) + self.add_input('ArmFloatSocket', 'Luminance Max', default_value=2.50) + self.add_input('ArmFloatSocket', 'Brightness Exponent', default_value=2.0) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/postprocess/LN_set_bloom_settings.py b/blender/arm/logicnode/postprocess/LN_set_bloom_settings.py index ffa85450..90c8d5a3 100644 --- a/blender/arm/logicnode/postprocess/LN_set_bloom_settings.py +++ b/blender/arm/logicnode/postprocess/LN_set_bloom_settings.py @@ -9,8 +9,8 @@ class BloomSetNode(ArmLogicTreeNode): def init(self, context): super(BloomSetNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketFloat', 'Threshold', default_value=1.00) - self.add_input('NodeSocketFloat', 'Strength', default_value=3.50) - self.add_input('NodeSocketFloat', 'Radius', default_value=3.0) + self.add_input('ArmFloatSocket', 'Threshold', default_value=1.00) + self.add_input('ArmFloatSocket', 'Strength', default_value=3.50) + self.add_input('ArmFloatSocket', 'Radius', default_value=3.0) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/postprocess/LN_set_ca_settings.py b/blender/arm/logicnode/postprocess/LN_set_ca_settings.py index 18b6f0a1..be459419 100644 --- a/blender/arm/logicnode/postprocess/LN_set_ca_settings.py +++ b/blender/arm/logicnode/postprocess/LN_set_ca_settings.py @@ -9,7 +9,7 @@ class ChromaticAberrationSetNode(ArmLogicTreeNode): def init(self, context): super(ChromaticAberrationSetNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketFloat', 'Strength', default_value=2.0) - self.add_input('NodeSocketInt', 'Samples', default_value=32) + self.add_input('ArmFloatSocket', 'Strength', default_value=2.0) + self.add_input('ArmIntSocket', 'Samples', default_value=32) self.add_output('ArmNodeSocketAction', 'Out') 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 a21d8ddc..e589b6c9 100644 --- a/blender/arm/logicnode/postprocess/LN_set_camera_post_process.py +++ b/blender/arm/logicnode/postprocess/LN_set_camera_post_process.py @@ -9,16 +9,16 @@ class CameraSetNode(ArmLogicTreeNode): def init(self, context): super(CameraSetNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketFloat', 'F-stop', default_value=2.0) - self.add_input('NodeSocketFloat', 'Shutter Time', default_value=1.0) - self.add_input('NodeSocketFloat', 'ISO', default_value=100.0) - self.add_input('NodeSocketFloat', 'Exposure Compensation', default_value=0.0) - self.add_input('NodeSocketFloat', 'Fisheye Distortion', default_value=0.01) - self.add_input('NodeSocketBool', 'Auto Focus', default_value=True) - self.add_input('NodeSocketFloat', 'DoF Distance', default_value=10.0) - self.add_input('NodeSocketFloat', 'DoF Length', default_value=160.0) - self.add_input('NodeSocketFloat', 'DoF F-Stop', default_value=128.0) - self.add_input('NodeSocketInt', 'Tonemapper', default_value=0.0) - self.add_input('NodeSocketFloat', 'Film Grain', default_value=2.0) + self.add_input('ArmFloatSocket', 'F-stop', default_value=2.0) + self.add_input('ArmFloatSocket', 'Shutter Time', default_value=1.0) + self.add_input('ArmFloatSocket', 'ISO', default_value=100.0) + self.add_input('ArmFloatSocket', 'Exposure Compensation', default_value=0.0) + self.add_input('ArmFloatSocket', 'Fisheye Distortion', default_value=0.01) + self.add_input('ArmBoolSocket', 'Auto Focus', default_value=True) + self.add_input('ArmFloatSocket', 'DoF Distance', default_value=10.0) + self.add_input('ArmFloatSocket', 'DoF Length', default_value=160.0) + self.add_input('ArmFloatSocket', 'DoF F-Stop', default_value=128.0) + self.add_input('ArmIntSocket', 'Tonemapper', default_value=0.0) + self.add_input('ArmFloatSocket', 'Film Grain', default_value=2.0) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/postprocess/LN_set_ssao_settings.py b/blender/arm/logicnode/postprocess/LN_set_ssao_settings.py index 199d5d6c..386e980b 100644 --- a/blender/arm/logicnode/postprocess/LN_set_ssao_settings.py +++ b/blender/arm/logicnode/postprocess/LN_set_ssao_settings.py @@ -9,8 +9,8 @@ class SSAOSetNode(ArmLogicTreeNode): def init(self, context): super(SSAOSetNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketFloat', 'Radius', default_value=1.0) - self.add_input('NodeSocketFloat', 'Strength', default_value=5.0) - self.add_input('NodeSocketInt', 'Max Steps', default_value=8) + self.add_input('ArmFloatSocket', 'Radius', default_value=1.0) + self.add_input('ArmFloatSocket', 'Strength', default_value=5.0) + self.add_input('ArmIntSocket', 'Max Steps', default_value=8) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/postprocess/LN_set_ssr_settings.py b/blender/arm/logicnode/postprocess/LN_set_ssr_settings.py index 40995378..fd6bb111 100644 --- a/blender/arm/logicnode/postprocess/LN_set_ssr_settings.py +++ b/blender/arm/logicnode/postprocess/LN_set_ssr_settings.py @@ -9,10 +9,10 @@ class SSRSetNode(ArmLogicTreeNode): def init(self, context): super(SSRSetNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketFloat', 'SSR Step', default_value=0.04) - self.add_input('NodeSocketFloat', 'SSR Step Min', default_value=0.05) - self.add_input('NodeSocketFloat', 'SSR Search', default_value=5.0) - self.add_input('NodeSocketFloat', 'SSR Falloff', default_value=5.0) - self.add_input('NodeSocketFloat', 'SSR Jitter', default_value=0.6) + self.add_input('ArmFloatSocket', 'SSR Step', default_value=0.04) + self.add_input('ArmFloatSocket', 'SSR Step Min', default_value=0.05) + self.add_input('ArmFloatSocket', 'SSR Search', default_value=5.0) + self.add_input('ArmFloatSocket', 'SSR Falloff', default_value=5.0) + self.add_input('ArmFloatSocket', 'SSR Jitter', default_value=0.6) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/random/LN_random_boolean.py b/blender/arm/logicnode/random/LN_random_boolean.py index 8fef83ae..039a2c91 100644 --- a/blender/arm/logicnode/random/LN_random_boolean.py +++ b/blender/arm/logicnode/random/LN_random_boolean.py @@ -9,4 +9,4 @@ class RandomBooleanNode(ArmLogicTreeNode): def init(self, context): super(RandomBooleanNode, self).init(context) - self.add_output('NodeSocketBool', 'Bool') + 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 ad6b4f7e..ee273513 100644 --- a/blender/arm/logicnode/random/LN_random_choice.py +++ b/blender/arm/logicnode/random/LN_random_choice.py @@ -11,4 +11,4 @@ class RandomChoiceNode(ArmLogicTreeNode): super().init(context) self.add_input('ArmNodeSocketArray', 'Array') - self.add_output('NodeSocketShader', 'Value') + 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 82ef9bf8..38c36442 100644 --- a/blender/arm/logicnode/random/LN_random_color.py +++ b/blender/arm/logicnode/random/LN_random_color.py @@ -9,4 +9,4 @@ class RandomColorNode(ArmLogicTreeNode): def init(self, context): super(RandomColorNode, self).init(context) - self.add_output('NodeSocketColor', 'Color') + 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 6303d5e0..22dca241 100644 --- a/blender/arm/logicnode/random/LN_random_float.py +++ b/blender/arm/logicnode/random/LN_random_float.py @@ -9,7 +9,7 @@ class RandomFloatNode(ArmLogicTreeNode): def init(self, context): super(RandomFloatNode, self).init(context) - self.add_input('NodeSocketFloat', 'Min') - self.add_input('NodeSocketFloat', 'Max', default_value=1.0) - # self.add_input('NodeSocketInt', 'Seed') - self.add_output('NodeSocketFloat', 'Float') + self.add_input('ArmFloatSocket', 'Min') + self.add_input('ArmFloatSocket', 'Max', default_value=1.0) + # self.add_input('ArmIntSocket', 'Seed') + self.add_output('ArmFloatSocket', 'Float') diff --git a/blender/arm/logicnode/random/LN_random_integer.py b/blender/arm/logicnode/random/LN_random_integer.py index dfb3442f..0b69d5a7 100644 --- a/blender/arm/logicnode/random/LN_random_integer.py +++ b/blender/arm/logicnode/random/LN_random_integer.py @@ -9,6 +9,6 @@ class RandomIntegerNode(ArmLogicTreeNode): def init(self, context): super(RandomIntegerNode, self).init(context) - self.add_input('NodeSocketInt', 'Min') - self.add_input('NodeSocketInt', 'Max', default_value=2) - self.add_output('NodeSocketInt', 'Int') + 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_vector.py b/blender/arm/logicnode/random/LN_random_vector.py index 6986a8a0..11161f8e 100644 --- a/blender/arm/logicnode/random/LN_random_vector.py +++ b/blender/arm/logicnode/random/LN_random_vector.py @@ -9,6 +9,6 @@ class RandomVectorNode(ArmLogicTreeNode): def init(self, context): super(RandomVectorNode, self).init(context) - self.add_input('NodeSocketVector', 'Min', default_value=[-1.0, -1.0, -1.0]) - self.add_input('NodeSocketVector', 'Max', default_value=[1.0, 1.0, 1.0]) - self.add_output('NodeSocketVector', 'Vector') + 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_post_process_quality.py b/blender/arm/logicnode/renderpath/LN_set_post_process_quality.py index e7b6e31e..a2d01c1b 100644 --- a/blender/arm/logicnode/renderpath/LN_set_post_process_quality.py +++ b/blender/arm/logicnode/renderpath/LN_set_post_process_quality.py @@ -18,7 +18,7 @@ class RpConfigNode(ArmLogicTreeNode): def init(self, context): super(RpConfigNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketBool', 'Enable') + self.add_input('ArmBoolSocket', 'Enable') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/renderpath/LN_set_shader_uniform.py b/blender/arm/logicnode/renderpath/LN_set_shader_uniform.py index cf34577e..7de5ccfe 100644 --- a/blender/arm/logicnode/renderpath/LN_set_shader_uniform.py +++ b/blender/arm/logicnode/renderpath/LN_set_shader_uniform.py @@ -15,11 +15,11 @@ class SetShaderUniformNode(ArmLogicTreeNode): self.inputs.remove(self.inputs[2]) if self.property0 == 'int': - self.add_input('NodeSocketInt', 'Int') + self.add_input('ArmIntSocket', 'Int') elif self.property0 == 'float': - self.add_input('NodeSocketFloat', 'Float') + self.add_input('ArmFloatSocket', 'Float') elif self.property0 in ('vec2', 'vec3', 'vec4'): - self.add_input('NodeSocketVector', 'Vector') + self.add_input('ArmVectorSocket', 'Vector') property0: HaxeEnumProperty( 'property0', @@ -36,8 +36,8 @@ class SetShaderUniformNode(ArmLogicTreeNode): def init(self, context): super().init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Uniform Name') - self.add_input('NodeSocketFloat', 'Float') + self.add_input('ArmStringSocket', 'Uniform Name') + self.add_input('ArmFloatSocket', 'Float') self.add_output('ArmNodeSocketAction', 'Out') def draw_buttons(self, context, layout): diff --git a/blender/arm/logicnode/replacement.py b/blender/arm/logicnode/replacement.py index 99585f13..c01556a6 100644 --- a/blender/arm/logicnode/replacement.py +++ b/blender/arm/logicnode/replacement.py @@ -10,6 +10,7 @@ Original author: @niacdoial import os.path import time import traceback +import typing from typing import Dict, List, Optional, Tuple import bpy.props @@ -17,6 +18,7 @@ import bpy.props import arm.log as log import arm.logicnode.arm_nodes as arm_nodes import arm.logicnode.arm_sockets +import arm.node_utils as node_utils # List of errors that occurred during the replacement # Format: (error identifier, node.bl_idname (or None), tree name, exception traceback (optional)) @@ -272,3 +274,78 @@ def replace_all(): log.error(f'There were errors in the node update procedure, a detailed report has been written to {reportfile}') bpy.ops.arm.show_node_update_errors() + + +def node_compat_sdk2108(): + """SDK 21.08 broke compatibility with older nodes as nodes now use + custom sockets even for Blender's default data types and custom + property "constructors". This allows to listen for events for the + live patch system. + + In order to update older nodes this routine is used. It creates a + full copy of the nodes and replaces all properties and sockets with + their new equivalents. + """ + for tree in bpy.data.node_groups: + if tree.bl_idname == "ArmLogicTreeType": + for node in list(tree.nodes): + # Don't raise exceptions for invalid unregistered nodes, this + # function didn't cause the registration problem if there is one + if not node.__class__.is_registered_node_type(): + continue + + newnode = tree.nodes.new(node.__class__.bl_idname) + + newnode.parent = node.parent + newnode.location = node.location + newnode.select = node.select + + # Also copy the node's version number to _not_ prevent actual node + # replacement after this step + newnode.arm_version = node.arm_version + + # First replace all properties + for prop_name, prop in typing.get_type_hints(node.__class__, {}, {}).items(): + if isinstance(prop, bpy.props._PropertyDeferred): + if hasattr(node, prop_name) and hasattr(newnode, prop_name): + setattr(newnode, prop_name, getattr(node, prop_name)) + + # Replace sockets with new socket types + socket_replacements = { + 'NodeSocketBool': 'ArmBoolSocket', + 'NodeSocketColor': 'ArmColorSocket', + 'NodeSocketFloat': 'ArmFloatSocket', + 'NodeSocketInt': 'ArmIntSocket', + 'NodeSocketShader': 'ArmDynamicSocket', + 'NodeSocketString': 'ArmStringSocket', + 'NodeSocketVector': 'ArmVectorSocket' + } + + # Recreate all sockets + newnode.inputs.clear() + for inp in node.inputs: + inp_idname = inp.bl_idname + inp_idname = socket_replacements.get(inp_idname, inp_idname) + + newinp = newnode.inputs.new(inp_idname, inp.name, identifier=inp.identifier) + + if inp.is_linked: + for link in inp.links: + tree.links.new(link.from_socket, newinp) + else: + node_utils.set_socket_default(newinp, node_utils.get_socket_default(inp)) + + newnode.outputs.clear() + for out in node.outputs: + out_idname = out.bl_idname + out_idname = socket_replacements.get(out_idname, out_idname) + + newout = newnode.outputs.new(out_idname, out.name, identifier=out.identifier) + + if out.is_linked: + for link in out.links: + tree.links.new(newout, link.to_socket) + else: + node_utils.set_socket_default(newout, node_utils.get_socket_default(out)) + + tree.nodes.remove(node) diff --git a/blender/arm/logicnode/scene/LN_create_collection.py b/blender/arm/logicnode/scene/LN_create_collection.py index 9c728c21..5e6157c3 100644 --- a/blender/arm/logicnode/scene/LN_create_collection.py +++ b/blender/arm/logicnode/scene/LN_create_collection.py @@ -10,6 +10,6 @@ class CreateCollectionNode(ArmLogicTreeNode): def init(self, context): super(CreateCollectionNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Collection') + self.add_input('ArmStringSocket', 'Collection') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/scene/LN_get_collection.py b/blender/arm/logicnode/scene/LN_get_collection.py index 14fb5d7a..2048650e 100644 --- a/blender/arm/logicnode/scene/LN_get_collection.py +++ b/blender/arm/logicnode/scene/LN_get_collection.py @@ -12,6 +12,6 @@ class GetGroupNode(ArmLogicTreeNode): def init(self, context): super(GetGroupNode, self).init(context) - self.add_input('NodeSocketString', 'Name') + 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 a263b428..841a3fe1 100644 --- a/blender/arm/logicnode/scene/LN_get_scene_active.py +++ b/blender/arm/logicnode/scene/LN_get_scene_active.py @@ -8,4 +8,4 @@ class ActiveSceneNode(ArmLogicTreeNode): def init(self, context): super(ActiveSceneNode, self).init(context) - self.add_output('NodeSocketShader', 'Scene') + self.add_output('ArmDynamicSocket', 'Scene') diff --git a/blender/arm/logicnode/scene/LN_remove_collection.py b/blender/arm/logicnode/scene/LN_remove_collection.py index b7a40ce9..3e6d49c5 100644 --- a/blender/arm/logicnode/scene/LN_remove_collection.py +++ b/blender/arm/logicnode/scene/LN_remove_collection.py @@ -10,6 +10,6 @@ class RemoveGroupNode(ArmLogicTreeNode): def init(self, context): super(RemoveGroupNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketString', 'Collection') + self.add_input('ArmStringSocket', 'Collection') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/scene/LN_scene.py b/blender/arm/logicnode/scene/LN_scene.py index 4131608a..d2ed0b60 100644 --- a/blender/arm/logicnode/scene/LN_scene.py +++ b/blender/arm/logicnode/scene/LN_scene.py @@ -13,7 +13,7 @@ class SceneNode(ArmLogicTreeNode): def init(self, context): super(SceneNode, self).init(context) - self.add_output('NodeSocketShader', 'Scene') + self.add_output('ArmDynamicSocket', 'Scene') def draw_buttons(self, context, layout): layout.prop_search(self, 'property0_get', bpy.data, 'scenes', icon='NONE', text='') diff --git a/blender/arm/logicnode/scene/LN_set_scene_active.py b/blender/arm/logicnode/scene/LN_set_scene_active.py index 4a231d83..e839765c 100644 --- a/blender/arm/logicnode/scene/LN_set_scene_active.py +++ b/blender/arm/logicnode/scene/LN_set_scene_active.py @@ -9,7 +9,7 @@ class SetSceneNode(ArmLogicTreeNode): def init(self, context): super(SetSceneNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Scene') + self.add_input('ArmDynamicSocket', 'Scene') self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketObject', 'Root') diff --git a/blender/arm/logicnode/scene/LN_spawn_collection.py b/blender/arm/logicnode/scene/LN_spawn_collection.py index 12e995e9..72c6db7c 100644 --- a/blender/arm/logicnode/scene/LN_spawn_collection.py +++ b/blender/arm/logicnode/scene/LN_spawn_collection.py @@ -33,7 +33,7 @@ class SpawnCollectionNode(ArmLogicTreeNode): def init(self, context): super(SpawnCollectionNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Transform') + self.add_input('ArmDynamicSocket', 'Transform') self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketArray', 'Top-Level Objects') diff --git a/blender/arm/logicnode/scene/LN_spawn_scene.py b/blender/arm/logicnode/scene/LN_spawn_scene.py index d9d42a2b..5a2b50dd 100644 --- a/blender/arm/logicnode/scene/LN_spawn_scene.py +++ b/blender/arm/logicnode/scene/LN_spawn_scene.py @@ -9,8 +9,8 @@ class SpawnSceneNode(ArmLogicTreeNode): def init(self, context): super(SpawnSceneNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Scene') - self.add_input('NodeSocketShader', 'Transform') + self.add_input('ArmDynamicSocket', 'Scene') + self.add_input('ArmDynamicSocket', 'Transform') self.add_output('ArmNodeSocketAction', 'Out') self.add_output('ArmNodeSocketObject', 'Root') diff --git a/blender/arm/logicnode/string/LN_concatenate_string.py b/blender/arm/logicnode/string/LN_concatenate_string.py index 381957c0..0c8c3e13 100644 --- a/blender/arm/logicnode/string/LN_concatenate_string.py +++ b/blender/arm/logicnode/string/LN_concatenate_string.py @@ -12,14 +12,14 @@ class ConcatenateStringNode(ArmLogicTreeNode): def init(self, context): super(ConcatenateStringNode, self).init(context) - self.add_input('NodeSocketString', 'Input 0') + self.add_input('ArmStringSocket', 'Input 0') - self.add_output('NodeSocketString', 'String') + self.add_output('ArmStringSocket', 'String') def draw_buttons(self, context, layout): row = layout.row(align=True) op = row.operator('arm.node_add_input', text='New', icon='PLUS', emboss=True) op.node_index = str(id(self)) - op.socket_type = 'NodeSocketString' + op.socket_type = 'ArmStringSocket' op = row.operator('arm.node_remove_input', text='', icon='X', emboss=True) op.node_index = str(id(self)) diff --git a/blender/arm/logicnode/string/LN_parse_float.py b/blender/arm/logicnode/string/LN_parse_float.py index 2cb6b8cb..f52fc698 100644 --- a/blender/arm/logicnode/string/LN_parse_float.py +++ b/blender/arm/logicnode/string/LN_parse_float.py @@ -9,6 +9,6 @@ class ParseFloatNode(ArmLogicTreeNode): def init(self, context): super(ParseFloatNode, self).init(context) - self.add_output('NodeSocketFloat', 'Float') + self.add_output('ArmFloatSocket', 'Float') - self.add_input('NodeSocketString', 'String') + 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 793716eb..79941b81 100644 --- a/blender/arm/logicnode/string/LN_split_string.py +++ b/blender/arm/logicnode/string/LN_split_string.py @@ -10,5 +10,5 @@ class SplitStringNode(ArmLogicTreeNode): super(SplitStringNode, self).init(context) self.add_output('ArmNodeSocketArray', 'Array') - self.add_input('NodeSocketString', 'String') - self.add_input('NodeSocketString', 'Split') + self.add_input('ArmStringSocket', 'String') + self.add_input('ArmStringSocket', 'Split') diff --git a/blender/arm/logicnode/string/LN_string.py b/blender/arm/logicnode/string/LN_string.py index bc37a715..6b4679c3 100644 --- a/blender/arm/logicnode/string/LN_string.py +++ b/blender/arm/logicnode/string/LN_string.py @@ -8,6 +8,6 @@ class StringNode(ArmLogicTreeNode): def init(self, context): super(StringNode, self).init(context) - self.add_input('NodeSocketString', 'String In') + self.add_input('ArmStringSocket', 'String In') - self.add_output('NodeSocketString', 'String Out', is_var=True) + 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 64d35ae1..195bb6c1 100644 --- a/blender/arm/logicnode/string/LN_string_case.py +++ b/blender/arm/logicnode/string/LN_string_case.py @@ -14,9 +14,9 @@ class CaseStringNode(ArmLogicTreeNode): def init(self, context): super(CaseStringNode, self).init(context) - self.add_input('NodeSocketString', 'String In') + self.add_input('ArmStringSocket', 'String In') - self.add_output('NodeSocketString', 'String Out') + self.add_output('ArmStringSocket', 'String Out') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/string/LN_string_contains.py b/blender/arm/logicnode/string/LN_string_contains.py index dafe546f..aa657ec5 100644 --- a/blender/arm/logicnode/string/LN_string_contains.py +++ b/blender/arm/logicnode/string/LN_string_contains.py @@ -15,10 +15,10 @@ class ContainsStringNode(ArmLogicTreeNode): def init(self, context): super(ContainsStringNode, self).init(context) - self.add_input('NodeSocketString', 'String') - self.add_input('NodeSocketString', 'Find') + self.add_input('ArmStringSocket', 'String') + self.add_input('ArmStringSocket', 'Find') - self.add_output('NodeSocketBool', 'Contains') + self.add_output('ArmBoolSocket', 'Contains') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/string/LN_string_length.py b/blender/arm/logicnode/string/LN_string_length.py index 2e4f249d..9037a1ed 100644 --- a/blender/arm/logicnode/string/LN_string_length.py +++ b/blender/arm/logicnode/string/LN_string_length.py @@ -8,6 +8,6 @@ class LengthStringNode(ArmLogicTreeNode): def init(self, context): super(LengthStringNode, self).init(context) - self.add_output('NodeSocketInt', 'Length') + self.add_output('ArmIntSocket', 'Length') - self.add_input('NodeSocketString', 'String') + 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 60c65213..b3b0a7c0 100644 --- a/blender/arm/logicnode/string/LN_sub_string.py +++ b/blender/arm/logicnode/string/LN_sub_string.py @@ -8,8 +8,8 @@ class SubStringNode(ArmLogicTreeNode): def init(self, context): super(SubStringNode, self).init(context) - self.add_input('NodeSocketString', 'String In') - self.add_input('NodeSocketInt', 'Start') - self.add_input('NodeSocketInt', 'End') + self.add_input('ArmStringSocket', 'String In') + self.add_input('ArmIntSocket', 'Start') + self.add_input('ArmIntSocket', 'End') - self.add_output('NodeSocketString', 'String Out') + self.add_output('ArmStringSocket', 'String Out') 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 04a22b31..c2fe8847 100644 --- a/blender/arm/logicnode/trait/LN_add_trait_to_object.py +++ b/blender/arm/logicnode/trait/LN_add_trait_to_object.py @@ -10,6 +10,6 @@ class AddTraitNode(ArmLogicTreeNode): super(AddTraitNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketShader', 'Trait') + self.add_input('ArmDynamicSocket', 'Trait') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/trait/LN_get_object_trait.py b/blender/arm/logicnode/trait/LN_get_object_trait.py index 86c9dd15..7014a2f8 100644 --- a/blender/arm/logicnode/trait/LN_get_object_trait.py +++ b/blender/arm/logicnode/trait/LN_get_object_trait.py @@ -10,6 +10,6 @@ class GetTraitNode(ArmLogicTreeNode): def init(self, context): super(GetTraitNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketString', 'Name') + self.add_input('ArmStringSocket', 'Name') - self.add_output('NodeSocketShader', 'Trait') + self.add_output('ArmDynamicSocket', 'Trait') diff --git a/blender/arm/logicnode/trait/LN_get_trait_name.py b/blender/arm/logicnode/trait/LN_get_trait_name.py index 49143b6b..c8156da5 100644 --- a/blender/arm/logicnode/trait/LN_get_trait_name.py +++ b/blender/arm/logicnode/trait/LN_get_trait_name.py @@ -8,7 +8,7 @@ class GetTraitNameNode(ArmLogicTreeNode): def init(self, context): super(GetTraitNameNode, self).init(context) - self.add_input('NodeSocketShader', 'Trait') + self.add_input('ArmDynamicSocket', 'Trait') - self.add_output('NodeSocketString', 'Name') - self.add_output('NodeSocketString', 'Class Type') + self.add_output('ArmStringSocket', 'Name') + self.add_output('ArmStringSocket', 'Class Type') diff --git a/blender/arm/logicnode/trait/LN_get_trait_paused.py b/blender/arm/logicnode/trait/LN_get_trait_paused.py index 2150523d..286df85d 100644 --- a/blender/arm/logicnode/trait/LN_get_trait_paused.py +++ b/blender/arm/logicnode/trait/LN_get_trait_paused.py @@ -8,6 +8,6 @@ class GetTraitPausedNode(ArmLogicTreeNode): def init(self, context): super(GetTraitPausedNode, self).init(context) - self.add_input('NodeSocketShader', 'Trait') + self.add_input('ArmDynamicSocket', 'Trait') - self.add_output('NodeSocketBool', 'Is Paused') + 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 07a41f16..0d40e82a 100644 --- a/blender/arm/logicnode/trait/LN_remove_trait.py +++ b/blender/arm/logicnode/trait/LN_remove_trait.py @@ -9,6 +9,6 @@ class RemoveTraitNode(ArmLogicTreeNode): def init(self, context): super(RemoveTraitNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Trait') + self.add_input('ArmDynamicSocket', 'Trait') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/trait/LN_self_trait.py b/blender/arm/logicnode/trait/LN_self_trait.py index dc06e0c4..5e3c85b7 100644 --- a/blender/arm/logicnode/trait/LN_self_trait.py +++ b/blender/arm/logicnode/trait/LN_self_trait.py @@ -8,4 +8,4 @@ class SelfTraitNode(ArmLogicTreeNode): def init(self, context): super(SelfTraitNode, self).init(context) - self.add_output('NodeSocketShader', 'Trait') + 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 81ada9c4..6c4b595c 100644 --- a/blender/arm/logicnode/trait/LN_set_trait_paused.py +++ b/blender/arm/logicnode/trait/LN_set_trait_paused.py @@ -9,7 +9,7 @@ class SetTraitPausedNode(ArmLogicTreeNode): def init(self, context): super(SetTraitPausedNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Trait') - self.add_input('NodeSocketBool', 'Paused') + self.add_input('ArmDynamicSocket', 'Trait') + self.add_input('ArmBoolSocket', 'Paused') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/trait/LN_trait.py b/blender/arm/logicnode/trait/LN_trait.py index b572923f..4ed2a6dd 100644 --- a/blender/arm/logicnode/trait/LN_trait.py +++ b/blender/arm/logicnode/trait/LN_trait.py @@ -12,7 +12,7 @@ class TraitNode(ArmLogicTreeNode): def init(self, context): super(TraitNode, self).init(context) - self.add_output('NodeSocketShader', 'Trait', is_var=True) + self.add_output('ArmDynamicSocket', 'Trait', is_var=True) def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/transform/LN_append_transform.py b/blender/arm/logicnode/transform/LN_append_transform.py index a0def018..81a087c0 100644 --- a/blender/arm/logicnode/transform/LN_append_transform.py +++ b/blender/arm/logicnode/transform/LN_append_transform.py @@ -10,6 +10,6 @@ class AppendTransformNode(ArmLogicTreeNode): super(AppendTransformNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketShader', 'Transform') + self.add_input('ArmDynamicSocket', 'Transform') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/transform/LN_get_object_location.py b/blender/arm/logicnode/transform/LN_get_object_location.py index c708ba9a..06b15234 100644 --- a/blender/arm/logicnode/transform/LN_get_object_location.py +++ b/blender/arm/logicnode/transform/LN_get_object_location.py @@ -11,4 +11,4 @@ class GetLocationNode(ArmLogicTreeNode): super(GetLocationNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketVector', 'Location') + 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 ab14b0d0..821a47d8 100644 --- a/blender/arm/logicnode/transform/LN_get_object_rotation.py +++ b/blender/arm/logicnode/transform/LN_get_object_rotation.py @@ -11,9 +11,9 @@ class GetRotationNode(ArmLogicTreeNode): super(GetRotationNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketVector', 'Euler Angles') - self.add_output('NodeSocketVector', 'Vector') - self.add_output('NodeSocketFloat', 'Angle (Radians)') - self.add_output('NodeSocketFloat', 'Angle (Degrees)') - self.add_output('NodeSocketVector', 'Quaternion XYZ') - self.add_output('NodeSocketFloat', 'Quaternion W') + self.add_output('ArmVectorSocket', 'Euler Angles') + self.add_output('ArmVectorSocket', 'Vector') + self.add_output('ArmFloatSocket', 'Angle (Radians)') + self.add_output('ArmFloatSocket', 'Angle (Degrees)') + self.add_output('ArmVectorSocket', 'Quaternion XYZ') + self.add_output('ArmFloatSocket', 'Quaternion W') diff --git a/blender/arm/logicnode/transform/LN_get_object_scale.py b/blender/arm/logicnode/transform/LN_get_object_scale.py index 60f21e65..f6f1ff56 100644 --- a/blender/arm/logicnode/transform/LN_get_object_scale.py +++ b/blender/arm/logicnode/transform/LN_get_object_scale.py @@ -11,4 +11,4 @@ class GetScaleNode(ArmLogicTreeNode): super(GetScaleNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketVector', 'Scale') + 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 1477d899..a10163ae 100644 --- a/blender/arm/logicnode/transform/LN_get_object_transform.py +++ b/blender/arm/logicnode/transform/LN_get_object_transform.py @@ -12,4 +12,4 @@ class GetTransformNode(ArmLogicTreeNode): super(GetTransformNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketShader', 'Transform') + 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 7efce5b3..28c074c6 100644 --- a/blender/arm/logicnode/transform/LN_get_world_orientation.py +++ b/blender/arm/logicnode/transform/LN_get_world_orientation.py @@ -18,7 +18,7 @@ class GetWorldNode(ArmLogicTreeNode): super(GetWorldNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_output('NodeSocketVector', 'Vector') + self.add_output('ArmVectorSocket', 'Vector') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/transform/LN_look_at.py b/blender/arm/logicnode/transform/LN_look_at.py index 0d276883..a38b20f2 100644 --- a/blender/arm/logicnode/transform/LN_look_at.py +++ b/blender/arm/logicnode/transform/LN_look_at.py @@ -19,10 +19,10 @@ class LookAtNode(ArmLogicTreeNode): def init(self, context): super(LookAtNode, self).init(context) - self.add_input('NodeSocketVector', 'From Location') - self.add_input('NodeSocketVector', 'To Location') + self.add_input('ArmVectorSocket', 'From Location') + self.add_input('ArmVectorSocket', 'To Location') - self.add_output('NodeSocketVector', 'Rotation') + self.add_output('ArmVectorSocket', 'Rotation') def draw_buttons(self, context, layout): layout.prop(self, 'property0') diff --git a/blender/arm/logicnode/transform/LN_rotate_object.py b/blender/arm/logicnode/transform/LN_rotate_object.py index 66cc6498..773c245f 100644 --- a/blender/arm/logicnode/transform/LN_rotate_object.py +++ b/blender/arm/logicnode/transform/LN_rotate_object.py @@ -11,8 +11,8 @@ class RotateObjectNode(ArmLogicTreeNode): super().init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketVector', 'Euler Angles') - self.add_input('NodeSocketFloat', 'Angle / W') + self.add_input('ArmVectorSocket', 'Euler Angles') + self.add_input('ArmFloatSocket', 'Angle / W') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/transform/LN_separate_transform.py b/blender/arm/logicnode/transform/LN_separate_transform.py index 5c834992..28762a17 100644 --- a/blender/arm/logicnode/transform/LN_separate_transform.py +++ b/blender/arm/logicnode/transform/LN_separate_transform.py @@ -8,8 +8,8 @@ class SeparateTransformNode(ArmLogicTreeNode): def init(self, context): super(SeparateTransformNode, self).init(context) - self.add_input('NodeSocketShader', 'Transform') + self.add_input('ArmDynamicSocket', 'Transform') - self.add_output('NodeSocketVector', 'Location') - self.add_output('NodeSocketVector', 'Rotation') - self.add_output('NodeSocketVector', 'Scale') + self.add_output('ArmVectorSocket', 'Location') + self.add_output('ArmVectorSocket', 'Rotation') + self.add_output('ArmVectorSocket', 'Scale') diff --git a/blender/arm/logicnode/transform/LN_set_object_location.py b/blender/arm/logicnode/transform/LN_set_object_location.py index 48afdffb..36a665b5 100644 --- a/blender/arm/logicnode/transform/LN_set_object_location.py +++ b/blender/arm/logicnode/transform/LN_set_object_location.py @@ -11,6 +11,6 @@ class SetLocationNode(ArmLogicTreeNode): super(SetLocationNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketVector', 'Location') + self.add_input('ArmVectorSocket', 'Location') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/transform/LN_set_object_rotation.py b/blender/arm/logicnode/transform/LN_set_object_rotation.py index b9c38a45..ac563ff5 100644 --- a/blender/arm/logicnode/transform/LN_set_object_rotation.py +++ b/blender/arm/logicnode/transform/LN_set_object_rotation.py @@ -11,8 +11,8 @@ class SetRotationNode(ArmLogicTreeNode): super(SetRotationNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketVector', 'Euler Angles / Vector XYZ') - self.add_input('NodeSocketFloat', 'Angle / W') + self.add_input('ArmVectorSocket', 'Euler Angles / Vector XYZ') + self.add_input('ArmFloatSocket', 'Angle / W') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/transform/LN_set_object_scale.py b/blender/arm/logicnode/transform/LN_set_object_scale.py index e9580801..d797cba3 100644 --- a/blender/arm/logicnode/transform/LN_set_object_scale.py +++ b/blender/arm/logicnode/transform/LN_set_object_scale.py @@ -11,6 +11,6 @@ class SetScaleNode(ArmLogicTreeNode): super(SetScaleNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketVector', 'Scale', default_value=[1.0, 1.0, 1.0]) + self.add_input('ArmVectorSocket', 'Scale', default_value=[1.0, 1.0, 1.0]) self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/transform/LN_set_object_transform.py b/blender/arm/logicnode/transform/LN_set_object_transform.py index 8d965d3e..99b08ac7 100644 --- a/blender/arm/logicnode/transform/LN_set_object_transform.py +++ b/blender/arm/logicnode/transform/LN_set_object_transform.py @@ -10,6 +10,6 @@ class SetTransformNode(ArmLogicTreeNode): super(SetTransformNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketShader', 'Transform') + self.add_input('ArmDynamicSocket', 'Transform') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/transform/LN_transform.py b/blender/arm/logicnode/transform/LN_transform.py index 002502a8..95c1fea4 100644 --- a/blender/arm/logicnode/transform/LN_transform.py +++ b/blender/arm/logicnode/transform/LN_transform.py @@ -8,8 +8,8 @@ class TransformNode(ArmLogicTreeNode): def init(self, context): super(TransformNode, self).init(context) - self.add_input('NodeSocketVector', 'Location') - self.add_input('NodeSocketVector', 'Rotation') - self.add_input('NodeSocketVector', 'Scale', default_value=[1.0, 1.0, 1.0]) + self.add_input('ArmVectorSocket', 'Location') + self.add_input('ArmVectorSocket', 'Rotation') + self.add_input('ArmVectorSocket', 'Scale', default_value=[1.0, 1.0, 1.0]) - self.add_output('NodeSocketShader', 'Transform') + self.add_output('ArmDynamicSocket', 'Transform') diff --git a/blender/arm/logicnode/transform/LN_transform_math.py b/blender/arm/logicnode/transform/LN_transform_math.py index 282a9439..70a7b5dc 100644 --- a/blender/arm/logicnode/transform/LN_transform_math.py +++ b/blender/arm/logicnode/transform/LN_transform_math.py @@ -8,7 +8,7 @@ class TransformMathNode(ArmLogicTreeNode): def init(self, context): super(TransformMathNode, self).init(context) - self.add_input('NodeSocketShader', 'Transform 1') - self.add_input('NodeSocketShader', 'Transform 2') + self.add_input('ArmDynamicSocket', 'Transform 1') + self.add_input('ArmDynamicSocket', 'Transform 2') - self.add_output('NodeSocketShader', 'Result') + self.add_output('ArmDynamicSocket', 'Result') diff --git a/blender/arm/logicnode/transform/LN_transform_to_vector.py b/blender/arm/logicnode/transform/LN_transform_to_vector.py index 9fbc6c3d..9b01681d 100644 --- a/blender/arm/logicnode/transform/LN_transform_to_vector.py +++ b/blender/arm/logicnode/transform/LN_transform_to_vector.py @@ -8,11 +8,11 @@ class VectorFromTransformNode(ArmLogicTreeNode): def init(self, context): super(VectorFromTransformNode, self).init(context) - self.add_input('NodeSocketShader', 'Transform') + self.add_input('ArmDynamicSocket', 'Transform') - self.add_output('NodeSocketVector', 'Vector') - self.add_output('NodeSocketVector', 'Quaternion XYZ') - self.add_output('NodeSocketFloat', 'Quaternion W') + self.add_output('ArmVectorSocket', 'Vector') + self.add_output('ArmVectorSocket', 'Quaternion XYZ') + self.add_output('ArmFloatSocket', 'Quaternion W') def on_property_update(self, context): """called by the EnumProperty, used to update the node socket labels""" diff --git a/blender/arm/logicnode/transform/LN_translate_object.py b/blender/arm/logicnode/transform/LN_translate_object.py index 048043be..9076e9ad 100644 --- a/blender/arm/logicnode/transform/LN_translate_object.py +++ b/blender/arm/logicnode/transform/LN_translate_object.py @@ -11,7 +11,7 @@ class TranslateObjectNode(ArmLogicTreeNode): super(TranslateObjectNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketVector', 'Vector') - self.add_input('NodeSocketBool', 'On Local Axis') + self.add_input('ArmVectorSocket', 'Vector') + self.add_input('ArmBoolSocket', 'On Local Axis') self.add_output('ArmNodeSocketAction', 'Out') 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 41c1af5c..35456dad 100644 --- a/blender/arm/logicnode/transform/LN_translate_on_local_axis.py +++ b/blender/arm/logicnode/transform/LN_translate_on_local_axis.py @@ -12,8 +12,8 @@ class TranslateOnLocalAxisNode(ArmLogicTreeNode): super(TranslateOnLocalAxisNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketFloat', 'Speed') - self.add_input('NodeSocketInt', 'Forward/Up/Right') - self.add_input('NodeSocketBool', 'Inverse') + self.add_input('ArmFloatSocket', 'Speed') + self.add_input('ArmIntSocket', 'Forward/Up/Right') + self.add_input('ArmBoolSocket', 'Inverse') self.add_output('ArmNodeSocketAction', 'Out') 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 e1402b6a..2b064684 100644 --- a/blender/arm/logicnode/transform/LN_vector_to_object_orientation.py +++ b/blender/arm/logicnode/transform/LN_vector_to_object_orientation.py @@ -16,6 +16,6 @@ class VectorToObjectOrientationNode(ArmLogicTreeNode): def init(self, context): super(VectorToObjectOrientationNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketVector', 'World') + self.add_input('ArmVectorSocket', 'World') - self.add_output('NodeSocketVector', 'Oriented') + self.add_output('ArmVectorSocket', 'Oriented') 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 61497f81..0895659e 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 @@ -16,6 +16,6 @@ class WorldVectorToLocalSpaceNode(ArmLogicTreeNode): def init(self, context): super(WorldVectorToLocalSpaceNode, self).init(context) self.add_input('ArmNodeSocketObject', 'Object') - self.add_input('NodeSocketVector', 'World') + self.add_input('ArmVectorSocket', 'World') - self.add_output('NodeSocketVector', 'Local') + self.add_output('ArmVectorSocket', 'Local') diff --git a/blender/arm/logicnode/variable/LN_boolean.py b/blender/arm/logicnode/variable/LN_boolean.py index 08d597d1..810cdfc9 100644 --- a/blender/arm/logicnode/variable/LN_boolean.py +++ b/blender/arm/logicnode/variable/LN_boolean.py @@ -9,6 +9,6 @@ class BooleanNode(ArmLogicTreeNode): def init(self, context): super(BooleanNode, self).init(context) - self.add_input('NodeSocketBool', 'Bool In') + self.add_input('ArmBoolSocket', 'Bool In') - self.add_output('NodeSocketBool', 'Bool Out', is_var=True) + 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 1723f052..3f7f805e 100644 --- a/blender/arm/logicnode/variable/LN_color.py +++ b/blender/arm/logicnode/variable/LN_color.py @@ -8,6 +8,6 @@ class ColorNode(ArmLogicTreeNode): def init(self, context): super(ColorNode, self).init(context) - self.add_input('NodeSocketColor', 'Color In', default_value=[1.0, 1.0, 1.0, 1.0]) + self.add_input('ArmColorSocket', 'Color In', default_value=[1.0, 1.0, 1.0, 1.0]) - self.add_output('NodeSocketColor', 'Color Out', is_var=True) + 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 495d23da..11e1e73e 100644 --- a/blender/arm/logicnode/variable/LN_dynamic.py +++ b/blender/arm/logicnode/variable/LN_dynamic.py @@ -8,4 +8,4 @@ class DynamicNode(ArmLogicTreeNode): def init(self, context): super(DynamicNode, self).init(context) - self.add_output('NodeSocketShader', 'Dynamic', is_var=True) + 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 a5c0f290..b660e53f 100644 --- a/blender/arm/logicnode/variable/LN_float.py +++ b/blender/arm/logicnode/variable/LN_float.py @@ -11,5 +11,5 @@ class FloatNode(ArmLogicTreeNode): def init(self, context): super(FloatNode, self).init(context) - self.add_input('NodeSocketFloat', 'Float In') - self.add_output('NodeSocketFloat', 'Float Out', is_var=True) + 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 f4f022f4..fb16b2d5 100644 --- a/blender/arm/logicnode/variable/LN_integer.py +++ b/blender/arm/logicnode/variable/LN_integer.py @@ -8,5 +8,5 @@ class IntegerNode(ArmLogicTreeNode): def init(self, context): super(IntegerNode, self).init(context) - self.add_input('NodeSocketInt', 'Int In') - self.add_output('NodeSocketInt', 'Int Out', is_var=True) + 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 002c2472..68ec954f 100644 --- a/blender/arm/logicnode/variable/LN_mask.py +++ b/blender/arm/logicnode/variable/LN_mask.py @@ -10,6 +10,6 @@ class MaskNode(ArmLogicTreeNode): super(MaskNode, self).init(context) for i in range(1, 21): label = 'Group {:02d}'.format(i) - self.inputs.new('NodeSocketBool', label) + self.inputs.new('ArmBoolSocket', label) - self.add_output('NodeSocketInt', 'Mask', is_var=True) + self.add_output('ArmIntSocket', 'Mask', is_var=True) diff --git a/blender/arm/logicnode/variable/LN_quaternion.py b/blender/arm/logicnode/variable/LN_quaternion.py index 8f91465d..15eb6ca2 100644 --- a/blender/arm/logicnode/variable/LN_quaternion.py +++ b/blender/arm/logicnode/variable/LN_quaternion.py @@ -9,11 +9,11 @@ class QuaternionNode(ArmLogicTreeNode): def init(self, context): super(QuaternionNode, self).init(context) - self.add_input('NodeSocketFloat', 'X') - self.add_input('NodeSocketFloat', 'Y') - self.add_input('NodeSocketFloat', 'Z') - self.add_input('NodeSocketFloat', 'W', default_value=1.0) + self.add_input('ArmFloatSocket', 'X') + self.add_input('ArmFloatSocket', 'Y') + self.add_input('ArmFloatSocket', 'Z') + self.add_input('ArmFloatSocket', 'W', default_value=1.0) - self.add_output('NodeSocketVector', 'Quaternion') - self.add_output('NodeSocketVector', 'XYZ') - self.add_output('NodeSocketFloat', 'W') + self.add_output('ArmVectorSocket', 'Quaternion') + self.add_output('ArmVectorSocket', 'XYZ') + self.add_output('ArmFloatSocket', 'W') diff --git a/blender/arm/logicnode/variable/LN_set_variable.py b/blender/arm/logicnode/variable/LN_set_variable.py index d9ed2985..ae729ee7 100644 --- a/blender/arm/logicnode/variable/LN_set_variable.py +++ b/blender/arm/logicnode/variable/LN_set_variable.py @@ -16,7 +16,7 @@ class SetVariableNode(ArmLogicTreeNode): def init(self, context): super(SetVariableNode, self).init(context) self.add_input('ArmNodeSocketAction', 'In') - self.add_input('NodeSocketShader', 'Variable', is_var=True) - self.add_input('NodeSocketShader', 'Value') + self.add_input('ArmDynamicSocket', 'Variable', is_var=True) + self.add_input('ArmDynamicSocket', 'Value') self.add_output('ArmNodeSocketAction', 'Out') diff --git a/blender/arm/logicnode/variable/LN_vector.py b/blender/arm/logicnode/variable/LN_vector.py index 630f2a9f..d93cd2c6 100644 --- a/blender/arm/logicnode/variable/LN_vector.py +++ b/blender/arm/logicnode/variable/LN_vector.py @@ -8,8 +8,8 @@ class VectorNode(ArmLogicTreeNode): def init(self, context): super(VectorNode, self).init(context) - self.add_input('NodeSocketFloat', 'X') - self.add_input('NodeSocketFloat', 'Y') - self.add_input('NodeSocketFloat', 'Z') + self.add_input('ArmFloatSocket', 'X') + self.add_input('ArmFloatSocket', 'Y') + self.add_input('ArmFloatSocket', 'Z') - self.add_output('NodeSocketVector', 'Vector', is_var=True) + self.add_output('ArmVectorSocket', 'Vector', is_var=True) diff --git a/blender/arm/node_utils.py b/blender/arm/node_utils.py index e501707f..2e601884 100755 --- a/blender/arm/node_utils.py +++ b/blender/arm/node_utils.py @@ -5,6 +5,7 @@ from bpy.types import NodeSocket, NodeInputs, NodeOutputs from nodeitems_utils import NodeItem import arm.log +import arm.logicnode.arm_sockets import arm.utils @@ -60,6 +61,30 @@ def get_socket_index(sockets: Union[NodeInputs, NodeOutputs], socket: NodeSocket return -1 +def get_socket_default(socket: NodeSocket) -> Any: + """Get the socket's default value, or `None` if it doesn't exist.""" + if isinstance(socket, arm.logicnode.arm_sockets.ArmCustomSocket): + if socket.arm_socket_type != 'NONE': + return socket.default_value_raw + + # Shader-type sockets don't have a default value + elif socket.type != 'SHADER': + return socket.default_value + + return None + + +def set_socket_default(socket: NodeSocket, value: Any): + """Set the socket's default value if it exists.""" + if isinstance(socket, arm.logicnode.arm_sockets.ArmCustomSocket): + if socket.arm_socket_type != 'NONE': + socket.default_value_raw = value + + # Shader-type sockets don't have a default value + elif socket.type != 'SHADER': + socket.default_value = value + + def get_export_tree_name(tree: bpy.types.NodeTree, do_warn=False) -> str: """Return the name of the given node tree that's used in the exported Haxe code. diff --git a/blender/arm/nodes_logic.py b/blender/arm/nodes_logic.py index 12f605fb..ff1c20ce 100755 --- a/blender/arm/nodes_logic.py +++ b/blender/arm/nodes_logic.py @@ -354,7 +354,7 @@ class ReplaceNodesOperator(bpy.types.Operator): bl_description = "Replace deprecated nodes" def execute(self, context): - arm.logicnode.replacement.replace_all() + arm.logicnode.replacement.replace_all(force_replacement=True) return {'FINISHED'} @classmethod diff --git a/blender/arm/props.py b/blender/arm/props.py index 99497c80..8c48ce9f 100755 --- a/blender/arm/props.py +++ b/blender/arm/props.py @@ -492,18 +492,25 @@ def init_properties_on_load(): def update_armory_world(): global arm_version wrd = bpy.data.worlds['Arm'] + # Outdated project - if bpy.data.filepath != '' and (wrd.arm_version != arm_version or wrd.arm_commit != arm_commit): # Call on project load only - # This allows for seamless migration from ealier versions of Armory - for rp in wrd.arm_rplist: # TODO: deprecated + file_version = tuple(map(int, wrd.arm_version.split('.'))) + sdk_version = tuple(map(int, arm_version.split('.'))) + if bpy.data.filepath != '' and (file_version < sdk_version or wrd.arm_commit != arm_commit): + # This allows for seamless migration from earlier versions of Armory + for rp in wrd.arm_rplist: # TODO: deprecated if rp.rp_gi != 'Off': rp.rp_gi = 'Off' rp.rp_voxelao = True - # Replace deprecated nodes + if file_version < (2021, 8): + # There were breaking changes in SDK 2021.08, use a special + # update routine first before regularly replacing nodes + arm.logicnode.replacement.node_compat_sdk2108() + arm.logicnode.replacement.replace_all() - print('Project updated to sdk v' + arm_version + ' (' + arm_commit + ')') + print(f'Project updated to SDK v{arm_version}({arm_commit})') wrd.arm_version = arm_version wrd.arm_commit = arm_commit arm.make.clean() diff --git a/blender/arm/utils.py b/blender/arm/utils.py index 7b3af738..2003a905 100755 --- a/blender/arm/utils.py +++ b/blender/arm/utils.py @@ -948,6 +948,10 @@ def get_link_web_server(): def compare_version_blender_arm(): return not (bpy.app.version[0] != 2 or bpy.app.version[1] != 93) +def get_file_arm_version_tuple() -> tuple[int]: + wrd = bpy.data.worlds['Arm'] + return tuple(map(int, wrd.arm_version.split('.'))) + def type_name_to_type(name: str) -> bpy.types.bpy_struct: """Return the Blender type given by its name, if registered.""" return bpy.types.bpy_struct.bl_rna_get_subclass_py(name)