From 7ef913c13bf3061299f7944f9109460905e9878d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lera=20Elvo=C3=A9?= Date: Sat, 20 Jan 2024 05:02:57 +0000 Subject: [PATCH] Split node scripts into subfolders and use subfolder names as category names (#48) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes #41 Reviewed-on: https://codeberg.org/StreamGraph/StreamGraph/pulls/48 Co-authored-by: Lera Elvoé Co-committed-by: Lera Elvoé --- classes/deck/deck_node.gd | 3 -- classes/deck/node_db.gd | 47 +++++++++++-------- .../nodes/{ => general}/array_get_index.gd | 1 - .../deck/nodes/{ => general}/bool_constant.gd | 1 - classes/deck/nodes/{ => general}/button.gd | 1 - classes/deck/nodes/{ => general}/delay.gd | 1 - .../nodes/{ => general}/dictionary_get_key.gd | 1 - .../nodes/{ => general}/expression_node.gd | 1 - .../deck/nodes/{ => general}/get_deck_var.gd | 1 - classes/deck/nodes/{ => general}/if_true.gd | 1 - classes/deck/nodes/{ => general}/is_equal.gd | 1 - classes/deck/nodes/{ => general}/print.gd | 1 - .../deck/nodes/{ => general}/process_node.gd | 1 - .../deck/nodes/{ => general}/set_deck_var.gd | 1 - .../nodes/{ => general}/string_constant.gd | 1 - .../deck/nodes/{ => general}/string_split.gd | 1 - .../nodes/{ => group}/group_input_node.gd | 0 classes/deck/nodes/{ => group}/group_node.gd | 0 .../nodes/{ => group}/group_output_node.gd | 0 classes/deck/nodes/{ => math}/vector_add.gd | 1 - .../deck/nodes/{ => math}/vector_compose.gd | 1 - .../deck/nodes/{ => math}/vector_decompose.gd | 1 - classes/deck/nodes/{ => math}/vector_dot.gd | 1 - .../deck/nodes/{ => math}/vector_multiply.gd | 1 - .../deck/nodes/{ => math}/vector_normalize.gd | 1 - .../deck/nodes/{ => math}/vector_subtract.gd | 1 - .../{ => obs}/obs_decompose_transform.gd | 1 - .../deck/nodes/{ => obs}/obs_scene_list.gd | 1 - .../deck/nodes/{ => obs}/obs_search_source.gd | 1 - .../{ => obs}/obs_set_source_transform.gd | 1 - .../deck/nodes/{ => obs}/obs_switch_scene.gd | 1 - .../nodes/{ => obs}/obs_vector_to_position.gd | 1 - .../obs_websocket_generic_request.gd | 1 - .../nodes/{ => test}/test_interleaved_node.gd | 1 - classes/deck/nodes/{ => test}/test_types.gd | 1 - .../{ => twitch}/twitch_chat_received.gd | 1 - .../nodes/{ => twitch}/twitch_send_chat.gd | 1 - script_templates/DeckNode/node_template.gd | 1 - 38 files changed, 27 insertions(+), 56 deletions(-) rename classes/deck/nodes/{ => general}/array_get_index.gd (97%) rename classes/deck/nodes/{ => general}/bool_constant.gd (95%) rename classes/deck/nodes/{ => general}/button.gd (94%) rename classes/deck/nodes/{ => general}/delay.gd (97%) rename classes/deck/nodes/{ => general}/dictionary_get_key.gd (97%) rename classes/deck/nodes/{ => general}/expression_node.gd (98%) rename classes/deck/nodes/{ => general}/get_deck_var.gd (95%) rename classes/deck/nodes/{ => general}/if_true.gd (97%) rename classes/deck/nodes/{ => general}/is_equal.gd (96%) rename classes/deck/nodes/{ => general}/print.gd (98%) rename classes/deck/nodes/{ => general}/process_node.gd (97%) rename classes/deck/nodes/{ => general}/set_deck_var.gd (98%) rename classes/deck/nodes/{ => general}/string_constant.gd (95%) rename classes/deck/nodes/{ => general}/string_split.gd (97%) rename classes/deck/nodes/{ => group}/group_input_node.gd (100%) rename classes/deck/nodes/{ => group}/group_node.gd (100%) rename classes/deck/nodes/{ => group}/group_output_node.gd (100%) rename classes/deck/nodes/{ => math}/vector_add.gd (98%) rename classes/deck/nodes/{ => math}/vector_compose.gd (97%) rename classes/deck/nodes/{ => math}/vector_decompose.gd (97%) rename classes/deck/nodes/{ => math}/vector_dot.gd (98%) rename classes/deck/nodes/{ => math}/vector_multiply.gd (98%) rename classes/deck/nodes/{ => math}/vector_normalize.gd (98%) rename classes/deck/nodes/{ => math}/vector_subtract.gd (98%) rename classes/deck/nodes/{ => obs}/obs_decompose_transform.gd (97%) rename classes/deck/nodes/{ => obs}/obs_scene_list.gd (98%) rename classes/deck/nodes/{ => obs}/obs_search_source.gd (99%) rename classes/deck/nodes/{ => obs}/obs_set_source_transform.gd (99%) rename classes/deck/nodes/{ => obs}/obs_switch_scene.gd (98%) rename classes/deck/nodes/{ => obs}/obs_vector_to_position.gd (97%) rename classes/deck/nodes/{ => obs}/obs_websocket_generic_request.gd (98%) rename classes/deck/nodes/{ => test}/test_interleaved_node.gd (95%) rename classes/deck/nodes/{ => test}/test_types.gd (98%) rename classes/deck/nodes/{ => twitch}/twitch_chat_received.gd (98%) rename classes/deck/nodes/{ => twitch}/twitch_send_chat.gd (97%) diff --git a/classes/deck/deck_node.gd b/classes/deck/deck_node.gd index 7c0b43c..dd46b26 100644 --- a/classes/deck/deck_node.gd +++ b/classes/deck/deck_node.gd @@ -31,9 +31,6 @@ var node_type: String var description: String ## A list of aliases for this node, used by search. var aliases: Array[String] -## The category of this node. Must be snake_case. This is additional data which -## a renderer can optionally show to the user. -var category: String ## Controls whether this node should appear in [SearchProvider]. var appears_in_search: bool = true diff --git a/classes/deck/node_db.gd b/classes/deck/node_db.gd index 7ca92e0..e91e9ab 100644 --- a/classes/deck/node_db.gd +++ b/classes/deck/node_db.gd @@ -28,31 +28,38 @@ func _init() -> void: #if load_node_index(): #return - var dir := DirAccess.open(BASE_NODE_PATH) + create_descriptors(BASE_NODE_PATH) + + save_node_index() + + +func create_descriptors(path: String) -> void: + var dir := DirAccess.open(path) dir.list_dir_begin() var current_file := dir.get_next() while current_file != "": - #print(current_file) - if current_file.ends_with(".gd"): - var script_path := BASE_NODE_PATH.path_join(current_file) - var node: DeckNode = load(script_path).new() as DeckNode - var aliases: String = node.aliases.reduce( - func(accum, el) -> void: - accum += el - , "") - var descriptor := NodeDescriptor.new( - script_path, - node.name, - node.node_type, - node.description, - aliases, - node.category, - node.appears_in_search, - ) - nodes[node.node_type] = descriptor + if dir.current_is_dir(): + create_descriptors(path.path_join(current_file)) + else: + if current_file.ends_with(".gd"): + var script_path := path.path_join(current_file) + var node: DeckNode = load(script_path).new() as DeckNode + var aliases: String = node.aliases.reduce( + func(accum, el) -> void: + accum += el + , "") + var descriptor := NodeDescriptor.new( + script_path, + node.name, + node.node_type, + node.description, + aliases, + path.get_slice("/", path.get_slice_count("/") - 1), + node.appears_in_search, + ) + nodes[node.node_type] = descriptor current_file = dir.get_next() - save_node_index() ## Helper Function that instances a [DeckNode] based off of it's [member DeckNode.node_type] func instance_node(type: String) -> DeckNode: diff --git a/classes/deck/nodes/array_get_index.gd b/classes/deck/nodes/general/array_get_index.gd similarity index 97% rename from classes/deck/nodes/array_get_index.gd rename to classes/deck/nodes/general/array_get_index.gd index aa65af4..c330f88 100644 --- a/classes/deck/nodes/array_get_index.gd +++ b/classes/deck/nodes/general/array_get_index.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Get Array Index" node_type = "array_get_index" description = "Returns an element from an array. 0-indexed." - category = "general" add_input_port( DeckType.Types.ARRAY, diff --git a/classes/deck/nodes/bool_constant.gd b/classes/deck/nodes/general/bool_constant.gd similarity index 95% rename from classes/deck/nodes/bool_constant.gd rename to classes/deck/nodes/general/bool_constant.gd index 52e23f5..6a95033 100644 --- a/classes/deck/nodes/bool_constant.gd +++ b/classes/deck/nodes/general/bool_constant.gd @@ -7,7 +7,6 @@ extends DeckNode func _init() -> void: name = "Bool Constant" node_type = name.to_snake_case() - category = "general" description = "A checkbox." add_output_port( diff --git a/classes/deck/nodes/button.gd b/classes/deck/nodes/general/button.gd similarity index 94% rename from classes/deck/nodes/button.gd rename to classes/deck/nodes/general/button.gd index c080070..03dbce6 100644 --- a/classes/deck/nodes/button.gd +++ b/classes/deck/nodes/general/button.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Button" node_type = "button" description = "A button to trigger certain nodes that have a trigger input." - category = "general" add_output_port( DeckType.Types.BOOL, diff --git a/classes/deck/nodes/delay.gd b/classes/deck/nodes/general/delay.gd similarity index 97% rename from classes/deck/nodes/delay.gd rename to classes/deck/nodes/general/delay.gd index de4dbe1..faacb00 100644 --- a/classes/deck/nodes/delay.gd +++ b/classes/deck/nodes/general/delay.gd @@ -9,7 +9,6 @@ func _init(): name = "Delay" node_type = name.to_snake_case() description = "A node that passes through its' input after the set time." - category = "general" add_output_port(DeckType.Types.ANY, "Value") diff --git a/classes/deck/nodes/dictionary_get_key.gd b/classes/deck/nodes/general/dictionary_get_key.gd similarity index 97% rename from classes/deck/nodes/dictionary_get_key.gd rename to classes/deck/nodes/general/dictionary_get_key.gd index 92070dd..0f73304 100644 --- a/classes/deck/nodes/dictionary_get_key.gd +++ b/classes/deck/nodes/general/dictionary_get_key.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Get Dictionary Key" node_type = "dictionary_get_key" description = "Returns the value of a key from a dictionary input, if it exists, or null otherwise." - category = "general" add_input_port( DeckType.Types.DICTIONARY, diff --git a/classes/deck/nodes/expression_node.gd b/classes/deck/nodes/general/expression_node.gd similarity index 98% rename from classes/deck/nodes/expression_node.gd rename to classes/deck/nodes/general/expression_node.gd index 1c7298b..0f3eada 100644 --- a/classes/deck/nodes/expression_node.gd +++ b/classes/deck/nodes/general/expression_node.gd @@ -9,7 +9,6 @@ func _init(): name = "Expression" node_type = name.to_snake_case() description = "A node returning the result of a mathematical expression." - category = "general" props_to_serialize = [] diff --git a/classes/deck/nodes/get_deck_var.gd b/classes/deck/nodes/general/get_deck_var.gd similarity index 95% rename from classes/deck/nodes/get_deck_var.gd rename to classes/deck/nodes/general/get_deck_var.gd index 168be2d..40419c6 100644 --- a/classes/deck/nodes/get_deck_var.gd +++ b/classes/deck/nodes/general/get_deck_var.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Get Deck Var" node_type = name.to_snake_case() description = "Retrieve a deck variable." - category = "general" add_output_port( DeckType.Types.ANY, diff --git a/classes/deck/nodes/if_true.gd b/classes/deck/nodes/general/if_true.gd similarity index 97% rename from classes/deck/nodes/if_true.gd rename to classes/deck/nodes/general/if_true.gd index 3348710..3ab91ba 100644 --- a/classes/deck/nodes/if_true.gd +++ b/classes/deck/nodes/general/if_true.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Pass If True" node_type = "if_true" description = "Pass input if and only if the condition input is true." - category = "general" add_input_port( DeckType.Types.BOOL, diff --git a/classes/deck/nodes/is_equal.gd b/classes/deck/nodes/general/is_equal.gd similarity index 96% rename from classes/deck/nodes/is_equal.gd rename to classes/deck/nodes/general/is_equal.gd index a1067ca..61ce909 100644 --- a/classes/deck/nodes/is_equal.gd +++ b/classes/deck/nodes/general/is_equal.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Compare Values" node_type = "is_equal" description = "Returns true if the values are equal, false otherwise." - category = "general" add_input_port( DeckType.Types.ANY, diff --git a/classes/deck/nodes/print.gd b/classes/deck/nodes/general/print.gd similarity index 98% rename from classes/deck/nodes/print.gd rename to classes/deck/nodes/general/print.gd index eacfea4..aad9b61 100644 --- a/classes/deck/nodes/print.gd +++ b/classes/deck/nodes/general/print.gd @@ -12,7 +12,6 @@ func _init() -> void: description = "Print a value to the console." props_to_serialize = [&"times_activated"] - category = "general" add_input_port( DeckType.Types.ANY, diff --git a/classes/deck/nodes/process_node.gd b/classes/deck/nodes/general/process_node.gd similarity index 97% rename from classes/deck/nodes/process_node.gd rename to classes/deck/nodes/general/process_node.gd index 3258be5..8ed01b5 100644 --- a/classes/deck/nodes/process_node.gd +++ b/classes/deck/nodes/general/process_node.gd @@ -10,7 +10,6 @@ func _init() -> void: name = "Process Loop" node_type = name.to_snake_case() description = "Sends a trigger output every frame, and returns the delta value (time since last frame in seconds)." - category = "general" add_input_port( DeckType.Types.BOOL, diff --git a/classes/deck/nodes/set_deck_var.gd b/classes/deck/nodes/general/set_deck_var.gd similarity index 98% rename from classes/deck/nodes/set_deck_var.gd rename to classes/deck/nodes/general/set_deck_var.gd index 3bd5812..cc9e7d9 100644 --- a/classes/deck/nodes/set_deck_var.gd +++ b/classes/deck/nodes/general/set_deck_var.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Set Deck Var" node_type = name.to_snake_case() description = "Set a deck variable on trigger." - category = "general" add_input_port( DeckType.Types.STRING, diff --git a/classes/deck/nodes/string_constant.gd b/classes/deck/nodes/general/string_constant.gd similarity index 95% rename from classes/deck/nodes/string_constant.gd rename to classes/deck/nodes/general/string_constant.gd index 78e3a0b..95c2121 100644 --- a/classes/deck/nodes/string_constant.gd +++ b/classes/deck/nodes/general/string_constant.gd @@ -7,7 +7,6 @@ extends DeckNode func _init() -> void: node_type = "string_constant" name = "String Constant" - category = "general" description = "A String field." add_output_port( diff --git a/classes/deck/nodes/string_split.gd b/classes/deck/nodes/general/string_split.gd similarity index 97% rename from classes/deck/nodes/string_split.gd rename to classes/deck/nodes/general/string_split.gd index e4f7c63..4785b4c 100644 --- a/classes/deck/nodes/string_split.gd +++ b/classes/deck/nodes/general/string_split.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Split String" node_type = "string_split" description = "Splits a string by a delimiter." - category = "general" add_input_port( DeckType.Types.STRING, diff --git a/classes/deck/nodes/group_input_node.gd b/classes/deck/nodes/group/group_input_node.gd similarity index 100% rename from classes/deck/nodes/group_input_node.gd rename to classes/deck/nodes/group/group_input_node.gd diff --git a/classes/deck/nodes/group_node.gd b/classes/deck/nodes/group/group_node.gd similarity index 100% rename from classes/deck/nodes/group_node.gd rename to classes/deck/nodes/group/group_node.gd diff --git a/classes/deck/nodes/group_output_node.gd b/classes/deck/nodes/group/group_output_node.gd similarity index 100% rename from classes/deck/nodes/group_output_node.gd rename to classes/deck/nodes/group/group_output_node.gd diff --git a/classes/deck/nodes/vector_add.gd b/classes/deck/nodes/math/vector_add.gd similarity index 98% rename from classes/deck/nodes/vector_add.gd rename to classes/deck/nodes/math/vector_add.gd index 876424b..04f0465 100644 --- a/classes/deck/nodes/vector_add.gd +++ b/classes/deck/nodes/math/vector_add.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Add Vectors" node_type = "vector_add" description = "Adds two 2D vectors." - category = "math" add_input_port( DeckType.Types.DICTIONARY, diff --git a/classes/deck/nodes/vector_compose.gd b/classes/deck/nodes/math/vector_compose.gd similarity index 97% rename from classes/deck/nodes/vector_compose.gd rename to classes/deck/nodes/math/vector_compose.gd index c9efd3c..fd8292f 100644 --- a/classes/deck/nodes/vector_compose.gd +++ b/classes/deck/nodes/math/vector_compose.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Compose Vector" node_type = "vector_compose" description = "Returns a vector from two numeric inputs." - category = "math" add_input_port( DeckType.Types.NUMERIC, diff --git a/classes/deck/nodes/vector_decompose.gd b/classes/deck/nodes/math/vector_decompose.gd similarity index 97% rename from classes/deck/nodes/vector_decompose.gd rename to classes/deck/nodes/math/vector_decompose.gd index 0b68607..fe45c82 100644 --- a/classes/deck/nodes/vector_decompose.gd +++ b/classes/deck/nodes/math/vector_decompose.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Decompose Vector" node_type = "vector_decompose" description = "Returns the X and Y components of a vector." - category = "math" add_input_port( DeckType.Types.DICTIONARY, diff --git a/classes/deck/nodes/vector_dot.gd b/classes/deck/nodes/math/vector_dot.gd similarity index 98% rename from classes/deck/nodes/vector_dot.gd rename to classes/deck/nodes/math/vector_dot.gd index 26d98ca..df72f15 100644 --- a/classes/deck/nodes/vector_dot.gd +++ b/classes/deck/nodes/math/vector_dot.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Vector Dot Product" node_type = "vector_dot" description = "Returns the dot product of two vectors." - category = "math" add_input_port( DeckType.Types.DICTIONARY, diff --git a/classes/deck/nodes/vector_multiply.gd b/classes/deck/nodes/math/vector_multiply.gd similarity index 98% rename from classes/deck/nodes/vector_multiply.gd rename to classes/deck/nodes/math/vector_multiply.gd index 75d4d35..8c2ce46 100644 --- a/classes/deck/nodes/vector_multiply.gd +++ b/classes/deck/nodes/math/vector_multiply.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Multiply Vector by Scalar" node_type = "vector_multiply" description = "Multiplies a vector by a numeric value." - category = "math" add_input_port( DeckType.Types.DICTIONARY, diff --git a/classes/deck/nodes/vector_normalize.gd b/classes/deck/nodes/math/vector_normalize.gd similarity index 98% rename from classes/deck/nodes/vector_normalize.gd rename to classes/deck/nodes/math/vector_normalize.gd index 16380fa..a683e53 100644 --- a/classes/deck/nodes/vector_normalize.gd +++ b/classes/deck/nodes/math/vector_normalize.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Normalize Vector" node_type = "vector_normalize" description = "Normalizes a vector so its' length (magnitude) is exactly 1." - category = "math" add_input_port( DeckType.Types.DICTIONARY, diff --git a/classes/deck/nodes/vector_subtract.gd b/classes/deck/nodes/math/vector_subtract.gd similarity index 98% rename from classes/deck/nodes/vector_subtract.gd rename to classes/deck/nodes/math/vector_subtract.gd index d11dc51..8432839 100644 --- a/classes/deck/nodes/vector_subtract.gd +++ b/classes/deck/nodes/math/vector_subtract.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Subtract Vectors" node_type = "vector_subtract" description = "Subtracts each component of the given vectors." - category = "math" add_input_port( DeckType.Types.DICTIONARY, diff --git a/classes/deck/nodes/obs_decompose_transform.gd b/classes/deck/nodes/obs/obs_decompose_transform.gd similarity index 97% rename from classes/deck/nodes/obs_decompose_transform.gd rename to classes/deck/nodes/obs/obs_decompose_transform.gd index f74ed7d..af159c4 100644 --- a/classes/deck/nodes/obs_decompose_transform.gd +++ b/classes/deck/nodes/obs/obs_decompose_transform.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Decompose OBS Transform" node_type = "obs_decompose_transform" description = "Splits an OBS transform from one object into multiple outputs." - category = "obs" add_input_port( DeckType.Types.DICTIONARY, diff --git a/classes/deck/nodes/obs_scene_list.gd b/classes/deck/nodes/obs/obs_scene_list.gd similarity index 98% rename from classes/deck/nodes/obs_scene_list.gd rename to classes/deck/nodes/obs/obs_scene_list.gd index 5ac822e..5cb873a 100644 --- a/classes/deck/nodes/obs_scene_list.gd +++ b/classes/deck/nodes/obs/obs_scene_list.gd @@ -10,7 +10,6 @@ func _init() -> void: name = "Scene Selector" node_type = "obs_scene_list" description = "" - category = "obs" props_to_serialize = [] diff --git a/classes/deck/nodes/obs_search_source.gd b/classes/deck/nodes/obs/obs_search_source.gd similarity index 99% rename from classes/deck/nodes/obs_search_source.gd rename to classes/deck/nodes/obs/obs_search_source.gd index 1c50cc2..f65ae00 100644 --- a/classes/deck/nodes/obs_search_source.gd +++ b/classes/deck/nodes/obs/obs_search_source.gd @@ -14,7 +14,6 @@ func _init() -> void: name = "Get Source ID" node_type = "obs_search_source" description = "Searches for an OBS source in a scene and returns its output." - category = "obs" add_input_port( DeckType.Types.STRING, diff --git a/classes/deck/nodes/obs_set_source_transform.gd b/classes/deck/nodes/obs/obs_set_source_transform.gd similarity index 99% rename from classes/deck/nodes/obs_set_source_transform.gd rename to classes/deck/nodes/obs/obs_set_source_transform.gd index 525d71f..7bb6cc9 100644 --- a/classes/deck/nodes/obs_set_source_transform.gd +++ b/classes/deck/nodes/obs/obs_set_source_transform.gd @@ -19,7 +19,6 @@ func _init() -> void: name = "Set Source Transform" node_type = "obs_set_source_transform" description = "Sets an OBS source's transform, which includes position and rotation, among other things." - category = "obs" props_to_serialize = [] diff --git a/classes/deck/nodes/obs_switch_scene.gd b/classes/deck/nodes/obs/obs_switch_scene.gd similarity index 98% rename from classes/deck/nodes/obs_switch_scene.gd rename to classes/deck/nodes/obs/obs_switch_scene.gd index ef63caa..ce635b1 100644 --- a/classes/deck/nodes/obs_switch_scene.gd +++ b/classes/deck/nodes/obs/obs_switch_scene.gd @@ -9,7 +9,6 @@ func _init() -> void: name = "Set Scene" node_type = "obs_set_scene" description = "Sets the current scene in OBS." - category = "obs" props_to_serialize = [] diff --git a/classes/deck/nodes/obs_vector_to_position.gd b/classes/deck/nodes/obs/obs_vector_to_position.gd similarity index 97% rename from classes/deck/nodes/obs_vector_to_position.gd rename to classes/deck/nodes/obs/obs_vector_to_position.gd index e6512bf..c29b7fa 100644 --- a/classes/deck/nodes/obs_vector_to_position.gd +++ b/classes/deck/nodes/obs/obs_vector_to_position.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Vector to OBS Position" node_type = "obs_vector_to_position" description = "Transforms a Vector into a position vector accepted by OBS transform inputs." - category = "obs" add_input_port( DeckType.Types.DICTIONARY, diff --git a/classes/deck/nodes/obs_websocket_generic_request.gd b/classes/deck/nodes/obs/obs_websocket_generic_request.gd similarity index 98% rename from classes/deck/nodes/obs_websocket_generic_request.gd rename to classes/deck/nodes/obs/obs_websocket_generic_request.gd index 95c5b74..9a0653d 100644 --- a/classes/deck/nodes/obs_websocket_generic_request.gd +++ b/classes/deck/nodes/obs/obs_websocket_generic_request.gd @@ -10,7 +10,6 @@ func _init() -> void: name = "OBS WS Generic Request" node_type = "obs_generic_request" description = "Makes an OBS request and sends its result through. Use if if you really know what you're doing." - category = "obs" props_to_serialize = [] diff --git a/classes/deck/nodes/test_interleaved_node.gd b/classes/deck/nodes/test/test_interleaved_node.gd similarity index 95% rename from classes/deck/nodes/test_interleaved_node.gd rename to classes/deck/nodes/test/test_interleaved_node.gd index dab7d0b..cc6be16 100644 --- a/classes/deck/nodes/test_interleaved_node.gd +++ b/classes/deck/nodes/test/test_interleaved_node.gd @@ -7,7 +7,6 @@ extends DeckNode func _init() -> void: node_type = "test_interleaved" name = "Test Interleaved" - category = "test" for i in 4: add_output_port( diff --git a/classes/deck/nodes/test_types.gd b/classes/deck/nodes/test/test_types.gd similarity index 98% rename from classes/deck/nodes/test_types.gd rename to classes/deck/nodes/test/test_types.gd index ca1883e..af1faf7 100644 --- a/classes/deck/nodes/test_types.gd +++ b/classes/deck/nodes/test/test_types.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "Types Test" node_type = name.to_snake_case() description = "" - category = "test" props_to_serialize = [] diff --git a/classes/deck/nodes/twitch_chat_received.gd b/classes/deck/nodes/twitch/twitch_chat_received.gd similarity index 98% rename from classes/deck/nodes/twitch_chat_received.gd rename to classes/deck/nodes/twitch/twitch_chat_received.gd index d3aa1be..cc38e6b 100644 --- a/classes/deck/nodes/twitch_chat_received.gd +++ b/classes/deck/nodes/twitch/twitch_chat_received.gd @@ -13,7 +13,6 @@ func _init(): name = "Twitch Chat Received" node_type = "twitch_chat_received" description = "Receives Twitch chat events from a Twitch connection." - category = "twitch" add_output_port(DeckType.Types.STRING, "Username") add_output_port(DeckType.Types.STRING, "Message") diff --git a/classes/deck/nodes/twitch_send_chat.gd b/classes/deck/nodes/twitch/twitch_send_chat.gd similarity index 97% rename from classes/deck/nodes/twitch_send_chat.gd rename to classes/deck/nodes/twitch/twitch_send_chat.gd index f621b4d..a3ed598 100644 --- a/classes/deck/nodes/twitch_send_chat.gd +++ b/classes/deck/nodes/twitch/twitch_send_chat.gd @@ -8,7 +8,6 @@ func _init(): name = "Twitch Send Chat" node_type = "twitch_send_chat" description = "Sends a message to a Twitch chat." - category = "twitch" add_input_port( DeckType.Types.STRING, diff --git a/script_templates/DeckNode/node_template.gd b/script_templates/DeckNode/node_template.gd index 27840d7..6f9f72c 100644 --- a/script_templates/DeckNode/node_template.gd +++ b/script_templates/DeckNode/node_template.gd @@ -8,7 +8,6 @@ func _init() -> void: name = "" node_type = name.to_snake_case() description = "" - category = "" props_to_serialize = []