Merge branch '2.0' into add_graph_property

Author: Zehir

addons/gaea/editor/graph_editor/graph_edit.gd

@@ -8,7 +8,7 @@ extends GraphEdit
 ## List of nodes attached to a frame (element, frame)
 var attached_elements: Dictionary[StringName, StringName]
 
-## Currently edited resource
+## Currently edited resource, use [method populate] to change the graph
 var graph: GaeaGraph :
 	set(value):
 		graph = value
@@ -62,6 +62,11 @@ func populate(new_graph: GaeaGraph) -> void:
 		graph.layer_count_modified.connect(_update_output_node)
 	_load_data()
 
+	if is_instance_valid(main_editor):
+		# The Screenshotter don't have the main_editor reference
+		main_editor.set_editor_visible(true)
+		main_editor.preview_panel.reset()
+
 
 func unpopulate() -> void:
 	if is_instance_valid(graph) and graph.layer_count_modified.is_connected(_update_output_node):
@@ -71,6 +76,11 @@ func unpopulate() -> void:
 	for child in get_children():
 		if child is GraphElement:
 			child.queue_free()
+
+	if is_instance_valid(main_editor):
+		# The Screenshotter don't have the main_editor reference
+		main_editor.set_editor_visible(false)
+
 	graph = null
 
 

addons/gaea/editor/graph_editor/main_editor.gd

@@ -1,6 +1,6 @@
 @tool
 class_name GaeaMainEditor
-extends Control
+extends HSplitContainer
 
 ## Emitted when the about popup is requested.
 @warning_ignore("unused_signal")
@@ -20,6 +20,7 @@ signal new_reroute_requested(connection: Dictionary)
 
 @export var gaea_panel: GaeaPanel
 @export var graph_edit: GaeaGraphEdit
+@export var preview_panel: GaeaPreviewPanel
 @export var about_window: AcceptDialog
 @export var create_node_popup: GaeaPopupCreateNode
 @export var node_context_menu: GaeaPopupNodeContextMenu
@@ -69,3 +70,9 @@ static func _clamp_popup_in_rect(popup: Window, window_rect: Rect2i) -> void:
 		popup.position.y = window_rect.position.y
 	elif inner_rect.position.y + inner_rect.size.y > window_rect.position.y + window_rect.size.y:
 		popup.position.y = window_rect.position.y + window_rect.size.y - inner_rect.size.y
+
+
+@warning_ignore("shadowed_variable_base_class")
+func set_editor_visible(visible: bool) -> void:
+	graph_edit.visible = visible
+	preview_panel.visible = visible

addons/gaea/editor/panel/panel.gd

@@ -6,6 +6,7 @@ extends Control
 @export var main_editor: GaeaMainEditor
 @export var graph_edit: GaeaGraphEdit
 @export var file_list: GaeaFileList
+@export var preview_panel: GaeaPreviewPanel
 
 var plugin: GaeaEditorPlugin
 

addons/gaea/editor/panel/panel.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=13 format=3 uid="uid://dngytsjlmkfg7"]
+[gd_scene load_steps=14 format=3 uid="uid://dngytsjlmkfg7"]
 
 [ext_resource type="Script" uid="uid://dpbmowgfmnxe5" path="res://addons/gaea/editor/panel/panel.gd" id="1_afcqa"]
 [ext_resource type="Script" uid="uid://bedt1m4gyyvyv" path="res://addons/gaea/editor/graph_editor/graph_edit.gd" id="2_cdav6"]
@@ -10,11 +10,12 @@
 [ext_resource type="Script" uid="uid://bybvolyg1u0v4" path="res://addons/gaea/editor/graph_editor/node_context_menu.gd" id="4_vtsfx"]
 [ext_resource type="Script" uid="uid://cqd2rkam5cs3d" path="res://addons/gaea/editor/graph_editor/create_node_popup.gd" id="5_nbnm7"]
 [ext_resource type="Script" uid="uid://btt4eqjkp5pyf" path="res://addons/gaea/editor/graph_editor/link_context_menu.gd" id="7_dhpru"]
