From 2c980717e385c5941bc5041a6420f5622675ae6c Mon Sep 17 00:00:00 2001 From: John Rassa Date: Tue, 17 Sep 2024 20:01:47 -0400 Subject: [PATCH 1/2] fix: fix various gdscript compile errors --- godot/Utils/DebugViewer.gd | 2 +- godot/Utils/PostProcessBuilder.gd | 2 +- .../gdquest.toon-controller/Tools/ToonProxyBuilder.gd | 6 ++---- .../gdquest.toon-controller/Tools/ToonSceneBuilder.gd | 8 ++++---- godot/addons/gdquest.toon-controller/plugin.gd | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/godot/Utils/DebugViewer.gd b/godot/Utils/DebugViewer.gd index 407dc5a..5beed36 100644 --- a/godot/Utils/DebugViewer.gd +++ b/godot/Utils/DebugViewer.gd @@ -1,7 +1,7 @@ class_name DebugViewer extends Control -@export (float, 0.1, 1, 0.025) var size_multiplier = 0.125 +@export_range(0.1, 1, 0.025) var size_multiplier := 0.125 @export var enabled := true: set = _set_enabled diff --git a/godot/Utils/PostProcessBuilder.gd b/godot/Utils/PostProcessBuilder.gd index ac747ab..2a1bd32 100644 --- a/godot/Utils/PostProcessBuilder.gd +++ b/godot/Utils/PostProcessBuilder.gd @@ -1,7 +1,7 @@ class_name PostProcessBuilder extends Control -@export (Array, Resource) var processing_steps := [] +@export var processing_steps: Array[Resource] = [] @export var scene: PackedScene diff --git a/godot/addons/gdquest.toon-controller/Tools/ToonProxyBuilder.gd b/godot/addons/gdquest.toon-controller/Tools/ToonProxyBuilder.gd index 41d6772..99bd52f 100644 --- a/godot/addons/gdquest.toon-controller/Tools/ToonProxyBuilder.gd +++ b/godot/addons/gdquest.toon-controller/Tools/ToonProxyBuilder.gd @@ -4,7 +4,7 @@ extends Node enum LightRole { KEY, FILL, KICK } -@export (LightRole) var light_role := 0: set = _set_light_role +@export var light_role: LightRole = 0: set = _set_light_role @export var emits_shadows := false: set = _set_emits_shadows @export var specular_material: ShaderMaterial: set = _set_specular_material @@ -182,9 +182,7 @@ func _on_parent_renamed() -> void: func _on_parent_tree_exiting() -> void: abort_deletion = false - Engine.get_main_loop().connect( - "idle_frame", self, "_on_SceneTree_idle_frame", [], CONNECT_ONE_SHOT - ) + get_tree().process_frame.connect(_on_SceneTree_idle_frame, ConnectFlags.CONNECT_ONE_SHOT) func _on_SceneTree_idle_frame() -> void: diff --git a/godot/addons/gdquest.toon-controller/Tools/ToonSceneBuilder.gd b/godot/addons/gdquest.toon-controller/Tools/ToonSceneBuilder.gd index 1f5b3d2..fd0843a 100644 --- a/godot/addons/gdquest.toon-controller/Tools/ToonSceneBuilder.gd +++ b/godot/addons/gdquest.toon-controller/Tools/ToonSceneBuilder.gd @@ -36,10 +36,10 @@ func _ready() -> void: scene_root.call_deferred("move_child", self, 0) if not light_data: - light_data = await _build_data(DataType.LIGHT).completed + light_data = await _build_data(DataType.LIGHT) if not specular_data: - specular_data = await _build_data(DataType.SPECULAR).completed + specular_data = await _build_data(DataType.SPECULAR) func get_class() -> String: @@ -67,8 +67,8 @@ func _build_data(type: int) -> SubViewport: var viewport := SubViewport.new() viewport.transparent_bg = true - viewport.world = World.new() - viewport.usage = SubViewport.USAGE_3D_NO_EFFECTS + viewport.world_3d = World3D.new() + #viewport.usage = Viewport.USAGE_3D_NO_EFFECTS viewport.render_target_update_mode = SubViewport.UPDATE_ALWAYS viewport.msaa = ProjectSettings.get_setting("rendering/quality/filters/msaa") viewport.shadow_atlas_size = shadow_resolution diff --git a/godot/addons/gdquest.toon-controller/plugin.gd b/godot/addons/gdquest.toon-controller/plugin.gd index f832441..39d6012 100644 --- a/godot/addons/gdquest.toon-controller/plugin.gd +++ b/godot/addons/gdquest.toon-controller/plugin.gd @@ -32,9 +32,9 @@ func handles(object: Object) -> bool: return false -func _forward_3d_gui_input(camera: Camera3D, event: InputEvent) -> bool: +func _forward_3d_gui_input(camera: Camera3D, event: InputEvent) -> int: _set_camera_and_viewports(camera.global_transform) - return false + return EditorPlugin.AFTER_GUI_INPUT_STOP func _on_Preview_pressed() -> void: From 31055d11673970d6b80a2e62d2c88e6a2ffeadd7 Mon Sep 17 00:00:00 2001 From: John Rassa Date: Tue, 17 Sep 2024 20:02:56 -0400 Subject: [PATCH 2/2] feat: update theme/UI for Godot 4.3 --- godot/Main/DemoPickerUI.tscn | 248 +++++++++++++++-------------------- godot/Main/DemoSelector.tscn | 2 + godot/Main/GDQuestLogo.tscn | 14 +- godot/Main/UI/ui_theme.tres | 9 ++ godot/project.godot | 4 +- 5 files changed, 129 insertions(+), 148 deletions(-) diff --git a/godot/Main/DemoPickerUI.tscn b/godot/Main/DemoPickerUI.tscn index 52d2e18..7e875bd 100644 --- a/godot/Main/DemoPickerUI.tscn +++ b/godot/Main/DemoPickerUI.tscn @@ -1,13 +1,21 @@ -[gd_scene load_steps=14 format=3 uid="uid://bjmid3jo8m8n1"] +[gd_scene load_steps=24 format=3 uid="uid://bjmid3jo8m8n1"] [ext_resource type="PackedScene" uid="uid://b176ml0gceo5m" path="res://Main/DemoList.tscn" id="2"] [ext_resource type="Script" path="res://Main/DemoPickerUI.gd" id="3"] -[ext_resource type="Theme" path="res://Main/UI/ui_theme.tres" id="4"] -[ext_resource type="PackedScene" path="res://Main/GDQuestLogo.tscn" id="9"] -[ext_resource type="ButtonGroup" path="res://Main/filter_button_group.tres" id="11"] -[ext_resource type="PackedScene" path="res://Main/UIControlsList.tscn" id="17"] - -[sub_resource type="StyleBoxEmpty" id="1"] +[ext_resource type="Texture2D" uid="uid://djonil8al43ey" path="res://Main/background.png" id="3_npgvx"] +[ext_resource type="Theme" uid="uid://b2rktjpfj58fv" path="res://Main/UI/ui_theme.tres" id="4"] +[ext_resource type="Texture2D" uid="uid://tp7uln81cgxx" path="res://Main/planet.png" id="4_s1iv8"] +[ext_resource type="Texture2D" uid="uid://blop6sfkvwbs4" path="res://Main/planet_large.png" id="5_jfepq"] +[ext_resource type="Texture2D" uid="uid://bcecy8l5ltim2" path="res://Main/UI/node-icons/GuiVisibilityVisible.svg" id="6_aj65i"] +[ext_resource type="Texture2D" uid="uid://bq0oa0hlk08r0" path="res://Main/title.svg" id="6_eh3bb"] +[ext_resource type="Texture2D" uid="uid://b1ucwbfl05g86" path="res://Main/UI/9patch_searchbar.png" id="7_4ujjg"] +[ext_resource type="Texture2D" uid="uid://ra4ih1twggv1" path="res://Main/UI/node-icons/Node2D.svg" id="7_wv5qu"] +[ext_resource type="Texture2D" uid="uid://u0wgaiag7ifs" path="res://Main/UI/9patch_mainmenu.png" id="8_optbv"] +[ext_resource type="Texture2D" uid="uid://cd3rs608qgfys" path="res://Main/UI/node-icons/Node3D.svg" id="8_uthbi"] +[ext_resource type="PackedScene" uid="uid://cmg7vob2jhnek" path="res://Main/GDQuestLogo.tscn" id="9"] +[ext_resource type="Texture2D" uid="uid://cngfer2cd5fkd" path="res://Main/UI/node-icons/Control.svg" id="9_tkvaf"] +[ext_resource type="Texture2D" uid="uid://btj70s4v4l2n3" path="res://Main/UI/node-icons/Node.svg" id="10_6gayy"] +[ext_resource type="PackedScene" uid="uid://dd7qh25r60ptt" path="res://Main/UIControlsList.tscn" id="17"] [sub_resource type="StyleBoxFlat" id="2"] draw_center = false @@ -16,11 +24,18 @@ border_width_top = 2 border_width_right = 2 border_width_bottom = 2 +[sub_resource type="StyleBoxEmpty" id="1"] + [sub_resource type="StyleBoxEmpty" id="3"] [sub_resource type="StyleBoxTexture" id="4"] content_margin_top = 24.0 content_margin_bottom = 24.0 +texture = ExtResource("7_4ujjg") +texture_margin_left = 48.0 +texture_margin_top = 48.0 +texture_margin_right = 48.0 +texture_margin_bottom = 48.0 axis_stretch_horizontal = 1 axis_stretch_vertical = 1 region_rect = Rect2(0, 0, 128, 128) @@ -32,161 +47,135 @@ region_rect = Rect2(0, 0, 128, 128) [sub_resource type="Shortcut" id="8"] [node name="DemoPickerUI" type="Control"] +layout_mode = 3 +anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 theme = ExtResource("4") script = ExtResource("3") -__meta__ = { -"_edit_use_anchors_": false -} [node name="TextureRect" type="TextureRect" parent="."] +custom_minimum_size = Vector2(1024, 600) +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -custom_minimum_size = Vector2(1024, 600) size_flags_horizontal = 3 size_flags_vertical = 3 -texture = null -expand = true +texture = ExtResource("3_npgvx") +expand_mode = 1 stretch_mode = 2 -__meta__ = { -"_edit_use_anchors_": false -} [node name="planet" type="Sprite2D" parent="TextureRect"] position = Vector2(1719.03, 225.17) -texture = null +texture = ExtResource("4_s1iv8") [node name="planet2" type="Sprite2D" parent="TextureRect"] position = Vector2(39.3873, 1036.48) scale = Vector2(1.09002, 1.09002) -texture = null +texture = ExtResource("5_jfepq") [node name="FilterButtons" type="VBoxContainer" parent="."] +layout_mode = 0 offset_left = 1325.64 offset_top = 499.122 offset_right = 1556.64 offset_bottom = 800.122 alignment = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="All" type="Button" parent="FilterButtons"] -offset_top = 132.0 -offset_right = 231.0 -offset_bottom = 168.0 -theme_override_colors/font_color = Color(0.831373, 0.847059, 0.92549, 1) +layout_mode = 2 theme_override_colors/font_hover_color = Color(1, 1, 1, 1) theme_override_colors/font_pressed_color = Color(0.596078, 0.639216, 0.839216, 1) -theme_override_styles/hover = SubResource("1") -theme_override_styles/pressed = SubResource("1") +theme_override_colors/font_color = Color(0.831373, 0.847059, 0.92549, 1) theme_override_styles/focus = SubResource("2") theme_override_styles/disabled = SubResource("1") +theme_override_styles/hover = SubResource("1") +theme_override_styles/pressed = SubResource("1") theme_override_styles/normal = SubResource("1") toggle_mode = true -pressed = true -group = ExtResource("11") text = "ALL" -icon = null +icon = ExtResource("6_aj65i") flat = true -align = 0 +alignment = 0 expand_icon = true [node name="2D" type="Button" parent="FilterButtons"] visible = false -offset_top = 80.0 -offset_right = 231.0 -offset_bottom = 116.0 -theme_override_colors/font_color = Color(0.831373, 0.847059, 0.92549, 1) +layout_mode = 2 theme_override_colors/font_hover_color = Color(1, 1, 1, 1) theme_override_colors/font_pressed_color = Color(0.596078, 0.639216, 0.839216, 1) -theme_override_styles/hover = SubResource("1") -theme_override_styles/pressed = SubResource("1") +theme_override_colors/font_color = Color(0.831373, 0.847059, 0.92549, 1) theme_override_styles/focus = SubResource("2") theme_override_styles/disabled = SubResource("1") +theme_override_styles/hover = SubResource("1") +theme_override_styles/pressed = SubResource("1") theme_override_styles/normal = SubResource("1") toggle_mode = true -group = ExtResource("11") text = "2D" -icon = null +icon = ExtResource("7_wv5qu") flat = true -align = 0 +alignment = 0 expand_icon = true [node name="3D" type="Button" parent="FilterButtons"] visible = false -offset_top = 132.0 -offset_right = 231.0 -offset_bottom = 168.0 -theme_override_colors/font_color = Color(0.831373, 0.847059, 0.92549, 1) +layout_mode = 2 theme_override_colors/font_hover_color = Color(1, 1, 1, 1) theme_override_colors/font_pressed_color = Color(0.596078, 0.639216, 0.839216, 1) -theme_override_styles/hover = SubResource("1") -theme_override_styles/pressed = SubResource("1") +theme_override_colors/font_color = Color(0.831373, 0.847059, 0.92549, 1) theme_override_styles/focus = SubResource("2") theme_override_styles/disabled = SubResource("1") +theme_override_styles/hover = SubResource("1") +theme_override_styles/pressed = SubResource("1") theme_override_styles/normal = SubResource("1") toggle_mode = true -group = ExtResource("11") text = "3D" -icon = null +icon = ExtResource("8_uthbi") flat = true -align = 0 +alignment = 0 expand_icon = true -__meta__ = { -"_editor_description_": "" -} [node name="UI" type="Button" parent="FilterButtons"] visible = false -offset_top = 184.0 -offset_right = 231.0 -offset_bottom = 220.0 -theme_override_colors/font_color = Color(0.831373, 0.847059, 0.92549, 1) +layout_mode = 2 theme_override_colors/font_hover_color = Color(1, 1, 1, 1) theme_override_colors/font_pressed_color = Color(0.596078, 0.639216, 0.839216, 1) -theme_override_styles/hover = SubResource("1") -theme_override_styles/pressed = SubResource("1") +theme_override_colors/font_color = Color(0.831373, 0.847059, 0.92549, 1) theme_override_styles/focus = SubResource("2") theme_override_styles/disabled = SubResource("1") +theme_override_styles/hover = SubResource("1") +theme_override_styles/pressed = SubResource("1") theme_override_styles/normal = SubResource("1") toggle_mode = true -group = ExtResource("11") text = "UI" -icon = null +icon = ExtResource("9_tkvaf") flat = true -align = 0 +alignment = 0 expand_icon = true -__meta__ = { -"_editor_description_": "" -} [node name="General" type="Button" parent="FilterButtons"] visible = false -offset_top = 236.0 -offset_right = 231.0 -offset_bottom = 272.0 -theme_override_colors/font_color = Color(0.831373, 0.847059, 0.92549, 1) +layout_mode = 2 theme_override_colors/font_hover_color = Color(1, 1, 1, 1) theme_override_colors/font_pressed_color = Color(0.596078, 0.639216, 0.839216, 1) -theme_override_styles/hover = SubResource("1") -theme_override_styles/pressed = SubResource("1") +theme_override_colors/font_color = Color(0.831373, 0.847059, 0.92549, 1) theme_override_styles/focus = SubResource("2") theme_override_styles/disabled = SubResource("1") +theme_override_styles/hover = SubResource("1") +theme_override_styles/pressed = SubResource("1") theme_override_styles/normal = SubResource("1") toggle_mode = true -group = ExtResource("11") text = "GENERAL" -icon = null +icon = ExtResource("10_6gayy") flat = true -align = 0 +alignment = 0 expand_icon = true -__meta__ = { -"_editor_description_": "" -} [node name="VBoxContainer" type="VBoxContainer" parent="."] +custom_minimum_size = Vector2(682, 0) +layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -196,55 +185,43 @@ offset_top = -440.0 offset_right = 341.0 offset_bottom = 434.0 grow_vertical = 2 -custom_minimum_size = Vector2(682, 0) size_flags_horizontal = 3 size_flags_vertical = 3 alignment = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="title" type="TextureRect" parent="VBoxContainer"] -offset_right = 682.0 -offset_bottom = 240.0 custom_minimum_size = Vector2(0, 240) -texture = null -expand = true -stretch_mode = 6 +layout_mode = 2 +texture = ExtResource("6_eh3bb") +expand_mode = 1 +stretch_mode = 5 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"] -offset_top = 256.0 -offset_right = 682.0 -offset_bottom = 349.0 +layout_mode = 2 [node name="SearchBar" type="LineEdit" parent="VBoxContainer/HBoxContainer"] -offset_right = 682.0 -offset_bottom = 93.0 +layout_mode = 2 +size_flags_horizontal = 3 focus_neighbor_top = NodePath(".") focus_next = NodePath("../../NinePatchRect/MarginContainer/DemoList") focus_previous = NodePath("../../../HBoxContainer/HelpButton") -size_flags_horizontal = 3 theme_override_styles/focus = SubResource("3") theme_override_styles/normal = SubResource("4") [node name="SearchLabel" type="Label" parent="VBoxContainer/HBoxContainer/SearchBar"] modulate = Color(1, 1, 1, 0.25098) +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 offset_left = 48.0 offset_right = -49.0 text = "Search" -valign = 1 -__meta__ = { -"_edit_use_anchors_": false -} +vertical_alignment = 1 [node name="NinePatchRect" type="NinePatchRect" parent="VBoxContainer"] -offset_top = 365.0 -offset_right = 682.0 -offset_bottom = 753.0 +layout_mode = 2 size_flags_vertical = 3 -texture = null +texture = ExtResource("8_optbv") patch_margin_left = 16 patch_margin_top = 32 patch_margin_right = 16 @@ -253,112 +230,103 @@ axis_stretch_horizontal = 1 axis_stretch_vertical = 1 [node name="MarginContainer" type="MarginContainer" parent="VBoxContainer/NinePatchRect"] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 -theme_override_constants/margin_right = 16 -theme_override_constants/margin_top = 24 theme_override_constants/margin_left = 16 +theme_override_constants/margin_top = 24 +theme_override_constants/margin_right = 16 theme_override_constants/margin_bottom = 27 -__meta__ = { -"_edit_use_anchors_": false -} [node name="DemoList" parent="VBoxContainer/NinePatchRect/MarginContainer" instance=ExtResource("2")] +layout_mode = 2 focus_neighbor_top = NodePath(".") focus_neighbor_bottom = NodePath(".") focus_next = NodePath("../../../LoadButton") focus_previous = NodePath("../../../HBoxContainer/SearchBar") [node name="LoadButton" type="Button" parent="VBoxContainer"] -offset_left = 201.0 -offset_top = 769.0 -offset_right = 481.0 -offset_bottom = 874.0 custom_minimum_size = Vector2(280, 100) -focus_neighbor_top = NodePath(".") -focus_neighbor_bottom = NodePath(".") +layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 13 +focus_neighbor_top = NodePath(".") +focus_neighbor_bottom = NodePath(".") text = "LOAD SCENE" [node name="GDQuestLogo" parent="." instance=ExtResource("9")] +layout_mode = 0 +anchors_preset = 0 +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 0.0 +anchor_bottom = 0.0 +offset_left = 1609.0 +offset_top = 952.0 +offset_right = 1863.0 +offset_bottom = 1031.0 [node name="HBoxContainer" type="HBoxContainer" parent="."] +layout_mode = 0 offset_left = 24.0 offset_top = 24.0 offset_right = 184.0 offset_bottom = 64.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="QuitButton" type="Button" parent="HBoxContainer"] -offset_right = 96.0 -offset_bottom = 60.0 custom_minimum_size = Vector2(96, 60) +layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 13 theme_override_colors/font_disabled_color = Color(0.439216, 0.482353, 0.662745, 1) -theme_override_colors/font_color = Color(0.439216, 0.482353, 0.662745, 1) theme_override_colors/font_hover_color = Color(0.643137, 0.682353, 0.85098, 1) theme_override_colors/font_pressed_color = Color(0.337255, 0.376471, 0.568627, 1) -theme_override_styles/hover = SubResource("5") -theme_override_styles/pressed = SubResource("5") +theme_override_colors/font_color = Color(0.439216, 0.482353, 0.662745, 1) theme_override_styles/focus = SubResource("5") theme_override_styles/disabled = SubResource("5") +theme_override_styles/hover = SubResource("5") +theme_override_styles/pressed = SubResource("5") theme_override_styles/normal = SubResource("6") text = "QUIT" flat = true -__meta__ = { -"_edit_use_anchors_": false -} [node name="HelpButton" type="Button" parent="HBoxContainer"] visible = false -offset_left = 112.0 -offset_right = 208.0 -offset_bottom = 60.0 custom_minimum_size = Vector2(96, 60) -focus_next = NodePath("../../VBoxContainer/HBoxContainer/SearchBar") -focus_previous = NodePath("../QuitButton") +layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 13 +focus_next = NodePath("../../VBoxContainer/HBoxContainer/SearchBar") +focus_previous = NodePath("../QuitButton") theme_override_colors/font_disabled_color = Color(0.439216, 0.482353, 0.662745, 1) -theme_override_colors/font_color = Color(0.439216, 0.482353, 0.662745, 1) theme_override_colors/font_hover_color = Color(0.643137, 0.682353, 0.85098, 1) theme_override_colors/font_pressed_color = Color(0.337255, 0.376471, 0.568627, 1) -theme_override_styles/hover = SubResource("5") -theme_override_styles/pressed = SubResource("5") +theme_override_colors/font_color = Color(0.439216, 0.482353, 0.662745, 1) theme_override_styles/focus = SubResource("5") theme_override_styles/disabled = SubResource("5") +theme_override_styles/hover = SubResource("5") +theme_override_styles/pressed = SubResource("5") theme_override_styles/normal = SubResource("6") -shortcut_in_tooltip = false shortcut = SubResource("8") +shortcut_in_tooltip = false text = "HELP" flat = true -__meta__ = { -"_edit_use_anchors_": false -} [node name="HelpWindow" type="ColorRect" parent="."] visible = false +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 color = Color(0.0980392, 0.0784314, 0.141176, 0.701961) -__meta__ = { -"_edit_use_anchors_": false -} [node name="CenterContainer" type="CenterContainer" parent="HelpWindow"] +layout_mode = 0 anchor_right = 1.0 anchor_bottom = 1.0 mouse_filter = 2 [node name="UIControlsList" parent="HelpWindow/CenterContainer" instance=ExtResource("17")] -offset_left = 830.0 -offset_top = 510.0 -offset_right = 1090.0 -offset_bottom = 570.0 +layout_mode = 2 is_foldable = false title = "Demo controls" diff --git a/godot/Main/DemoSelector.tscn b/godot/Main/DemoSelector.tscn index ec8ae2b..069ce3a 100644 --- a/godot/Main/DemoSelector.tscn +++ b/godot/Main/DemoSelector.tscn @@ -34,6 +34,8 @@ script = ExtResource("5") [node name="DemoPickerUI" parent="." instance=ExtResource("1")] layout_mode = 3 anchors_preset = 15 +grow_horizontal = 2 +grow_vertical = 2 [node name="CanvasLayer" type="CanvasLayer" parent="."] layer = 100 diff --git a/godot/Main/GDQuestLogo.tscn b/godot/Main/GDQuestLogo.tscn index c4174e9..2520222 100644 --- a/godot/Main/GDQuestLogo.tscn +++ b/godot/Main/GDQuestLogo.tscn @@ -1,16 +1,18 @@ -[gd_scene load_steps=2 format=3 uid="uid://cmg7vob2jhnek"] +[gd_scene load_steps=3 format=3 uid="uid://cmg7vob2jhnek"] +[ext_resource type="Texture2D" uid="uid://dieoxafgevoay" path="res://Main/gdquest_logo_white.svg" id="1_wf1i5"] [ext_resource type="Script" path="res://Main/GDQuestLogo.gd" id="2"] [node name="GDQuestLogo" type="TextureButton"] +anchors_preset = 3 anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = -311.082 -offset_top = -127.947 -offset_right = -57.082 -offset_bottom = -49.9467 +offset_left = -1920.0 +offset_top = -1080.0 +offset_right = -1666.0 +offset_bottom = -1001.0 mouse_default_cursor_shape = 2 -texture_normal = null +texture_normal = ExtResource("1_wf1i5") script = ExtResource("2") diff --git a/godot/Main/UI/ui_theme.tres b/godot/Main/UI/ui_theme.tres index 3561770..e6d1c9f 100644 --- a/godot/Main/UI/ui_theme.tres +++ b/godot/Main/UI/ui_theme.tres @@ -10,6 +10,11 @@ cache/0/16/0/descent = 0.0 cache/0/16/0/underline_position = 0.0 cache/0/16/0/underline_thickness = 0.0 cache/0/16/0/scale = 1.0 +cache/0/28/0/ascent = 0.0 +cache/0/28/0/descent = 0.0 +cache/0/28/0/underline_position = 0.0 +cache/0/28/0/underline_thickness = 0.0 +cache/0/28/0/scale = 1.0 [sub_resource type="StyleBoxTexture" id="2"] region_rect = Rect2(0, 0, 199, 128) @@ -45,12 +50,14 @@ expand_margin_bottom = 20.0 [resource] default_font = ExtResource("1") +default_font_size = 36 Button/colors/font_color = Color(0.760784, 0.760784, 0.819608, 1) Button/colors/font_color_disabled = Color(0.196078, 0.160784, 0.278431, 0.619608) Button/colors/font_color_focus = Color(0.760784, 0.760784, 0.819608, 1) Button/colors/font_color_hover = Color(0.760784, 0.760784, 0.819608, 1) Button/colors/font_color_pressed = Color(0.494118, 0.494118, 0.560784, 1) Button/constants/hseparation = 2 +Button/font_sizes/font_size = 28 Button/fonts/font = SubResource("1") Button/styles/disabled = SubResource("2") Button/styles/focus = SubResource("3") @@ -72,6 +79,7 @@ ItemList/constants/hseparation = 4 ItemList/constants/icon_margin = 4 ItemList/constants/line_separation = 2 ItemList/constants/vseparation = 2 +ItemList/font_sizes/font_size = 36 ItemList/fonts/font = ExtResource("1") ItemList/styles/bg = SubResource("7") ItemList/styles/bg_focus = null @@ -87,6 +95,7 @@ LineEdit/colors/font_color_selected = Color(0, 0, 0, 1) LineEdit/colors/font_color_uneditable = Color(0.88, 0.88, 0.88, 0.5) LineEdit/colors/selection_color = Color(0.49, 0.49, 0.49, 1) LineEdit/constants/minimum_spaces = 12 +LineEdit/font_sizes/font_size = 36 LineEdit/fonts/font = ExtResource("1") LineEdit/icons/clear = null LineEdit/styles/focus = null diff --git a/godot/project.godot b/godot/project.godot index 394d48f..fbc786b 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -22,12 +22,12 @@ window/size/viewport_height=1080 window/size/always_on_top=true window/size/window_width_override=1280 window/size/window_height_override=720 -window/stretch/mode="2d" +window/stretch/mode="canvas_items" window/stretch/aspect="expand" [editor_plugins] -enabled=PackedStringArray("gdquest.toon-controller") +enabled=PackedStringArray("res://addons/gdquest.toon-controller/plugin.cfg") [filesystem]