Rework GaeaNodes to be configured from their script instead of .tres files (#344)

* Add new virtual methods

* Separate old nodes

* Start of moving SimplexSmooth to new sstem

* it's working but i'ts not working

* Output node working

* Fix description

* Add enums

* Remove invalid connections

* Fix loading connections

* More stuff is working!!

* Add Noise2D and Noise3D

* Add variable nodes

* Add class descriptions to variable nodes

* Fix some of the reviewed stuff

* Change `data` to `arguments` in `GaeaNodeResource`

* Add enum overrides

* Fix some calls and make tooltips change

* Fix all editors

* Add ability to merge outputs with arguments

* Rename Variable to Parameter

* Replace naming of params/parameters to arguments where appropiate

* Change descriptions of parameter nodes

* Vector nodes

* Fix argument select

* Fix bitmask editor

* Add most data nodes back

* Smooshed vector argument editor together

* Update from_variant_type method

* Add SetOp nodes

* Update set_operation.gd

* Fix some stuff with vector nodes

* Fix ComposeVector and remove old set op nodes

* Move FloorWalker to new system

* Add `Data/Generation` nodes

* Re-add hints to arguments

* Add `GaeaNodeVectorBase`

* Change how to override the slot idx for outputs

* Fix typo

* Add Input node

* Allow adding icons to enums

* Remove old nodes that have been replaced

* Make the old_roots folder red as a reminder that it should be deleted

* Add constant nodes

* Remove all constant `.tres` files

* Delete random_filter.tres

* Add mappers

* Add RulesPlacer

* Add RandomScatter

* Add FloatOp and IntOp

Co-Authored-By: Zehir <845225+Zehir@users.noreply.github.com>

* Update reroute node (#4)

* Update reroute node

* Cleanup

* Fix reroute node

* Organize scripts outside of `root/`

* Rename `graph/nodes` to `graph/graph_nodes` for clarity

* Add DataOp node

* Add DatasOp

* Remove old operation nodes

* Add descriptions to all operation nodes

* Add doc comment to NumOp and DatasOp

* Add ComposeRange

* Move output and reroute into `special/`

* Add script templates

* Add vector operation node (#11)

* Add vector operation node

* Add requested changes

* Remove old scripts and rename a folder

* Add migration from beta 3 (#10)

* Add migration

* Moved migration to an other file

* Update migration for Vector operation node

* Update migration for compose range

* Migrate FloorWalker demo

* Add warning when migrating

* Clean up

* Clean-up vector nodes

* Cleanup resources (#12)

---------

Co-authored-by: Zehir <zehir@zorim.fr>
Co-authored-by: Zehir <845225+Zehir@users.noreply.github.com>

Author: BenjaTK

addons/gaea/assets/parameter_editor.svg addons/gaea/assets/argument_editor.svgaddons/gaea/assets/parameter_editor.svg renamed to addons/gaea/assets/argument_editor.svg

@@ -3,16 +3,16 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://dox5e4tnafwet"
-path="res://.godot/imported/parameter_editor.svg-8a5814218dcd6dff896188e64ebe9abb.ctex"
+path="res://.godot/imported/argument_editor.svg-133fa3c24b8951fdee65446f91ec95b9.ctex"
 metadata={
 "has_editor_variant": true,
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://addons/gaea/assets/parameter_editor.svg"
-dest_files=["res://.godot/imported/parameter_editor.svg-8a5814218dcd6dff896188e64ebe9abb.ctex"]
+source_file="res://addons/gaea/assets/argument_editor.svg"
+dest_files=["res://.godot/imported/argument_editor.svg-133fa3c24b8951fdee65446f91ec95b9.ctex"]
 
 [params]
 

…/gaea/assets/parameter_editor.svg.import …s/gaea/assets/argument_editor.svg.importaddons/gaea/assets/parameter_editor.svg.import renamed to addons/gaea/assets/argument_editor.svg.import addons/gaea/assets/parameter_editor.svg.import renamed to addons/gaea/assets/argument_editor.svg.import

@@ -5,7 +5,7 @@ extends Tree
 signal node_selected_for_creation(resource: GaeaNodeResource)
 signal special_node_selected_for_creation(id: StringName)
 
-const NODES_FOLDER_PATH: String = "res://addons/gaea/graph/nodes/root/"
+const NODES_FOLDER_PATH: String = "res://addons/gaea/graph/graph_nodes/root/"
 
 @export var description_label: RichTextLabel
 var tree_dictionary: Dictionary
@@ -53,7 +53,7 @@ func _populate_from_dictionary(dictionary: Dictionary, parent_item: TreeItem) ->
 			var value: Variant = dictionary.get(key)
 			tree_item.set_metadata(0, value)
 			if value is GaeaNodeResource:
-				tree_item.set_text(0, value.title)
+				tree_item.set_text(0, value.get_tree_name())
 				tree_item.set_icon(0, GaeaValue.get_display_icon(value.get_type()))
 				tree_item.set_icon_max_width(0, 16)
 
@@ -67,24 +67,32 @@ func _populate_dict_with_files(folder_path: String, dict: Dictionary) -> Diction
 
 	dir.list_dir_begin()
 	var file_name := dir.get_next()
+	var idx: int = 0
 	while file_name != "":
-		if not dir.current_is_dir() and not file_name.ends_with(".tres"):
+		if not dir.current_is_dir() and not file_name.ends_with(".gd"):
 			file_name = dir.get_next()
 			continue
 
+		idx += 1
+
 		var tree_name: String = file_name.get_basename().capitalize()
 
 		var file_path = folder_path + file_name
 		if dir.current_is_dir():
 			_populate_dict_with_files(file_path + "/", dict.get_or_add(tree_name, {}))
 
-		if file_name.ends_with(".tres"):
-			var resource: Resource = load(file_path)
+
+		if file_name.ends_with(".gd"):
+			var resource: GaeaNodeResource = load(file_path).new()
 			if resource is GaeaNodeResource:
-				tree_name = resource.title
-				dict.get_or_add(file_name, resource)
+				if resource.is_available():
+					var sub_idx: int = 0
+					for item in resource.get_tree_items():
+						sub_idx += 1
+						dict.get_or_add(item.get_tree_name() + str(idx) + str(sub_idx), item)
 		file_name = dir.get_next()
 
+	dict.sort()
 	return dict
 
 
@@ -105,7 +113,7 @@ func _on_create_button_pressed() -> void:
 func _on_item_selected() -> void:
 	var item: TreeItem = get_selected()
 	if item.get_metadata(0) is GaeaNodeResource:
-		description_label.set_text(GaeaNodeResource.get_formatted_text(item.get_metadata(0).description))
+		description_label.set_text(GaeaNodeResource.get_formatted_text(item.get_metadata(0).get_description()))
 	elif item.get_metadata(0) is StringName:
 		match item.get_metadata(0):
 			&"frame": description_label.set_text("A rectangular area for better organziation.")

addons/gaea/editor/create_node_tree.gd

@@ -15,7 +15,9 @@ const CONFIGURABLE_SLOT_COLORS := {
 	GaeaValue.Type.INT: "int",
 	GaeaValue.Type.FLOAT: "float",
 	GaeaValue.Type.VECTOR2: "vector_2",
+	GaeaValue.Type.VECTOR2I: "vector_2i",
 	GaeaValue.Type.VECTOR3: "vector_3",
+	GaeaValue.Type.VECTOR3I: "vector_3i",
 	GaeaValue.Type.RANGE: "range",
 	GaeaValue.Type.MATERIAL: "material",
 	GaeaValue.Type.GRADIENT: "gradient",

addons/gaea/editor/editor_settings.gd

@@ -26,7 +26,7 @@ func delete_nodes(nodes: Array[StringName]) -> void:
 	for node_name in nodes:
 		var node: GraphElement = get_node(NodePath(node_name))
 		if node is GaeaGraphNode:
-			if node.resource.is_output():
+			if node.resource is GaeaNodeOutput:
 				continue
 			for connection in node.connections:
 				disconnect_node(connection.from_node, connection.from_port, connection.to_node, connection.to_port)
@@ -38,7 +38,7 @@ func delete_nodes(nodes: Array[StringName]) -> void:
 		await node.tree_exited
 
 	connection_update_requested.emit()
-	save_requested.emit()
+	save_requested.emit.call_deferred()
 
 
 func _on_connection_request(from_node: StringName, from_port: int, to_node: StringName, to_port: int) -> void:
@@ -69,24 +69,31 @@ func _on_connection_request(from_node: StringName, from_port: int, to_node: Stri
 	connect_node(from_node, from_port, to_node, to_port)
 	connection_update_requested.emit()
 
-	get_node(NodePath(from_node)).notify_connections_updated.call_deferred()
-	target_node.notify_connections_updated.call_deferred()
+	if get_node(NodePath(from_node)).has_finished_loading():
+		get_node(NodePath(from_node)).notify_connections_updated.call_deferred()
+
+	if target_node.has_finished_loading():
+		target_node.notify_connections_updated.call_deferred()
 
 	save_requested.emit()
 
+
 func _on_disconnection_request(from_node: StringName, from_port: int, to_node: StringName, to_port: int) -> void:
 	disconnect_node(from_node, from_port, to_node, to_port)
 	connection_update_requested.emit()
 
-	get_node(NodePath(from_node)).notify_connections_updated.call_deferred()
-	get_node(NodePath(to_node)).notify_connections_updated.call_deferred()
+	if get_node(NodePath(from_node)).has_finished_loading():
+		get_node(NodePath(from_node)).notify_connections_updated.call_deferred()
+	if get_node(NodePath(to_node)).has_finished_loading():
+		get_node(NodePath(to_node)).notify_connections_updated.call_deferred()
 
 	save_requested.emit()
 
 func remove_invalid_connections() -> void:
 	for connection in get_connection_list():
-		var to_node: GraphNode = get_node(NodePath(connection.to_node))
-		var from_node: GraphNode = get_node(NodePath(connection.from_node))
+		var to_node: GaeaGraphNode = get_node(NodePath(connection.to_node))
+		var from_node: GaeaGraphNode = get_node(NodePath(connection.from_node))
+
 
 		if not is_instance_valid(from_node) or not is_instance_valid(to_node):
 			disconnect_node(connection.from_node, connection.from_port, connection.to_node, connection.to_port)
@@ -100,8 +107,17 @@ func remove_invalid_connections() -> void:
 			disconnect_node(connection.from_node, connection.from_port, connection.to_node, connection.to_port)
 			continue
 
+		var from_type: GaeaValue.Type = from_node.get_output_port_type(connection.from_port)
+		var to_type: GaeaValue.Type = to_node.get_input_port_type(connection.to_port)
+		if not is_valid_connection_type(from_type, to_type) and from_type != to_type:
+			disconnect_node(connection.from_node, connection.from_port, connection.to_node, connection.to_port)
+			to_node.notify_connections_updated.call_deferred()
+			from_node.notify_connections_updated.call_deferred()
+			continue
+
 	save_requested.emit()
 
+
 func is_nodes_connected_relatively(from_node: StringName, to_node: StringName) -> bool:
 	var nodes_to_check: Array[StringName] = [from_node]
 	while nodes_to_check.size() > 0:

addons/gaea/editor/graph_edit.gd

@@ -48,7 +48,7 @@ func populate(selected: Array) -> void:
 	if selected.front() is GaeaGraphNode and selected.size() == 1:
 		var node: GaeaGraphNode = selected.front()
 		var resource: GaeaNodeResource = node.resource
-		if resource is GaeaNodeVariable:
+		if resource is GaeaNodeParameter:
 			var data: GaeaData = panel.get_selected_generator().data
 			var parameter: Dictionary = data.parameters.get(node.get_arg_value("name"), {})
 			if parameter.get("value") is Resource:
@@ -125,7 +125,7 @@ func _on_id_pressed(id: int) -> void:
 		Action.OPEN_IN_INSPECTOR:
 			var node: GaeaGraphNode = graph_edit.get_selected().front()
 			var resource: GaeaNodeResource = node.resource
-			if resource is GaeaNodeVariable:
+			if resource is GaeaNodeParameter:
 				var data: GaeaData = panel.get_selected_generator().data
 				var parameter: Dictionary = data.parameters.get(node.get_arg_value("name"), {})
 				var value: Variant = parameter.get("value")

addons/gaea/editor/node_popup.gd

@@ -2,7 +2,6 @@
 extends Control
 
 const _LinkPopup = preload("uid://btt4eqjkp5pyf")
-const _RerouteNode = preload("uid://bs40iof8ipbkq")
 
 var _selected_generator: GaeaGenerator = null: get = get_selected_generator
 var _output_node: GaeaGraphNode
@@ -154,11 +153,16 @@ func _save_data() -> void:
 	var node_data: Array[Dictionary]
 	var other: Dictionary
 
+	other.set(&"save_version", GaeaData.CURRENT_SAVE_VERSION)
+
 	var children = _graph_edit.get_children()
 	children.sort_custom(func(a: Node, b: Node): return a.name.naturalcasecmp_to(b.name) < 0)
 	for child in children:
-		if child is GraphNode:
-			resource_uids.append(child.resource.resource_uid)
+		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))
@@ -172,7 +176,7 @@ func _save_data() -> void:
 
 	for resource in resources:
 		var save_data = resource.node.get_save_data()
-		resource.data = save_data.get("data", {})
+		resource.arguments = save_data.get("arguments", {})
 		node_data.append(save_data)
 
 	_selected_generator.data.connections = connections
@@ -206,17 +210,13 @@ func _load_data() -> void:
 		var saved_data = _selected_generator.data.node_data[idx]
 		var node: GaeaGraphNode = _load_node(_selected_generator.data.resources[idx], saved_data)
 
-		if node.resource.is_output():
+		if node.resource is GaeaNodeOutput:
 			has_output_node = true
 			_output_node = node
 
-	for child in _graph_edit.get_children():
-		if child is GaeaGraphNode and child.resource.is_output():
-			_output_node = child
-			has_output_node = true
 
 	if not has_output_node:
-		_output_node = _add_node_from_resource(preload("uid://bbkdvyxkj2slo"))
+		_output_node = _add_node_from_resource(GaeaNodeOutput.new())
 		_save_data.call_deferred()
 
 	# If scroll offset is saved, set it to that. Else, center the output node.
@@ -228,7 +228,14 @@ func _load_data() -> void:
 		_load_attached_elements.bind(frame_data).call_deferred()
 
 	# from_node and to_node are indexes in the resources array
-	for connection in _selected_generator.data.connections:
+	_load_connections.call_deferred(_selected_generator.data.connections)
+
+	update_connections()
+	is_loading = false
+
+
+func _load_connections(connections: Array[Dictionary]) -> void:
+	for connection in connections:
 		var from_node: GraphNode = _selected_generator.data.resources[connection.from_node].node
 		var to_node: GraphNode = _selected_generator.data.resources[connection.to_node].node
 		if not is_instance_valid(from_node) or not is_instance_valid(to_node):
@@ -237,9 +244,6 @@ func _load_data() -> void:
 			continue
 		_graph_edit.connection_request.emit(from_node.name, connection.from_port, to_node.name, connection.to_port)
 
-	update_connections()
-	is_loading = false
-
 
 func _load_frame(frame_data: Dictionary) -> void:
 	var new_frame: GraphFrame = GraphFrame.new()
@@ -314,10 +318,13 @@ func _clamp_popup_in_window(popup: Window, main_window: Window) -> void:
 
 func _add_node_from_resource(resource: GaeaNodeResource, p_is_loading: bool = false) -> GraphNode:
 	if not p_is_loading:
-		resource = resource._instantiate_duplicate()
+		resource = resource.duplicate()
 	var node: GaeaGraphNode = resource.get_scene().instantiate()
+	if resource.get_scene_script() != null:
+		node.set_script(resource.get_scene_script())
 	node.resource = resource
 	node.generator = get_selected_generator()
+	node.remove_invalid_connections_requested.connect(_graph_edit.remove_invalid_connections)
 	_graph_edit.add_child(node)
 	node.save_requested.connect(_save_data)
 	node.name = node.name.replace("@", "_")
@@ -352,15 +359,14 @@ func _on_tree_special_node_selected_for_creation(id: StringName) -> void:
 
 
 func _on_new_reroute_requested(connection: Dictionary) -> void:
-	var reroute: _RerouteNode = _add_node_from_resource(preload("uid://kdn03ei2yp6e"))
+	var reroute: GaeaGraphNode = _add_node_from_resource(GaeaNodeReroute.new())
 
 	var offset = - reroute.get_output_port_position(0)
 	offset.y -= reroute.get_slot_custom_icon_right(0).get_size().y * 0.5
 	reroute.set_position_offset(_graph_edit.local_to_grid(_node_creation_target, offset))
 
 	var from_node: GraphNode = _graph_edit.get_node(NodePath(connection.from_node))
-	var link_type := from_node.get_output_port_type(connection.from_port) as GaeaValue.Type
-	reroute.type = link_type
+	reroute.resource.type = from_node.get_output_port_type(connection.from_port) as GaeaValue.Type
 
 	_graph_edit.disconnection_request.emit.call_deferred(
 		connection.from_node, connection.from_port,
@@ -457,7 +463,7 @@ func _on_reload_parameters_list_button_pressed() -> void:
 		if node is not GaeaGraphNode:
 			continue
 
-		if node.resource is GaeaNodeVariable:
+		if node.resource is GaeaNodeParameter:
 			existing_parameters.append(node.get_arg_value("name"))
 
 

addons/gaea/editor/panel.gd

@@ -148,8 +148,8 @@ flat = true
 [node name="ReloadParametersListButton" type="Button" parent="Editor/VBoxContainer/HBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
-tooltip_text = "Reload variables list.
-(Sometimes some variables aren't deleted properly, this helps remove those)"
+tooltip_text = "Reload parameters list.
+(Sometimes some parameters aren't deleted properly, this helps remove those)"
 icon = ExtResource("3_dhpru")
 flat = true
 

addons/gaea/editor/panel.tscn

@@ -34,7 +34,7 @@ func _enter_tree() -> void:
 
 
 func _exit_tree() -> void:
-	await _panel.unpopulate()
+	_panel.unpopulate()
 	remove_inspector_plugin(_inspector_plugin)
 	remove_control_from_bottom_panel(_container)
 	_container.queue_free()