Update to 4.6

Author: BenjaTK

addons/gaea/editor/graph_editor/graph_edit.gd

@@ -26,12 +26,6 @@ var is_loading = false
 ## Reference to the output node
 var _output_node: GaeaOutputGraphNode
 
-## Reference to the window popout separator
-var _window_popout_separator: VSeparator
-
-## Reference to the window popout button
-var _window_popout_button: Button
-
 var _back_icon: Texture2D
 var _forward_icon: Texture2D
 
@@ -195,31 +189,6 @@ func _add_toolbar_buttons() -> void:
 	about_button.pressed.connect(main_editor.about_popup_request.emit)
 	container.add_child(about_button)
 
-	_window_popout_separator = VSeparator.new()
-	container.add_child(_window_popout_separator)
-
-	_window_popout_button = Button.new()
-	_window_popout_button.theme_type_variation = &"FlatButton"
-	_window_popout_button.icon = EditorInterface.get_base_control().get_theme_icon(&"MakeFloating", &"EditorIcons")
-	_window_popout_button.pressed.connect(main_editor.panel_popout_request.emit)
-	container.add_child(_window_popout_button)
-
-	if not EditorInterface.is_multi_window_enabled():
-		_window_popout_button.disabled = true
-		_window_popout_button.tooltip_text = _get_multiwindow_support_tooltip_text()
-
-
-func _get_multiwindow_support_tooltip_text() -> String:
-	# Adapted from https://github.com/godotengine/godot/blob/a8598cd8e261716fa3addb6f10bb57c03a061be9/editor/editor_node.cpp#L4725-L4737
-	var prefix: String = "Multi-window support is not available because"
-	if EditorInterface.get_editor_settings().get_setting("interface/editor/single_window_mode"):
-		return tr(prefix + " Interface > Editor > Single Window Mode is enabled in the editor settings.")
-	if not EditorInterface.get_editor_settings().get_setting("interface/multi_window/enable"):
-		return tr(prefix + " Interface > Multi Window > Enable is disabled in the editor settings.")
-	if DisplayServer.has_feature(DisplayServer.FEATURE_SUBWINDOWS):
-		return tr(prefix + " the `--single-window` command line argument was used to start the editor.")
-	return tr(prefix + " the current platform doesn't support multiple windows.")
-
 
 func _add_node_button_pressed() -> void:
 	main_editor.popup_create_node_request.emit()
@@ -790,12 +759,6 @@ func _on_edited_script_changed(script: Script):
 #endregion
 
 #region Utils and misc