+[ext_resource type="PackedScene" uid="uid://c0hkiofdk5jcx" path="res://addons/gaea/editor/panel/right_panel/right_panel.tscn" id="7_eht7w"]
 [ext_resource type="PackedScene" uid="uid://dcec3sivqmbjf" path="res://addons/gaea/editor/panel/about_window.tscn" id="9_affj1"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_dhpru"]
 
-[node name="GaeaPanel" type="HSplitContainer" node_paths=PackedStringArray("main_editor", "graph_edit", "file_list")]
+[node name="GaeaPanel" type="HSplitContainer" node_paths=PackedStringArray("main_editor", "graph_edit", "file_list", "preview_panel")]
 custom_minimum_size = Vector2(0, 256)
 anchors_preset = 15
 anchor_right = 1.0
@@ -25,6 +26,7 @@ script = ExtResource("1_afcqa")
 main_editor = NodePath("MainEditor")
 graph_edit = NodePath("MainEditor/GraphEdit")
 file_list = NodePath("FileSystemContainer")
+preview_panel = NodePath("MainEditor/PreviewPanel")
 
 [node name="FileSystemContainer" type="VBoxContainer" parent="." node_paths=PackedStringArray("graph_edit", "main_editor", "menu_bar", "file_list", "context_menu", "file_dialog")]
 clip_contents = true
@@ -63,25 +65,23 @@ size = Vector2i(960, 540)
 mode_overrides_title = false
 filters = PackedStringArray("*.tres;Resource Files")
 
-[node name="MainEditor" type="Control" parent="." node_paths=PackedStringArray("gaea_panel", "graph_edit", "about_window", "create_node_popup", "node_context_menu", "link_context_menu")]
+[node name="MainEditor" type="HSplitContainer" parent="." node_paths=PackedStringArray("gaea_panel", "graph_edit", "preview_panel", "about_window", "create_node_popup", "node_context_menu", "link_context_menu")]
 layout_mode = 2
 size_flags_vertical = 3
+split_offset = 1000000
 script = ExtResource("4_gbl2m")
 gaea_panel = NodePath("..")
 graph_edit = NodePath("GraphEdit")
+preview_panel = NodePath("PreviewPanel")
 about_window = NodePath("AboutWindow")
 create_node_popup = NodePath("CreateNodePopup")
 node_context_menu = NodePath("NodeContextMenu")
 link_context_menu = NodePath("LinkContextMenu")
 
 [node name="GraphEdit" type="GraphEdit" parent="MainEditor" node_paths=PackedStringArray("main_editor", "bottom_note_label")]
 visible = false
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
+custom_minimum_size = Vector2(50, 50)
+layout_mode = 2
 size_flags_vertical = 3
 theme_override_colors/connection_rim_color = Color(0.0784314, 0.0784314, 0.0784314, 1)
 grid_pattern = 1
@@ -117,6 +117,11 @@ text = "(0,0)"
 fit_content = true
 metadata/_edit_use_anchors_ = true
 
+[node name="PreviewPanel" parent="MainEditor" node_paths=PackedStringArray("main_editor") instance=ExtResource("7_eht7w")]
+visible = false
+layout_mode = 2
+main_editor = NodePath("..")
+
 [node name="AboutWindow" parent="MainEditor" node_paths=PackedStringArray("main_editor") instance=ExtResource("9_affj1")]
 visible = false
 exclusive = true

addons/gaea/editor/panel/right_panel/camera_3d.gd

@@ -0,0 +1,91 @@
+@tool
+class_name GaeaPreviewCamera
+extends Camera3D
+
+const SCROLL_SPEED: float = 5.0 # Speed when use scroll mouse
+const ZOOM_SPEED: float = 50.0 # Speed use when is_zoom_in or is_zoom_out is true
+const DEFAULT_DISTANCE: float = 5.0 # Default distance of the Node
+const ROTATE_SPEED: float = 2.0
+const PAN_SPEED: float = 0.25
+
+@export var _anchor_node: Node3D
+
+# Use to add posibility to updated zoom with external script
+var is_zoom_in: bool
+var is_zoom_out: bool
+
+# Event var
+var _current_rotate_input: Vector2
+var _current_pan_input: Vector2
+var _current_scroll_speed: float
+
+# Transform var
+var _rotation: Vector3
+var _distance: float
+
+func _ready():
+	_distance = DEFAULT_DISTANCE
+	_rotation = _anchor_node.transform.basis.get_rotation_quaternion().get_euler()
+
+
+func _process(delta: float):
+	if is_zoom_in:
+		_current_scroll_speed = -1 * ZOOM_SPEED
+	if is_zoom_out:
+		_current_scroll_speed = 1 * ZOOM_SPEED
+	_process_transformation(delta)
+
+
+func _process_transformation(delta: float):
+	# Update rotation
+	_rotation.x += -_current_rotate_input.y * delta * ROTATE_SPEED
+	_rotation.y += -_current_rotate_input.x * delta * ROTATE_SPEED
+	if _rotation.x < -PI/2:
+		_rotation.x = -PI/2
+	if _rotation.x > PI/2:
+		_rotation.x = PI/2
+	_current_rotate_input = Vector2.ZERO
+
+	# Update distance
+	_distance += _current_scroll_speed * delta
+	if _distance < 1:
+		_distance = 1
+	_current_scroll_speed = 0
+
+	self.set_identity()
+	self.translate_object_local(Vector3(0,0,_distance))
+
+	_anchor_node.transform.basis = Basis(Quaternion.from_euler(_rotation))
+
+	var pan_factor = delta * maxf(_distance, 1) * PAN_SPEED
+	_anchor_node.position -= _anchor_node.transform.basis.x * _current_pan_input.x * pan_factor
+	_anchor_node.position -= _anchor_node.transform.basis.y * -_current_pan_input.y * pan_factor
+	_current_pan_input = Vector2.ZERO
+
+
+func input(event: InputEvent):
+	if event is InputEventMouseMotion:
+		_process_mouse_rotation_event(event)
+	elif event is InputEventMouseButton:
+		_process_mouse_scroll_event(event)
+
+
+func _process_mouse_rotation_event(e: InputEventMouseMotion):
+	if Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT):
+		_current_rotate_input = e.relative
+	elif Input.is_mouse_button_pressed(MOUSE_BUTTON_RIGHT):
+		_current_pan_input = e.relative
+
+
+func _process_mouse_scroll_event(e: InputEventMouseButton):
+	if e.button_index == MOUSE_BUTTON_WHEEL_UP:
+		_current_scroll_speed = -maxf(_distance, 1) * SCROLL_SPEED
+	elif e.button_index == MOUSE_BUTTON_WHEEL_DOWN:
+		_current_scroll_speed = maxf(_distance, 1) * SCROLL_SPEED
+
+
+@warning_ignore("shadowed_variable_base_class")
+func set_camera_view(anchor_position: Vector3, rotation: Vector3, distance: float):
+	_anchor_node.position = anchor_position
+	_rotation = rotation
+	_distance = distance

