Merge branch 'fou_chien' of https://github.com/Zehir/gaea into pr/366

Author: cullumi

.gitattributes

@@ -3,7 +3,5 @@
 
 # Only include the addons folder when downloading from the Asset Library.
 /**        export-ignore
-/addons    !export-ignore
-/addons/** !export-ignore
-/addons/gdscript_formatter export-ignore
-/addons/gdscript_formatter/** export-ignore
+/addons/gaea    !export-ignore
+/addons/gaea/** !export-ignore

.github/workflows/generation_testing.yml

@@ -0,0 +1,40 @@
+name: GHA
+
+on:
+  pull_request:
+    paths-ignore:
+      - '**.yml'
+      - '**.md'
+  workflow_dispatch:
+
+
+concurrency:
+  group: ${{ github.workflow }}|${{ github.ref_name }}
+  cancel-in-progress: true
+
+
+jobs:
+  generate_test:
+    name: "Generation Testing"
+    runs-on: 'ubuntu-22.04'
+    timeout-minutes: 10 # The overall timeout
+    permissions:
+      actions: write
+      checks: write
+      contents: write
+      pull-requests: write
+      statuses: write
+
+    steps:
+      # checkout your repository
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      # run tests by using the gdUnit4-action with Godot version 4.2.1 and the latest GdUnit4 release 
+      - uses: MikeSchulze/gdUnit4-action@v1.1.6
+        with:
+          godot-version: '4.4.1'
+          paths: |
+            res://testing/generation
+          timeout: 5
+          publish-report: false

.github/workflows/nodes_testing.yml

@@ -0,0 +1,40 @@
+name: GHA
+
+on:
+  pull_request:
+    paths-ignore:
+      - '**.yml'
+      - '**.md'
+  workflow_dispatch:
+
+
+concurrency:
+  group: ${{ github.workflow }}|${{ github.ref_name }}
+  cancel-in-progress: true
+
+
+jobs:
+  warning_check:
+    name: "Node Testing"
+    runs-on: 'ubuntu-22.04'
+    timeout-minutes: 10 # The overall timeout
+    permissions:
+      actions: write
+      checks: write
+      contents: write
+      pull-requests: write
+      statuses: write
+
+    steps:
+      # checkout your repository
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      # run tests by using the gdUnit4-action with Godot version 4.2.1 and the latest GdUnit4 release 
+      - uses: MikeSchulze/gdUnit4-action@v1.1.6
+        with:
+          godot-version: '4.4.1'
+          paths: |
+            res://testing/graph_nodes
+          timeout: 5
+          publish-report: false

.gitignore

@@ -18,3 +18,5 @@ scenes/test/*
 
 # Editor-specific ignores
 .vscode/*
+
+GdUnitRunner.cfg

addons/gaea/editor/graph_edit.gd

@@ -32,7 +32,7 @@ func delete_nodes(nodes: Array[StringName]) -> void:
 			for connection in node.connections:
 				disconnect_node(connection.from_node, connection.from_port, connection.to_node, connection.to_port)
 			node.removed.emit()
-		elif node is GraphFrame:
+		elif node is GaeaGraphFrame:
 			for attached in get_attached_nodes_of_frame(node.name):
 				attached_elements.erase(attached)
 		node.queue_free()

addons/gaea/editor/node_popup.gd

@@ -34,7 +34,7 @@ func populate(selected: Array) -> void:
 		if graph_edit.attached_elements.has(node.name):
 			add_item("Detach from Parent Frame", Action.DETACH)
 			break
-	if selected.front() is GraphFrame and selected.size() == 1:
+	if selected.front() is GaeaGraphFrame and selected.size() == 1:
 		add_separator()
 		add_item("Rename Frame", Action.RENAME)
 		add_check_item("Enable Auto Shrink", Action.ENABLE_AUTO_SHRINK)
@@ -67,54 +67,25 @@ func _on_id_pressed(id: int) -> void:
 		Action.RENAME:
 			var selected: Array = graph_edit.get_selected()
 			var node: GraphElement = selected.front()
-			if node is GraphFrame:
-				var line_edit: LineEdit = LineEdit.new()
-				line_edit.text = node.title
-				line_edit.select_all()
-				line_edit.expand_to_text_length = true
-				line_edit.position = owner.get_local_mouse_position()
-				line_edit.text_submitted.connect(node.set_title)
-				line_edit.text_submitted.connect(line_edit.queue_free.unbind(1), CONNECT_DEFERRED)
-				line_edit.focus_exited.connect(line_edit.queue_free)
-				owner.add_child(line_edit)
-				line_edit.grab_click_focus()
-				line_edit.grab_focus()
+			if node is GaeaGraphFrame:
+				node.start_rename(owner)
 
 		Action.TINT:
 			var selected: Array = graph_edit.get_selected()
 			var node: GraphElement = selected.front()
-			if node is GraphFrame:
-				var _popup: PopupPanel = PopupPanel.new()
-				_popup.position = owner.get_global_mouse_position() as Vector2i
-
-				var vbox_container: VBoxContainer = VBoxContainer.new()
-
-				var color_picker: ColorPicker = ColorPicker.new()
-				color_picker.color_changed.connect(node.set_tint_color)
-				color_picker.color = node.tint_color
-
-				var ok_button: Button = Button.new()
-				ok_button.text = "OK"
-				ok_button.pressed.connect(_popup.queue_free)
-
-				vbox_container.add_child(color_picker)
-				vbox_container.add_child(ok_button)
-
-				_popup.add_child(vbox_container)
-
-				owner.add_child(_popup)
-				_popup.popup()
+			if node is GaeaGraphFrame:
+				node.start_tint_color_change(owner)
 		Action.ENABLE_TINT:
 			set_item_checked(idx, not is_item_checked(idx))
 			var selected: Array = graph_edit.get_selected()
 			var node: GraphElement = selected.front()
-			if node is GraphFrame:
+			if node is GaeaGraphFrame:
 				node.set_tint_color_enabled(is_item_checked(idx))
 		Action.ENABLE_AUTO_SHRINK:
 			set_item_checked(idx, not is_item_checked(idx))
 			var selected: Array = graph_edit.get_selected()
 			var node: GraphElement = selected.front()
-			if node is GraphFrame:
+			if node is GaeaGraphFrame:
 				node.set_autoshrink_enabled(is_item_checked(idx))
 		Action.DETACH:
 			var selected: Array = graph_edit.get_selected()

addons/gaea/editor/panel.gd

@@ -158,13 +158,12 @@ func _save_data() -> void:
 	children.sort_custom(func(a: Node, b: Node): return a.name.naturalcasecmp_to(b.name) < 0)
 	for child in children:
 		if child is GaeaGraphNode:
-
 			resource_uids.append(ResourceUID.id_to_text(
 				ResourceLoader.get_resource_uid(child.resource.get_script().get_path())
 			))
 			resources.append(child.resource)
-		elif child is GraphFrame:
-			other.get_or_add(&"frames", []).append(_get_frame_save_data(child))
+		elif child is GaeaGraphFrame:
+			other.get_or_add(&"frames", []).append(child.get_save_data())
 
 	for connection in connections:
 		var from_node: GraphNode = _graph_edit.get_node(NodePath(connection.from_node))
@@ -187,19 +186,6 @@ func _save_data() -> void:
 	EditorInterface.mark_scene_as_unsaved()
 
 
-func _get_frame_save_data(frame: GraphFrame) -> Dictionary[String, Variant]:
-	return {
-				&"title": frame.title,
-				&"tint_color": frame.tint_color,
-				&"tint_color_enabled": frame.tint_color_enabled,
-				&"position": frame.position_offset,
-				&"attached": _graph_edit.get_attached_nodes_of_frame(frame.name),
-				&"size": frame.size,
-				&"autoshrink": frame.autoshrink_enabled,
-				&"name": frame.name
-	}
-
-
 
 func _load_data() -> void:
 	is_loading = true
@@ -245,15 +231,9 @@ func _load_connections(connections: Array[Dictionary]) -> void:
 
 
 func _load_frame(frame_data: Dictionary) -> void:
-	var new_frame: GraphFrame = GraphFrame.new()
-	new_frame.title = frame_data.get(&"title", "Frame")
-	new_frame.position_offset = frame_data.get(&"position", Vector2.ZERO)
-	new_frame.size = frame_data.get(&"size", Vector2(64, 64))
-	new_frame.tint_color = frame_data.get(&"tint_color", new_frame.tint_color)
-	new_frame.tint_color_enabled = frame_data.get(&"tint_color_enabled", false)
-	new_frame.name = frame_data.get_or_add(&"name", new_frame.name)
-	new_frame.autoshrink_enabled = frame_data.get(&"autoshrink", true)
+	var new_frame: GaeaGraphFrame = GaeaGraphFrame.new()
 	_graph_edit.add_child(new_frame)
+	new_frame.load_save_data(frame_data)
 
 
 func _load_node(resource: GaeaNodeResource, saved_data: Dictionary) -> GraphNode:
@@ -347,12 +327,9 @@ func _on_tree_node_selected_for_creation(resource: GaeaNodeResource) -> void:
 func _on_tree_special_node_selected_for_creation(id: StringName) -> void:
 	match id:
 		&"frame":
-			var new_frame: GraphFrame = GraphFrame.new()
-			new_frame.size = Vector2(512, 256)
+			var new_frame: GaeaGraphFrame = GaeaGraphFrame.new()
 			new_frame.set_position_offset((_graph_edit.get_local_mouse_position() + _graph_edit.scroll_offset) / _graph_edit.zoom)
-			new_frame.title = "Frame"
 			_graph_edit.add_child(new_frame)
-			new_frame.name = new_frame.name.replace("@", "_")
 			_save_data.call_deferred()
 	_create_node_popup.hide()
 

addons/gaea/graph/graph_nodes/generic_classes/constant.gd

@@ -34,5 +34,4 @@ func _get_overridden_output_port_idx(_output_name: StringName) -> int:
 
 
 func _get_data(output_port: StringName, area: AABB, graph: GaeaGraph) -> Variant:
-	_log_data(output_port, graph)
 	return _get_arg(&"value", area, graph)

addons/gaea/graph/graph_nodes/generic_classes/number_operation.gd

@@ -129,8 +129,7 @@ func _get_output_port_display_name(_output_name: StringName) -> String:
 
 
 
-func _get_data(output_port: StringName, _area: AABB, graph: GaeaGraph) -> Variant:
-	_log_data(output_port, graph)
+func _get_data(_output_port: StringName, _area: AABB, graph: GaeaGraph) -> Variant:
 	var operation: Operation = get_enum_selection(0) as Operation
 	var args: Array
 	for arg_name: StringName in OPERATION_DEFINITIONS[operation].args:

addons/gaea/graph/graph_nodes/generic_classes/parameter.gd

@@ -68,8 +68,7 @@ func _get_output_port_type(_output_name: StringName) -> GaeaValue.Type:
 	return GaeaValue.from_variant_type(_get_variant_type(), _get_property_hint(), _get_property_hint_string())
 
 
-func _get_data(output_port: StringName, area: AABB, graph: GaeaGraph) -> Variant:
-	_log_data(output_port, graph)
+func _get_data(_output_port: StringName, area: AABB, graph: GaeaGraph) -> Variant:
 	var data = graph.parameters.get(_get_arg(&"name", area, null))
 	if data.has("value"):
 		return data.get("value")