-@warning_ignore("shadowed_variable_base_class")
-func set_window_popout_button_visible(visible: bool) -> void:
-	_window_popout_button.visible = visible
-	_window_popout_separator.visible = visible
-
-
 ## This function converts a local position to a grid position based on the current zoom level and scroll offset.
 ## It also applies snapping if enabled in the GraphEdit.
 func local_to_grid(

addons/gaea/editor/graph_editor/main_editor.gd

@@ -10,8 +10,6 @@ signal popup_create_node_and_connect_node_request(node: GaeaGraphNode, type: Gae
 
 signal popup_node_context_menu_at_mouse_request(selected_nodes: Array)
 signal popup_link_context_menu_at_mouse_request(connection: Dictionary)
-@warning_ignore("unused_signal")
-signal panel_popout_request()
 
 signal node_selected_for_creation(resource: GaeaNodeResource)
 signal special_node_selected_for_creation(id: StringName)

addons/gaea/editor/panel/panel.gd

@@ -17,48 +17,3 @@ static func instantiate() -> Node:
 func _ready() -> void:
 	if is_part_of_edited_scene():
 		return
-
-	main_editor.panel_popout_request.connect(_on_panel_popout_request)
-
-
-#region Popout Panel Window
-func _on_panel_popout_request() -> void:
-	graph_edit.set_window_popout_button_visible(false)
-	var window: Window = Window.new()
-	window.min_size = get_combined_minimum_size()
-	window.size = size
-	window.title = "Gaea - Godot Engine"
-	window.close_requested.connect(_on_window_close_requested.bind(get_parent(), window))
-
-	var margin_container: MarginContainer = MarginContainer.new()
-	margin_container.set_anchors_preset(Control.PRESET_FULL_RECT)
-	var panel: Panel = Panel.new()
-	panel.add_theme_stylebox_override(
-		&"panel",
-		EditorInterface.get_base_control().get_theme_stylebox(&"PanelForeground", &"EditorStyles")
-	)
-	panel.set_anchors_preset(Control.PRESET_FULL_RECT)
-	panel.mouse_filter = Control.MOUSE_FILTER_IGNORE
-	panel.z_index -= 1
-	window.add_child(margin_container)
-	margin_container.add_sibling(panel)
-
-	var margin: int = get_theme_constant(&"base_margin", &"Editor")
-	margin_container.add_theme_constant_override(&"margin_top", margin)
-	margin_container.add_theme_constant_override(&"margin_bottom", margin)
-	margin_container.add_theme_constant_override(&"margin_left", margin)
-	margin_container.add_theme_constant_override(&"margin_right", margin)
-
-	window.position = global_position as Vector2i + DisplayServer.window_get_position()
-
-	reparent(margin_container, false)
-
-	EditorInterface.get_base_control().add_child(window)
-	window.popup()
-
-
-func _on_window_close_requested(original_parent: Control, window: Window) -> void:
-	graph_edit.set_window_popout_button_visible(true)
-	reparent(original_parent, false)
-	window.queue_free()
-#endregion

addons/gaea/gaea.gd

@@ -5,45 +5,48 @@ extends EditorPlugin
 
 const InspectorPlugin = preload("uid://bpg2cpobusnnl")
 
-var _container: MarginContainer
 var _panel: GaeaPanel
-var _panel_button: Button
+var _dock: EditorDock
 var _editor_selection: EditorSelection
 var _inspector_plugin: EditorInspectorPlugin
 var _custom_project_settings: GaeaProjectSettings
 
 
 func _enter_tree() -> void:
-	if Engine.is_editor_hint():
-		_editor_selection = EditorInterface.get_selection()
-		_editor_selection.selection_changed.connect(_on_selection_changed)
+	_editor_selection = EditorInterface.get_selection()
+	_editor_selection.selection_changed.connect(_on_selection_changed)
+
+	_panel = GaeaPanel.instantiate()
+	_panel.plugin = self
+
+	_dock = EditorDock.new()
+	_dock.available_layouts = EditorDock.DOCK_LAYOUT_FLOATING | EditorDock.DOCK_LAYOUT_HORIZONTAL
+	_dock.title = "Gaea"
+	_dock.default_slot = EditorDock.DOCK_SLOT_BOTTOM
+	_dock.add_child(_panel)
+	add_dock(_dock)
 
-		_container = MarginContainer.new()
-		_panel = GaeaPanel.instantiate()
-		_panel.plugin = self
-		_container.add_child(_panel)
-		_panel_button = add_control_to_bottom_panel(_container, "Gaea")
-		_panel_button.show()
 
-		_inspector_plugin = InspectorPlugin.new(_panel)
-		add_inspector_plugin(_inspector_plugin)
+	_inspector_plugin = InspectorPlugin.new(_panel)
+	add_inspector_plugin(_inspector_plugin)
 
-		GaeaEditorSettings.new().add_settings()
-		_custom_project_settings = GaeaProjectSettings.new()
-		_custom_project_settings.add_settings()
+	GaeaEditorSettings.new().add_settings()
+	_custom_project_settings = GaeaProjectSettings.new()
+	_custom_project_settings.add_settings()
 
-		resource_saved.connect(_on_resource_saved)
+	resource_saved.connect(_on_resource_saved)
 
-		EditorInterface.get_file_system_dock().resource_removed.connect(_on_resource_removed)
-		EditorInterface.get_file_system_dock().file_removed.connect(_on_file_removed)
+	EditorInterface.get_file_system_dock().resource_removed.connect(_on_resource_removed)
+	EditorInterface.get_file_system_dock().file_removed.connect(_on_file_removed)
 
 
 func _exit_tree() -> void:
 	if Engine.is_editor_hint():
 		_panel.graph_edit.unpopulate()
 		remove_inspector_plugin(_inspector_plugin)
-		remove_control_from_bottom_panel(_container)
-		_container.queue_free()
+		remove_dock(_dock)
+		_dock.queue_free()
+		_dock = null
 
 
 func _disable_plugin() -> void:
@@ -90,7 +93,7 @@ func _edit(object: Object) -> void:
 		if object.resource_path.is_empty():
 			return
 
-		make_bottom_panel_item_visible(_container)
+		_dock.make_visible()
 		if _panel.graph_edit.graph == object:
 			return
 

addons/gaea_documentation_toolkit/documentation_toolkit.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://bxanwt5o3b0ng"]
+[gd_scene format=3 uid="uid://bxanwt5o3b0ng"]
 
 [ext_resource type="Script" uid="uid://darqwls1ewij0" path="res://addons/gaea_documentation_toolkit/documentation_toolkit.gd" id="1_lxb1e"]
 [ext_resource type="Script" uid="uid://obmksa6ngu1s" path="res://addons/gaea_documentation_toolkit/tree.gd" id="2_8ok20"]
@@ -8,7 +8,8 @@ font_names = PackedStringArray("Consolas", "Monospace")
 subpixel_positioning = 0
 keep_rounding_remainders = false
 
-[node name="DocumentationToolkit" type="Control"]
+[node name="DocumentationToolkit" type="Control" unique_id=1633651677]
+custom_minimum_size = Vector2(0, 128)
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -17,49 +18,49 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_lxb1e")
 
-[node name="HBoxContainer" type="HSplitContainer" parent="."]
+[node name="HBoxContainer" type="HSplitContainer" parent="." unique_id=1744461141]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="TreeContainer" type="VBoxContainer" parent="HBoxContainer"]
+[node name="TreeContainer" type="VBoxContainer" parent="HBoxContainer" unique_id=515664750]
 custom_minimum_size = Vector2(200, 0)
 layout_mode = 2
 
-[node name="SearchBar" type="LineEdit" parent="HBoxContainer/TreeContainer"]
+[node name="SearchBar" type="LineEdit" parent="HBoxContainer/TreeContainer" unique_id=1200599534]
 layout_mode = 2
 placeholder_text = "Search..."
 
-[node name="Tree" type="Tree" parent="HBoxContainer/TreeContainer"]
+[node name="Tree" type="Tree" parent="HBoxContainer/TreeContainer" unique_id=1446740897]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(192, 0)
 layout_mode = 2
 size_flags_vertical = 3
 script = ExtResource("2_8ok20")
 
-[node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/TreeContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="HBoxContainer/TreeContainer" unique_id=2112535570]
 layout_mode = 2
 
-[node name="OpenFolderButton" type="Button" parent="HBoxContainer/TreeContainer/HBoxContainer"]
+[node name="OpenFolderButton" type="Button" parent="HBoxContainer/TreeContainer/HBoxContainer" unique_id=1158338676]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(31, 0)
 layout_mode = 2
 tooltip_text = "Open target folder..."
 
-[node name="ExportAllButton" type="Button" parent="HBoxContainer/TreeContainer/HBoxContainer"]
+[node name="ExportAllButton" type="Button" parent="HBoxContainer/TreeContainer/HBoxContainer" unique_id=205747794]
 layout_mode = 2
 size_flags_horizontal = 3
 text = "Export All"
 
-[node name="RightContainer" type="Control" parent="HBoxContainer"]
+[node name="RightContainer" type="Control" parent="HBoxContainer" unique_id=9088164]
 custom_minimum_size = Vector2(200, 0)
 layout_mode = 2
 size_flags_horizontal = 3
 
-[node name="SubViewportContainer" type="SubViewportContainer" parent="HBoxContainer/RightContainer"]
+[node name="SubViewportContainer" type="SubViewportContainer" parent="HBoxContainer/RightContainer" unique_id=414675997]
 z_index = -4096
 z_as_relative = false
 layout_mode = 1
@@ -70,14 +71,14 @@ grow_horizontal = 2
 grow_vertical = 2
 size_flags_horizontal = 3
 
-[node name="SubViewport" type="SubViewport" parent="HBoxContainer/RightContainer/SubViewportContainer"]
+[node name="SubViewport" type="SubViewport" parent="HBoxContainer/RightContainer/SubViewportContainer" unique_id=989321962]
 unique_name_in_owner = true
 transparent_bg = true
 handle_input_locally = false
 size = Vector2i(2, 2)
 render_target_update_mode = 4
 
-[node name="Panel" type="Panel" parent="HBoxContainer/RightContainer"]
+[node name="Panel" type="Panel" parent="HBoxContainer/RightContainer" unique_id=1631485179]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -86,7 +87,7 @@ grow_horizontal = 2
 grow_vertical = 2
 size_flags_horizontal = 3
 
-[node name="Markdown" type="RichTextLabel" parent="HBoxContainer/RightContainer/Panel"]
+[node name="Markdown" type="RichTextLabel" parent="HBoxContainer/RightContainer/Panel" unique_id=1995849860]
 unique_name_in_owner = true
 layout_mode = 1
 anchors_preset = 15
@@ -100,7 +101,7 @@ autowrap_trim_flags = 0
 context_menu_enabled = true
 selection_enabled = true
 
-[node name="ConfirmationDialog" type="ConfirmationDialog" parent="."]
+[node name="ConfirmationDialog" type="ConfirmationDialog" parent="." unique_id=880913801]
 dialog_text = "This will create images for every node in the tree, are you sure you want to?"
 
 [connection signal="text_changed" from="HBoxContainer/TreeContainer/SearchBar" to="HBoxContainer/TreeContainer/Tree" method="_on_search_bar_text_changed"]

addons/gaea_documentation_toolkit/plugin.gd

@@ -3,13 +3,20 @@ extends EditorPlugin
 
 const DocumentationToolkit = preload("uid://bxanwt5o3b0ng")
 
-var _panel: Control
+var _dock: EditorDock
 
 
 func _enter_tree() -> void:
-	_panel = DocumentationToolkit.instantiate()
-	add_control_to_bottom_panel(_panel, "Gaea Documentation Toolkit")
+	_dock = EditorDock.new()
+	_dock.available_layouts = EditorDock.DOCK_LAYOUT_FLOATING | EditorDock.DOCK_LAYOUT_HORIZONTAL
+	_dock.title = "Gaea Documentation Toolkit"
+	_dock.default_slot = EditorDock.DOCK_SLOT_BOTTOM
+
+	_dock.add_child(DocumentationToolkit.instantiate())
+	add_dock(_dock)
 
 
 func _exit_tree() -> void:
-	remove_control_from_bottom_panel(_panel)
+	remove_dock(_dock)
+	_dock.queue_free()
+	_dock = null

project.godot

@@ -8,17 +8,23 @@
 
 config_version=5
 
+[animation]
+
+compatibility/default_parent_skeleton_in_mesh_instance_3d=true
+
 [application]
 
 config/name="Gaea"
 config/tags=PackedStringArray("addon")
 run/main_scene="res://scenes/walker_demo/walker_demo.tscn"
-config/features=PackedStringArray("4.5", "Forward Plus")
+config/features=PackedStringArray("4.6", "Forward Plus")
 config/icon="res://icon.svg"
 
 [debug]
 
-gdscript/warnings/exclude_addons=false
+gdscript/warnings/directory_rules={
+"res://addons": 1
+}
 
 [display]