addons/gaea/editor/panel/right_panel/camera_3d.gd.uid

@@ -0,0 +1 @@
+uid://bobcj42guajf3

addons/gaea/editor/panel/right_panel/cube_material.tres

@@ -0,0 +1,22 @@
+[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://c5mn0qnqt78fj"]
+
+[ext_resource type="Shader" uid="uid://6bf04rd28i71" path="res://addons/gaea/editor/panel/right_panel/cube_shader.gdshader" id="1_ci0if"]
+
+[resource]
+render_priority = 0
+shader = ExtResource("1_ci0if")
+shader_parameter/metalic = 0.25
+shader_parameter/roughness = 1.0
+shader_parameter/grid_scale = 1.0
+shader_parameter/grid_width = 0.0150000007125
+shader_parameter/grid_color = Color(0.17254902, 0.24313726, 0.3137255, 0.78431374)
+shader_parameter/inside_scale = 3.0
+shader_parameter/inside_width = 0.0050000002375
+shader_parameter/inside_color = Color(0.12608984, 0.11347676, 0.022142986, 0.8)
+shader_parameter/checkered = false
+shader_parameter/sub_checkered_grid = false
+shader_parameter/checkered_color = Color(0.25, 0.25, 0.25, 1)
+shader_parameter/checkered_blend_color = 0.1
+shader_parameter/use_inside_uv = false
+shader_parameter/use_albedo_color = false
+shader_parameter/albedo_alpha = 0.5