diff --git a/RELEASING.md b/RELEASING.md index ef36c76..5ea1bd5 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -5,7 +5,7 @@ Releases are made from the version in `project.godot` same version in the About window. 1. Bump the version, e.g. from `1.9.0` to `1.10.0`, and add a `WHATS_NEW` entry in - `about_popup.gd`. + `popups/about_popup.gd`. 2. Merge to `main` and push. The `Build` workflow (`.gitea/workflows/gitea-build.yaml`) then: diff --git a/game_log.gd b/common/game_log.gd similarity index 100% rename from game_log.gd rename to common/game_log.gd diff --git a/game_log.gd.uid b/common/game_log.gd.uid similarity index 100% rename from game_log.gd.uid rename to common/game_log.gd.uid diff --git a/list_row.gd b/common/list_row.gd similarity index 100% rename from list_row.gd rename to common/list_row.gd diff --git a/list_row.gd.uid b/common/list_row.gd.uid similarity index 100% rename from list_row.gd.uid rename to common/list_row.gd.uid diff --git a/player_object.gd b/data/player_object.gd similarity index 100% rename from player_object.gd rename to data/player_object.gd diff --git a/player_object.gd.uid b/data/player_object.gd.uid similarity index 100% rename from player_object.gd.uid rename to data/player_object.gd.uid diff --git a/playlist.gd b/data/playlist.gd similarity index 100% rename from playlist.gd rename to data/playlist.gd diff --git a/playlist.gd.uid b/data/playlist.gd.uid similarity index 100% rename from playlist.gd.uid rename to data/playlist.gd.uid diff --git a/settings.gd b/data/settings.gd similarity index 100% rename from settings.gd rename to data/settings.gd diff --git a/Settings.gd.uid b/data/settings.gd.uid similarity index 100% rename from Settings.gd.uid rename to data/settings.gd.uid diff --git a/song_object.gd b/data/song_object.gd similarity index 100% rename from song_object.gd rename to data/song_object.gd diff --git a/song_object.gd.uid b/data/song_object.gd.uid similarity index 100% rename from song_object.gd.uid rename to data/song_object.gd.uid diff --git a/MainWindow.tscn b/main/MainWindow.tscn similarity index 83% rename from MainWindow.tscn rename to main/MainWindow.tscn index dfcbcac..fd20876 100644 --- a/MainWindow.tscn +++ b/main/MainWindow.tscn @@ -1,15 +1,15 @@ [gd_scene format=3 uid="uid://xwq863o6uvsu"] -[ext_resource type="PackedScene" path="res://TopBar.tscn" id="top_bar_scene"] -[ext_resource type="PackedScene" path="res://Quiz.tscn" id="quiz_scene"] -[ext_resource type="Script" uid="uid://b8f4g15cas2j2" path="res://main_window.gd" id="1_eu0t5"] -[ext_resource type="PackedScene" uid="uid://bxydgil1yifps" path="res://SearchPopup.tscn" id="9_5ijvr"] -[ext_resource type="PackedScene" uid="uid://dpdem7pdxweb5" path="res://SyncPopup.tscn" id="10_yxw0b"] -[ext_resource type="PackedScene" uid="uid://bd1by80q1v27e" path="res://ShortcutsPopup.tscn" id="13_8eebo"] -[ext_resource type="PackedScene" uid="uid://btupbowehiyyu" path="res://QRPopup.tscn" id="15_qr_window"] -[ext_resource type="PackedScene" uid="uid://cp54idaudb8dp" path="res://AboutPopup.tscn" id="16_about_window"] -[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"] -[ext_resource type="PackedScene" uid="uid://bijh5h5yrivm3" path="res://LogPopup.tscn" id="14_26rwn"] +[ext_resource type="PackedScene" path="res://main/TopBar.tscn" id="top_bar_scene"] +[ext_resource type="PackedScene" path="res://quiz/Quiz.tscn" id="quiz_scene"] +[ext_resource type="Script" uid="uid://b8f4g15cas2j2" path="res://main/main_window.gd" id="1_eu0t5"] +[ext_resource type="PackedScene" uid="uid://bxydgil1yifps" path="res://popups/SearchPopup.tscn" id="9_5ijvr"] +[ext_resource type="PackedScene" uid="uid://dpdem7pdxweb5" path="res://popups/SyncPopup.tscn" id="10_yxw0b"] +[ext_resource type="PackedScene" uid="uid://bd1by80q1v27e" path="res://popups/ShortcutsPopup.tscn" id="13_8eebo"] +[ext_resource type="PackedScene" uid="uid://btupbowehiyyu" path="res://popups/QRPopup.tscn" id="15_qr_window"] +[ext_resource type="PackedScene" uid="uid://cp54idaudb8dp" path="res://popups/AboutPopup.tscn" id="16_about_window"] +[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"] +[ext_resource type="PackedScene" uid="uid://bijh5h5yrivm3" path="res://popups/LogPopup.tscn" id="14_26rwn"] [node name="MainWindow" type="Control" unique_id=407149696] layout_mode = 3 diff --git a/TopBar.tscn b/main/TopBar.tscn similarity index 96% rename from TopBar.tscn rename to main/TopBar.tscn index 167755e..651caef 100644 --- a/TopBar.tscn +++ b/main/TopBar.tscn @@ -1,6 +1,6 @@ [gd_scene format=3] -[ext_resource type="Script" path="res://top_bar.gd" id="top_bar_script"] +[ext_resource type="Script" path="res://main/top_bar.gd" id="top_bar_script"] [sub_resource type="LabelSettings" id="LabelSettings_ychxr"] font_size = 25 diff --git a/main_window.gd b/main/main_window.gd similarity index 100% rename from main_window.gd rename to main/main_window.gd diff --git a/main_window.gd.uid b/main/main_window.gd.uid similarity index 100% rename from main_window.gd.uid rename to main/main_window.gd.uid diff --git a/top_bar.gd b/main/top_bar.gd similarity index 100% rename from top_bar.gd rename to main/top_bar.gd diff --git a/top_bar.gd.uid b/main/top_bar.gd.uid similarity index 100% rename from top_bar.gd.uid rename to main/top_bar.gd.uid diff --git a/MusicPlayer.tscn b/player/MusicPlayer.tscn similarity index 97% rename from MusicPlayer.tscn rename to player/MusicPlayer.tscn index f0a4ebe..72c4ee5 100644 --- a/MusicPlayer.tscn +++ b/player/MusicPlayer.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=10 format=3 uid="uid://ds15cgsf8vpvc"] -[ext_resource type="Script" uid="uid://d1v0rquma6nt8" path="res://music_player.gd" id="1_t24ra"] +[ext_resource type="Script" uid="uid://d1v0rquma6nt8" path="res://player/music_player.gd" id="1_t24ra"] [ext_resource type="AudioStream" uid="uid://n2g8jddr85h2" path="res://sounds/01. Opening.mp3" id="2_xti80"] [ext_resource type="Texture2D" uid="uid://comxqfiykp54f" path="res://icons/play_icon_light.svg" id="3_6g308"] [ext_resource type="Texture2D" uid="uid://ccb6rvbldlgdg" path="res://icons/reload_light_icon.svg" id="4_jleuo"] -[ext_resource type="PackedScene" uid="uid://w400rnew7453" path="res://VolumeSlider.tscn" id="5_iifuj"] +[ext_resource type="PackedScene" uid="uid://w400rnew7453" path="res://player/VolumeSlider.tscn" id="5_iifuj"] [sub_resource type="InputEventKey" id="InputEventKey_r4qo3"] device = -1 diff --git a/VolumeSlider.tscn b/player/VolumeSlider.tscn similarity index 86% rename from VolumeSlider.tscn rename to player/VolumeSlider.tscn index 51ee424..69efbea 100644 --- a/VolumeSlider.tscn +++ b/player/VolumeSlider.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://w400rnew7453"] -[ext_resource type="Script" uid="uid://bgviu7smansj1" path="res://volume_slider.gd" id="1_1aufb"] +[ext_resource type="Script" uid="uid://bgviu7smansj1" path="res://player/volume_slider.gd" id="1_1aufb"] [node name="VolumeSlider" type="HSlider"] offset_right = 8.0 diff --git a/music_player.gd b/player/music_player.gd similarity index 100% rename from music_player.gd rename to player/music_player.gd diff --git a/music_player.gd.uid b/player/music_player.gd.uid similarity index 100% rename from music_player.gd.uid rename to player/music_player.gd.uid diff --git a/volume_slider.gd b/player/volume_slider.gd similarity index 100% rename from volume_slider.gd rename to player/volume_slider.gd diff --git a/volume_slider.gd.uid b/player/volume_slider.gd.uid similarity index 100% rename from volume_slider.gd.uid rename to player/volume_slider.gd.uid diff --git a/AboutPopup.tscn b/popups/AboutPopup.tscn similarity index 93% rename from AboutPopup.tscn rename to popups/AboutPopup.tscn index 24d7b1a..4ea7dba 100644 --- a/AboutPopup.tscn +++ b/popups/AboutPopup.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://cp54idaudb8dp"] -[ext_resource type="Script" uid="uid://b7bh0of7olbcb" path="res://about_popup.gd" id="1_about_script"] -[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"] +[ext_resource type="Script" uid="uid://b7bh0of7olbcb" path="res://popups/about_popup.gd" id="1_about_script"] +[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"] [node name="AboutPopup" type="Control" unique_id=1626010355 node_paths=PackedStringArray("panel")] theme = ExtResource("popup_theme") diff --git a/CharacterCard.tscn b/popups/CharacterCard.tscn similarity index 97% rename from CharacterCard.tscn rename to popups/CharacterCard.tscn index 26b01fb..8e8c19a 100644 --- a/CharacterCard.tscn +++ b/popups/CharacterCard.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=3 uid="uid://c7ecjj2af6usf"] -[ext_resource type="Script" uid="uid://i35b3scbpwpu" path="res://character_card.gd" id="1_pjt0s"] +[ext_resource type="Script" uid="uid://i35b3scbpwpu" path="res://popups/character_card.gd" id="1_pjt0s"] [ext_resource type="Texture2D" uid="uid://cv3hdd6bsruau" path="res://icon.svg" id="2_pjt0s"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_pjt0s"] diff --git a/CharacterSelectPopup.tscn b/popups/CharacterSelectPopup.tscn similarity index 93% rename from CharacterSelectPopup.tscn rename to popups/CharacterSelectPopup.tscn index c53b3b1..d744d71 100644 --- a/CharacterSelectPopup.tscn +++ b/popups/CharacterSelectPopup.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://cdy4kvemwaiom"] -[ext_resource type="Script" uid="uid://cvffg87wr6r3y" path="res://character_select_popup.gd" id="1_h4tdp"] -[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"] +[ext_resource type="Script" uid="uid://cvffg87wr6r3y" path="res://popups/character_select_popup.gd" id="1_h4tdp"] +[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"] [sub_resource type="LabelSettings" id="LabelSettings_p4iny"] font_size = 25 diff --git a/LogPopup.tscn b/popups/LogPopup.tscn similarity index 91% rename from LogPopup.tscn rename to popups/LogPopup.tscn index c55de8c..9b4a184 100644 --- a/LogPopup.tscn +++ b/popups/LogPopup.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=2 format=3 uid="uid://bijh5h5yrivm3"] -[ext_resource type="Script" uid="uid://cw41y87l64qo7" path="res://log_popup.gd" id="1_q72ua"] -[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"] +[ext_resource type="Script" uid="uid://cw41y87l64qo7" path="res://popups/log_popup.gd" id="1_q72ua"] +[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"] [node name="LogPopup" type="Control" node_paths=PackedStringArray("panel")] theme = ExtResource("popup_theme") diff --git a/QRPopup.tscn b/popups/QRPopup.tscn similarity index 92% rename from QRPopup.tscn rename to popups/QRPopup.tscn index e0e10cd..dd11212 100644 --- a/QRPopup.tscn +++ b/popups/QRPopup.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://btupbowehiyyu"] -[ext_resource type="Script" uid="uid://bsa6xg5xos6h7" path="res://qr_popup.gd" id="1_qr_script"] +[ext_resource type="Script" uid="uid://bsa6xg5xos6h7" path="res://popups/qr_popup.gd" id="1_qr_script"] [ext_resource type="Script" uid="uid://dynulhnyq5hpq" path="res://addons/kenyoni/qr_code/qr_code_rect.gd" id="2_jpsxt"] -[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"] +[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"] [node name="QRPopup" type="Control" unique_id=1996957585 node_paths=PackedStringArray("panel")] theme = ExtResource("popup_theme") diff --git a/SearchPopup.tscn b/popups/SearchPopup.tscn similarity index 91% rename from SearchPopup.tscn rename to popups/SearchPopup.tscn index 24824c1..14e5e31 100644 --- a/SearchPopup.tscn +++ b/popups/SearchPopup.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://bxydgil1yifps"] -[ext_resource type="Script" uid="uid://bg5yo08638600" path="res://search_popup.gd" id="1_m7bij"] -[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"] +[ext_resource type="Script" uid="uid://bg5yo08638600" path="res://popups/search_popup.gd" id="1_m7bij"] +[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"] [node name="SearchPopup" type="Control" unique_id=616238617 node_paths=PackedStringArray("panel")] theme = ExtResource("popup_theme") diff --git a/SettingsPopup.tscn b/popups/SettingsPopup.tscn similarity index 98% rename from SettingsPopup.tscn rename to popups/SettingsPopup.tscn index 10762b9..8db4373 100644 --- a/SettingsPopup.tscn +++ b/popups/SettingsPopup.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://dldpeo5y3l5hq"] -[ext_resource type="Script" uid="uid://dukqyjoduf1af" path="res://settings_popup.gd" id="1_bt55j"] -[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"] +[ext_resource type="Script" uid="uid://dukqyjoduf1af" path="res://popups/settings_popup.gd" id="1_bt55j"] +[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"] [sub_resource type="LabelSettings" id="LabelSettings_3xrlm"] font_size = 25 diff --git a/ShortcutsPopup.tscn b/popups/ShortcutsPopup.tscn similarity index 92% rename from ShortcutsPopup.tscn rename to popups/ShortcutsPopup.tscn index d007ec4..768ce29 100644 --- a/ShortcutsPopup.tscn +++ b/popups/ShortcutsPopup.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=2 format=3 uid="uid://bd1by80q1v27e"] -[ext_resource type="Script" uid="uid://rolypd0cqd6h" path="res://shortcuts_popup.gd" id="1_12pxi"] -[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"] +[ext_resource type="Script" uid="uid://rolypd0cqd6h" path="res://popups/shortcuts_popup.gd" id="1_12pxi"] +[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"] [node name="ShortcutsPopup" type="Control" node_paths=PackedStringArray("panel")] theme = ExtResource("popup_theme") diff --git a/SyncPopup.tscn b/popups/SyncPopup.tscn similarity index 98% rename from SyncPopup.tscn rename to popups/SyncPopup.tscn index 885aeb5..5f9aa8d 100644 --- a/SyncPopup.tscn +++ b/popups/SyncPopup.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://dpdem7pdxweb5"] -[ext_resource type="Script" uid="uid://c3ejukwth512a" path="res://sync_popup.gd" id="1_8ba47"] -[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"] +[ext_resource type="Script" uid="uid://c3ejukwth512a" path="res://popups/sync_popup.gd" id="1_8ba47"] +[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"] [sub_resource type="LabelSettings" id="LabelSettings_anbfi"] font_size = 25 diff --git a/WinnerPopup.tscn b/popups/WinnerPopup.tscn similarity index 92% rename from WinnerPopup.tscn rename to popups/WinnerPopup.tscn index 5c579d1..f4727be 100644 --- a/WinnerPopup.tscn +++ b/popups/WinnerPopup.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://cxlsmxnrp0agh"] -[ext_resource type="Script" uid="uid://dxpb22xbwf3t1" path="res://winner_popup.gd" id="1_winner_script"] +[ext_resource type="Script" uid="uid://dxpb22xbwf3t1" path="res://popups/winner_popup.gd" id="1_winner_script"] [ext_resource type="Texture2D" uid="uid://r4as0nmtoa7p" path="res://noCharacter.png" id="2_no_character"] -[ext_resource type="Theme" path="res://popup_theme.tres" id="popup_theme"] +[ext_resource type="Theme" path="res://themes/popup_theme.tres" id="popup_theme"] [sub_resource type="LabelSettings" id="LabelSettings_hr75l"] font_size = 35 diff --git a/about_popup.gd b/popups/about_popup.gd similarity index 100% rename from about_popup.gd rename to popups/about_popup.gd diff --git a/about_popup.gd.uid b/popups/about_popup.gd.uid similarity index 100% rename from about_popup.gd.uid rename to popups/about_popup.gd.uid diff --git a/base_popup.gd b/popups/base_popup.gd similarity index 100% rename from base_popup.gd rename to popups/base_popup.gd diff --git a/base_popup.gd.uid b/popups/base_popup.gd.uid similarity index 100% rename from base_popup.gd.uid rename to popups/base_popup.gd.uid diff --git a/character_card.gd b/popups/character_card.gd similarity index 100% rename from character_card.gd rename to popups/character_card.gd diff --git a/character_card.gd.uid b/popups/character_card.gd.uid similarity index 100% rename from character_card.gd.uid rename to popups/character_card.gd.uid diff --git a/character_select_popup.gd b/popups/character_select_popup.gd similarity index 96% rename from character_select_popup.gd rename to popups/character_select_popup.gd index 79d0162..7b1b250 100644 --- a/character_select_popup.gd +++ b/popups/character_select_popup.gd @@ -5,7 +5,7 @@ extends BasePopup signal character_selected(texture: ImageTexture) var can_select_character: bool = false -var character: PackedScene = preload("res://CharacterCard.tscn") +var character: PackedScene = preload("res://popups/CharacterCard.tscn") @onready var character_panel: Panel = %CharacterPanel @onready var title_label: Label = %TitleLabel diff --git a/character_select_popup.gd.uid b/popups/character_select_popup.gd.uid similarity index 100% rename from character_select_popup.gd.uid rename to popups/character_select_popup.gd.uid diff --git a/log_popup.gd b/popups/log_popup.gd similarity index 100% rename from log_popup.gd rename to popups/log_popup.gd diff --git a/log_popup.gd.uid b/popups/log_popup.gd.uid similarity index 100% rename from log_popup.gd.uid rename to popups/log_popup.gd.uid diff --git a/popup_backdrop.gd b/popups/popup_backdrop.gd similarity index 100% rename from popup_backdrop.gd rename to popups/popup_backdrop.gd diff --git a/popup_backdrop.gd.uid b/popups/popup_backdrop.gd.uid similarity index 100% rename from popup_backdrop.gd.uid rename to popups/popup_backdrop.gd.uid diff --git a/qr_popup.gd b/popups/qr_popup.gd similarity index 100% rename from qr_popup.gd rename to popups/qr_popup.gd diff --git a/qr_popup.gd.uid b/popups/qr_popup.gd.uid similarity index 100% rename from qr_popup.gd.uid rename to popups/qr_popup.gd.uid diff --git a/search_popup.gd b/popups/search_popup.gd similarity index 100% rename from search_popup.gd rename to popups/search_popup.gd diff --git a/search_popup.gd.uid b/popups/search_popup.gd.uid similarity index 100% rename from search_popup.gd.uid rename to popups/search_popup.gd.uid diff --git a/settings_popup.gd b/popups/settings_popup.gd similarity index 100% rename from settings_popup.gd rename to popups/settings_popup.gd diff --git a/settings_popup.gd.uid b/popups/settings_popup.gd.uid similarity index 100% rename from settings_popup.gd.uid rename to popups/settings_popup.gd.uid diff --git a/shortcuts_popup.gd b/popups/shortcuts_popup.gd similarity index 100% rename from shortcuts_popup.gd rename to popups/shortcuts_popup.gd diff --git a/shortcuts_popup.gd.uid b/popups/shortcuts_popup.gd.uid similarity index 100% rename from shortcuts_popup.gd.uid rename to popups/shortcuts_popup.gd.uid diff --git a/sync_popup.gd b/popups/sync_popup.gd similarity index 100% rename from sync_popup.gd rename to popups/sync_popup.gd diff --git a/sync_popup.gd.uid b/popups/sync_popup.gd.uid similarity index 100% rename from sync_popup.gd.uid rename to popups/sync_popup.gd.uid diff --git a/winner_popup.gd b/popups/winner_popup.gd similarity index 100% rename from winner_popup.gd rename to popups/winner_popup.gd diff --git a/winner_popup.gd.uid b/popups/winner_popup.gd.uid similarity index 100% rename from winner_popup.gd.uid rename to popups/winner_popup.gd.uid diff --git a/project.godot b/project.godot index acd7692..c56b1e7 100644 --- a/project.godot +++ b/project.godot @@ -16,16 +16,16 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true config/name="MusicPlayer" config/version="1.9.0" -run/main_scene="res://MainWindow.tscn" +run/main_scene="res://main/MainWindow.tscn" config/features=PackedStringArray("4.7", "GL Compatibility") config/icon="res://icon.svg" [autoload] -GameLog="*res://game_log.gd" -Settings="*res://settings.gd" -Playlist="*res://playlist.gd" -MusicServerClient="*res://music_server_client.gd" +GameLog="*res://common/game_log.gd" +Settings="*res://data/settings.gd" +Playlist="*res://data/playlist.gd" +MusicServerClient="*res://server/music_server_client.gd" [debug] diff --git a/InspirationList.tscn b/quiz/InspirationList.tscn similarity index 91% rename from InspirationList.tscn rename to quiz/InspirationList.tscn index 4ec42ea..717d103 100644 --- a/InspirationList.tscn +++ b/quiz/InspirationList.tscn @@ -1,6 +1,6 @@ [gd_scene format=3] -[ext_resource type="Script" uid="uid://elgn7gkxgagq" path="res://inspiration_list.gd" id="2_gxtxm"] +[ext_resource type="Script" uid="uid://elgn7gkxgagq" path="res://quiz/inspiration_list.gd" id="2_gxtxm"] [node name="InspirationList" type="ScrollContainer" unique_id=498283761] layout_mode = 3 diff --git a/MusicListPanel.tscn b/quiz/MusicListPanel.tscn similarity index 80% rename from MusicListPanel.tscn rename to quiz/MusicListPanel.tscn index bd5b44e..8b2c94c 100644 --- a/MusicListPanel.tscn +++ b/quiz/MusicListPanel.tscn @@ -1,8 +1,8 @@ [gd_scene format=3] -[ext_resource type="Script" path="res://music_list_panel.gd" id="part_script"] -[ext_resource type="Script" uid="uid://gf1bk6xbe3j" path="res://scroll_to_end_container.gd" id="7_dj026"] -[ext_resource type="Theme" uid="uid://rxexo3ur85as" path="res://light_gray_theme.tres" id="7_wxbv6"] +[ext_resource type="Script" path="res://quiz/music_list_panel.gd" id="part_script"] +[ext_resource type="Script" uid="uid://gf1bk6xbe3j" path="res://quiz/scroll_to_end_container.gd" id="7_dj026"] +[ext_resource type="Theme" uid="uid://rxexo3ur85as" path="res://themes/light_gray_theme.tres" id="7_wxbv6"] [node name="MusicListPanel" type="PanelContainer" unique_id=2011292375] layout_mode = 3 diff --git a/NowPlaying.tscn b/quiz/NowPlaying.tscn similarity index 90% rename from NowPlaying.tscn rename to quiz/NowPlaying.tscn index 3609c9c..fcf4343 100644 --- a/NowPlaying.tscn +++ b/quiz/NowPlaying.tscn @@ -1,6 +1,6 @@ [gd_scene format=3] -[ext_resource type="Script" path="res://now_playing.gd" id="part_script"] +[ext_resource type="Script" path="res://quiz/now_playing.gd" id="part_script"] [sub_resource type="LabelSettings" id="LabelSettings_qspbu"] font_size = 50 diff --git a/PlayerRow.tscn b/quiz/PlayerRow.tscn similarity index 98% rename from PlayerRow.tscn rename to quiz/PlayerRow.tscn index 7e7e0c3..ff7079c 100644 --- a/PlayerRow.tscn +++ b/quiz/PlayerRow.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://cslogy2csnd7a"] -[ext_resource type="Script" uid="uid://dl6no2wr2c86y" path="res://player_row.gd" id="1_if4kc"] +[ext_resource type="Script" uid="uid://dl6no2wr2c86y" path="res://quiz/player_row.gd" id="1_if4kc"] [ext_resource type="Texture2D" uid="uid://r4as0nmtoa7p" path="res://noCharacter.png" id="2_hpj3s"] [ext_resource type="Texture2D" uid="uid://b2kj6m8qpsgb1" path="res://icons/person_remove_light.svg" id="3_j3uxe"] diff --git a/PlayersPanel.tscn b/quiz/PlayersPanel.tscn similarity index 96% rename from PlayersPanel.tscn rename to quiz/PlayersPanel.tscn index c5bc826..4990c2f 100644 --- a/PlayersPanel.tscn +++ b/quiz/PlayersPanel.tscn @@ -1,8 +1,8 @@ [gd_scene format=3] -[ext_resource type="Script" path="res://players_panel.gd" id="part_script"] +[ext_resource type="Script" path="res://quiz/players_panel.gd" id="part_script"] [ext_resource type="Texture2D" uid="uid://bcfmpd7h512ef" path="res://icons/person_add_light.svg" id="5_31tjv"] -[ext_resource type="Script" uid="uid://cgakje8gb37tf" path="res://player_name_field.gd" id="7_qsdfy"] +[ext_resource type="Script" uid="uid://cgakje8gb37tf" path="res://quiz/player_name_field.gd" id="7_qsdfy"] [sub_resource type="InputEventKey" id="InputEventKey_03bm3"] device = -1 diff --git a/Quiz.tscn b/quiz/Quiz.tscn similarity index 79% rename from Quiz.tscn rename to quiz/Quiz.tscn index 27cc129..2e793c4 100644 --- a/Quiz.tscn +++ b/quiz/Quiz.tscn @@ -1,17 +1,17 @@ [gd_scene format=3] -[ext_resource type="Script" path="res://quiz.gd" id="quiz_script"] -[ext_resource type="PackedScene" uid="uid://ds15cgsf8vpvc" path="res://MusicPlayer.tscn" id="5_emn36"] -[ext_resource type="PackedScene" uid="uid://cdy4kvemwaiom" path="res://CharacterSelectPopup.tscn" id="6_dhrvg"] -[ext_resource type="PackedScene" uid="uid://dldpeo5y3l5hq" path="res://SettingsPopup.tscn" id="11_k62u5"] -[ext_resource type="PackedScene" uid="uid://cxlsmxnrp0agh" path="res://WinnerPopup.tscn" id="17_winner_window"] -[ext_resource type="PackedScene" path="res://MusicListPanel.tscn" id="scene_MusicListPanel"] -[ext_resource type="PackedScene" path="res://PlayersPanel.tscn" id="scene_PlayersPanel"] -[ext_resource type="PackedScene" path="res://InspirationList.tscn" id="scene_InspirationList"] -[ext_resource type="PackedScene" path="res://QuizToolbar.tscn" id="scene_QuizToolbar"] -[ext_resource type="PackedScene" path="res://SongControls.tscn" id="scene_SongControls"] -[ext_resource type="PackedScene" path="res://NowPlaying.tscn" id="scene_NowPlaying"] -[ext_resource type="Script" path="res://song_loader.gd" id="song_loader_script"] +[ext_resource type="Script" path="res://quiz/quiz.gd" id="quiz_script"] +[ext_resource type="PackedScene" uid="uid://ds15cgsf8vpvc" path="res://player/MusicPlayer.tscn" id="5_emn36"] +[ext_resource type="PackedScene" uid="uid://cdy4kvemwaiom" path="res://popups/CharacterSelectPopup.tscn" id="6_dhrvg"] +[ext_resource type="PackedScene" uid="uid://dldpeo5y3l5hq" path="res://popups/SettingsPopup.tscn" id="11_k62u5"] +[ext_resource type="PackedScene" uid="uid://cxlsmxnrp0agh" path="res://popups/WinnerPopup.tscn" id="17_winner_window"] +[ext_resource type="PackedScene" path="res://quiz/MusicListPanel.tscn" id="scene_MusicListPanel"] +[ext_resource type="PackedScene" path="res://quiz/PlayersPanel.tscn" id="scene_PlayersPanel"] +[ext_resource type="PackedScene" path="res://quiz/InspirationList.tscn" id="scene_InspirationList"] +[ext_resource type="PackedScene" path="res://quiz/QuizToolbar.tscn" id="scene_QuizToolbar"] +[ext_resource type="PackedScene" path="res://quiz/SongControls.tscn" id="scene_SongControls"] +[ext_resource type="PackedScene" path="res://quiz/NowPlaying.tscn" id="scene_NowPlaying"] +[ext_resource type="Script" path="res://quiz/song_loader.gd" id="song_loader_script"] [node name="Quiz" type="Control" unique_id=1146705218] layout_mode = 3 diff --git a/QuizToolbar.tscn b/quiz/QuizToolbar.tscn similarity index 92% rename from QuizToolbar.tscn rename to quiz/QuizToolbar.tscn index 647ad75..d03b7e6 100644 --- a/QuizToolbar.tscn +++ b/quiz/QuizToolbar.tscn @@ -1,6 +1,6 @@ [gd_scene format=3] -[ext_resource type="Script" path="res://quiz_toolbar.gd" id="part_script"] +[ext_resource type="Script" path="res://quiz/quiz_toolbar.gd" id="part_script"] [node name="QuizToolbar" type="Control" unique_id=1873301941] layout_mode = 3 diff --git a/SongControls.tscn b/quiz/SongControls.tscn similarity index 93% rename from SongControls.tscn rename to quiz/SongControls.tscn index 86a51ac..8df5f48 100644 --- a/SongControls.tscn +++ b/quiz/SongControls.tscn @@ -1,6 +1,6 @@ [gd_scene format=3] -[ext_resource type="Script" path="res://song_controls.gd" id="part_script"] +[ext_resource type="Script" path="res://quiz/song_controls.gd" id="part_script"] [sub_resource type="InputEventKey" id="InputEventKey_06rl4"] device = -1 diff --git a/SongRow.tscn b/quiz/SongRow.tscn similarity index 94% rename from SongRow.tscn rename to quiz/SongRow.tscn index ae3819c..922c9de 100644 --- a/SongRow.tscn +++ b/quiz/SongRow.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=3 uid="uid://1jbtmhbqolqe"] [ext_resource type="Texture2D" uid="uid://c8r7ykphss4c2" path="res://characters/Link.png" id="1_ll28s"] -[ext_resource type="Script" uid="uid://cjo13wixip8mq" path="res://song_row.gd" id="1_lspki"] -[ext_resource type="Theme" uid="uid://8bllart6xn1f" path="res://default_theme.tres" id="1_x7fq8"] -[ext_resource type="StyleBox" uid="uid://bsv6yb0yir04l" path="res://style_box_flat.tres" id="3_5h84f"] +[ext_resource type="Script" uid="uid://cjo13wixip8mq" path="res://quiz/song_row.gd" id="1_lspki"] +[ext_resource type="Theme" uid="uid://8bllart6xn1f" path="res://themes/default_theme.tres" id="1_x7fq8"] +[ext_resource type="StyleBox" uid="uid://bsv6yb0yir04l" path="res://themes/style_box_flat.tres" id="3_5h84f"] [node name="SongRow" type="PanelContainer"] custom_minimum_size = Vector2(1000, 0) diff --git a/inspiration_list.gd b/quiz/inspiration_list.gd similarity index 100% rename from inspiration_list.gd rename to quiz/inspiration_list.gd diff --git a/inspiration_list.gd.uid b/quiz/inspiration_list.gd.uid similarity index 100% rename from inspiration_list.gd.uid rename to quiz/inspiration_list.gd.uid diff --git a/music_list_panel.gd b/quiz/music_list_panel.gd similarity index 92% rename from music_list_panel.gd rename to quiz/music_list_panel.gd index 87d3d12..ec8b90b 100644 --- a/music_list_panel.gd +++ b/quiz/music_list_panel.gd @@ -6,7 +6,7 @@ extends PanelContainer signal song_clicked(song_no: int) -var _song_list_object: PackedScene = preload("res://SongRow.tscn") +var _song_list_object: PackedScene = preload("res://quiz/SongRow.tscn") @onready var _rows: VBoxContainer = %MusicList diff --git a/music_list_panel.gd.uid b/quiz/music_list_panel.gd.uid similarity index 100% rename from music_list_panel.gd.uid rename to quiz/music_list_panel.gd.uid diff --git a/now_playing.gd b/quiz/now_playing.gd similarity index 100% rename from now_playing.gd rename to quiz/now_playing.gd diff --git a/now_playing.gd.uid b/quiz/now_playing.gd.uid similarity index 100% rename from now_playing.gd.uid rename to quiz/now_playing.gd.uid diff --git a/player_name_field.gd b/quiz/player_name_field.gd similarity index 100% rename from player_name_field.gd rename to quiz/player_name_field.gd diff --git a/player_name_field.gd.uid b/quiz/player_name_field.gd.uid similarity index 100% rename from player_name_field.gd.uid rename to quiz/player_name_field.gd.uid diff --git a/player_row.gd b/quiz/player_row.gd similarity index 100% rename from player_row.gd rename to quiz/player_row.gd diff --git a/player_row.gd.uid b/quiz/player_row.gd.uid similarity index 100% rename from player_row.gd.uid rename to quiz/player_row.gd.uid diff --git a/players_panel.gd b/quiz/players_panel.gd similarity index 97% rename from players_panel.gd rename to quiz/players_panel.gd index ee3fd01..f542f78 100644 --- a/players_panel.gd +++ b/quiz/players_panel.gd @@ -16,7 +16,7 @@ signal player_removed(player_object: PlayerObject) ## Emitted when the character button in [param row] is pressed. signal change_character_requested(row: PlayerRow, player_name: String) -var _player_row: PackedScene = preload("res://PlayerRow.tscn") +var _player_row: PackedScene = preload("res://quiz/PlayerRow.tscn") @onready var add_players_button: TextureButton = %AddPlayersButton @onready var add_player_container: HBoxContainer = %AddPlayerContainer diff --git a/players_panel.gd.uid b/quiz/players_panel.gd.uid similarity index 100% rename from players_panel.gd.uid rename to quiz/players_panel.gd.uid diff --git a/quiz.gd b/quiz/quiz.gd similarity index 100% rename from quiz.gd rename to quiz/quiz.gd diff --git a/quiz.gd.uid b/quiz/quiz.gd.uid similarity index 100% rename from quiz.gd.uid rename to quiz/quiz.gd.uid diff --git a/quiz_toolbar.gd b/quiz/quiz_toolbar.gd similarity index 100% rename from quiz_toolbar.gd rename to quiz/quiz_toolbar.gd diff --git a/quiz_toolbar.gd.uid b/quiz/quiz_toolbar.gd.uid similarity index 100% rename from quiz_toolbar.gd.uid rename to quiz/quiz_toolbar.gd.uid diff --git a/scroll_to_end_container.gd b/quiz/scroll_to_end_container.gd similarity index 100% rename from scroll_to_end_container.gd rename to quiz/scroll_to_end_container.gd diff --git a/scroll_to_end_container.gd.uid b/quiz/scroll_to_end_container.gd.uid similarity index 100% rename from scroll_to_end_container.gd.uid rename to quiz/scroll_to_end_container.gd.uid diff --git a/song_controls.gd b/quiz/song_controls.gd similarity index 100% rename from song_controls.gd rename to quiz/song_controls.gd diff --git a/song_controls.gd.uid b/quiz/song_controls.gd.uid similarity index 100% rename from song_controls.gd.uid rename to quiz/song_controls.gd.uid diff --git a/song_loader.gd b/quiz/song_loader.gd similarity index 100% rename from song_loader.gd rename to quiz/song_loader.gd diff --git a/song_loader.gd.uid b/quiz/song_loader.gd.uid similarity index 100% rename from song_loader.gd.uid rename to quiz/song_loader.gd.uid diff --git a/song_row.gd b/quiz/song_row.gd similarity index 100% rename from song_row.gd rename to quiz/song_row.gd diff --git a/song_row.gd.uid b/quiz/song_row.gd.uid similarity index 100% rename from song_row.gd.uid rename to quiz/song_row.gd.uid diff --git a/http_transport.gd b/server/http_transport.gd similarity index 100% rename from http_transport.gd rename to server/http_transport.gd diff --git a/http_transport.gd.uid b/server/http_transport.gd.uid similarity index 100% rename from http_transport.gd.uid rename to server/http_transport.gd.uid diff --git a/music_server_client.gd b/server/music_server_client.gd similarity index 100% rename from music_server_client.gd rename to server/music_server_client.gd diff --git a/music_server_client.gd.uid b/server/music_server_client.gd.uid similarity index 100% rename from music_server_client.gd.uid rename to server/music_server_client.gd.uid diff --git a/tests/fakes/main_window_test_suite.gd b/tests/fakes/main_window_test_suite.gd index c34e4ef..0c81848 100644 --- a/tests/fakes/main_window_test_suite.gd +++ b/tests/fakes/main_window_test_suite.gd @@ -38,7 +38,7 @@ func before_test() -> void: _server.respond_bytes("/music/played?song=0", PackedByteArray()) _before_window_starts() - _runner = scene_runner("res://MainWindow.tscn") + _runner = scene_runner("res://main/MainWindow.tscn") _window = _runner.scene() _quiz = _window.get_node("Quiz") # The debug build lowers the winning score on startup; keep it out of reach diff --git a/tests/integration/test_inspiration_list.gd b/tests/integration/test_inspiration_list.gd index b0a5d77..31e8890 100644 --- a/tests/integration/test_inspiration_list.gd +++ b/tests/integration/test_inspiration_list.gd @@ -15,7 +15,7 @@ func before_test() -> void: Settings.inspiration_list_speed = 0 _server = FakeHttpTransport.new().install() _server.respond_json("/music/all", SOUNDTRACKS) - _runner = scene_runner("res://InspirationList.tscn") + _runner = scene_runner("res://quiz/InspirationList.tscn") _list = _runner.scene() diff --git a/tests/integration/test_layout_unchanged.gd b/tests/integration/test_layout_unchanged.gd index 06c1673..a343e4f 100644 --- a/tests/integration/test_layout_unchanged.gd +++ b/tests/integration/test_layout_unchanged.gd @@ -86,7 +86,7 @@ func before() -> void: viewport.size = Vector2i(1920, 1080) viewport.gui_embed_subwindows = true Engine.get_main_loop().root.add_child(viewport) - _main = load("res://MainWindow.tscn").instantiate() + _main = load("res://main/MainWindow.tscn").instantiate() viewport.add_child(_main) await UiTour.new(_main).run(func(state: String, popup: Node) -> void: _layout[state] = UiTour.dump_layout(_main, _main if popup == null else popup)) diff --git a/tests/integration/test_music_list_panel.gd b/tests/integration/test_music_list_panel.gd index 309c017..73037f6 100644 --- a/tests/integration/test_music_list_panel.gd +++ b/tests/integration/test_music_list_panel.gd @@ -17,7 +17,7 @@ func before_test() -> void: song.song_title = "Song %d" % i song.has_played = true Playlist.add_to_playlist(song) - _runner = scene_runner("res://MusicListPanel.tscn") + _runner = scene_runner("res://quiz/MusicListPanel.tscn") _panel = _runner.scene() diff --git a/tests/integration/test_music_player_scene.gd b/tests/integration/test_music_player_scene.gd index 0297795..2080ab5 100644 --- a/tests/integration/test_music_player_scene.gd +++ b/tests/integration/test_music_player_scene.gd @@ -9,7 +9,7 @@ var _player: MusicPlayer func before_test() -> void: _snapshot = AutoloadSnapshot.take([Settings]) Settings.auto_repeat_song = true - _runner = scene_runner("res://MusicPlayer.tscn") + _runner = scene_runner("res://player/MusicPlayer.tscn") _player = _runner.scene() diff --git a/tests/integration/test_now_playing.gd b/tests/integration/test_now_playing.gd index 86f726c..f813dfd 100644 --- a/tests/integration/test_now_playing.gd +++ b/tests/integration/test_now_playing.gd @@ -6,7 +6,7 @@ var _now_playing: NowPlaying func before_test() -> void: - _runner = scene_runner("res://NowPlaying.tscn") + _runner = scene_runner("res://quiz/NowPlaying.tscn") _now_playing = _runner.scene() diff --git a/tests/integration/test_players_panel.gd b/tests/integration/test_players_panel.gd index c11c97d..85afdc4 100644 --- a/tests/integration/test_players_panel.gd +++ b/tests/integration/test_players_panel.gd @@ -11,7 +11,7 @@ func before_test() -> void: _snapshot = AutoloadSnapshot.take([Settings]) Settings.player_array.clear() Settings.edit_players = false - _runner = scene_runner("res://PlayersPanel.tscn") + _runner = scene_runner("res://quiz/PlayersPanel.tscn") _panel = _runner.scene() diff --git a/tests/integration/test_quiz_toolbar.gd b/tests/integration/test_quiz_toolbar.gd index 8ac2ca8..8a9800f 100644 --- a/tests/integration/test_quiz_toolbar.gd +++ b/tests/integration/test_quiz_toolbar.gd @@ -14,7 +14,7 @@ var _toolbar: QuizToolbar func before_test() -> void: - _runner = scene_runner("res://QuizToolbar.tscn") + _runner = scene_runner("res://quiz/QuizToolbar.tscn") _toolbar = _runner.scene() diff --git a/tests/integration/test_scene_split.gd b/tests/integration/test_scene_split.gd index 5d8b100..162072c 100644 --- a/tests/integration/test_scene_split.gd +++ b/tests/integration/test_scene_split.gd @@ -9,6 +9,17 @@ const MAIN_WINDOW_CHILDREN: Array[String] = [ "ShortcutsPopup", "StatisticsPopupPanel", "AboutPopup", "LogPopup", ] +## The parts of the quiz and the scene each one comes from. +const QUIZ_PART_SCENES: Dictionary = { + "MusicListPanel": "res://quiz/MusicListPanel.tscn", + "PlayersPanel": "res://quiz/PlayersPanel.tscn", + "InspirationList": "res://quiz/InspirationList.tscn", + "NowPlaying": "res://quiz/NowPlaying.tscn", + "QuizToolbar": "res://quiz/QuizToolbar.tscn", + "SongControls": "res://quiz/SongControls.tscn", + "MusicPlayer": "res://player/MusicPlayer.tscn", +} + ## The quiz buttons that are disabled while the server syncs. const LOCKED_BY_SYNC: Array[String] = [ "QuizToolbar/SoundTestButton", "QuizToolbar/ResetPlaylistButton", @@ -57,10 +68,9 @@ func test_top_bar_is_drawn_below_the_quiz() -> void: func test_quiz_parts_are_their_own_scenes() -> void: - for node_name: String in ["MusicListPanel", "PlayersPanel", "InspirationList", - "NowPlaying", "QuizToolbar", "SongControls", "MusicPlayer"]: + for node_name: String in QUIZ_PART_SCENES: assert_str(_quiz.get_node(node_name).scene_file_path) \ - .is_equal("res://%s.tscn" % node_name) + .is_equal(QUIZ_PART_SCENES[node_name]) func test_quiz_downloads_songs_with_a_song_loader() -> void: diff --git a/tests/integration/test_song_controls.gd b/tests/integration/test_song_controls.gd index 7d34630..4eb8a15 100644 --- a/tests/integration/test_song_controls.gd +++ b/tests/integration/test_song_controls.gd @@ -7,7 +7,7 @@ var _controls: SongControls func before_test() -> void: - _runner = scene_runner("res://SongControls.tscn") + _runner = scene_runner("res://quiz/SongControls.tscn") _controls = _runner.scene() diff --git a/tests/integration/test_sync_popup.gd b/tests/integration/test_sync_popup.gd index cbadbcd..ba8bb25 100644 --- a/tests/integration/test_sync_popup.gd +++ b/tests/integration/test_sync_popup.gd @@ -12,7 +12,7 @@ func before_test() -> void: Settings.currently_syncing = false _server = FakeHttpTransport.new().install() _server.respond_bytes("/sync", PackedByteArray()) - _runner = scene_runner("res://SyncPopup.tscn") + _runner = scene_runner("res://popups/SyncPopup.tscn") _window = _runner.scene() diff --git a/tests/unit/test_search.gd b/tests/unit/test_search.gd index 8b4454b..0b0a567 100644 --- a/tests/unit/test_search.gd +++ b/tests/unit/test_search.gd @@ -1,7 +1,7 @@ extends GdUnitTestSuite ## How the search popup finds and orders matching soundtracks. -const SearchWindowScript: GDScript = preload("res://search_popup.gd") +const SearchWindowScript: GDScript = preload("res://popups/search_popup.gd") var _search: Control diff --git a/default_theme.tres b/themes/default_theme.tres similarity index 81% rename from default_theme.tres rename to themes/default_theme.tres index 8f931a5..c448637 100644 --- a/default_theme.tres +++ b/themes/default_theme.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" load_steps=2 format=3 uid="uid://8bllart6xn1f"] -[ext_resource type="StyleBox" uid="uid://bsv6yb0yir04l" path="res://style_box_flat.tres" id="1_uierc"] +[ext_resource type="StyleBox" uid="uid://bsv6yb0yir04l" path="res://themes/style_box_flat.tres" id="1_uierc"] [resource] PanelContainer/styles/panel = ExtResource("1_uierc") diff --git a/light_gray_theme.tres b/themes/light_gray_theme.tres similarity index 84% rename from light_gray_theme.tres rename to themes/light_gray_theme.tres index c48b64e..bcecef7 100644 --- a/light_gray_theme.tres +++ b/themes/light_gray_theme.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" load_steps=2 format=3 uid="uid://rxexo3ur85as"] -[ext_resource type="StyleBox" uid="uid://blf3g88mugovr" path="res://neutral_gray.tres" id="1_alhp2"] +[ext_resource type="StyleBox" uid="uid://blf3g88mugovr" path="res://themes/neutral_gray.tres" id="1_alhp2"] [resource] Label/styles/normal = ExtResource("1_alhp2") diff --git a/neutral_gray.tres b/themes/neutral_gray.tres similarity index 100% rename from neutral_gray.tres rename to themes/neutral_gray.tres diff --git a/popup_theme.tres b/themes/popup_theme.tres similarity index 100% rename from popup_theme.tres rename to themes/popup_theme.tres diff --git a/style_box_flat.tres b/themes/style_box_flat.tres similarity index 100% rename from style_box_flat.tres rename to themes/style_box_flat.tres diff --git a/tools/take_screenshots.gd b/tools/take_screenshots.gd index 1459e3b..1ac2973 100644 --- a/tools/take_screenshots.gd +++ b/tools/take_screenshots.gd @@ -33,7 +33,7 @@ func _take() -> void: viewport.gui_embed_subwindows = true viewport.render_target_update_mode = SubViewport.UPDATE_ALWAYS root.add_child(viewport) - var main: Control = load("res://MainWindow.tscn").instantiate() + var main: Control = load("res://main/MainWindow.tscn").instantiate() viewport.add_child(main) var layout: Dictionary = {}