Further improve performance of autoloads (#179)

Author: valkyrienyanko

Framework/GodotUtils

@@ -1,37 +1,16 @@
-[gd_scene load_steps=11 format=3 uid="uid://cj4fbh1a1lpq4"]
+[gd_scene load_steps=4 format=3 uid="uid://cj4fbh1a1lpq4"]
 
 [ext_resource type="Script" uid="uid://cdt2k6s3xm13g" path="res://Framework/GodotUtils/Autoloads/Global.cs" id="1_byaaa"]
-[ext_resource type="Script" uid="uid://ct4og8hi8urvd" path="res://Framework/GodotUtils/Components/ComponentManager.cs" id="2_6wcni"]
-[ext_resource type="Script" uid="uid://2ai8vctcbook" path="res://Framework/Scenes/Commands.cs" id="2_rdl47"]
-[ext_resource type="Script" uid="uid://di53rvtypdwb0" path="res://Framework/GodotUtils/Autoloads/SceneManager.cs" id="3_31ojt"]
-[ext_resource type="PackedScene" uid="uid://d4a5xfmaulku1" path="res://Framework/Scenes/MenuUI/MainMenu/MainMenu.tscn" id="4_v8bjg"]
-[ext_resource type="PackedScene" uid="uid://d1jo48n2hdkih" path="res://Framework/GodotUtils/ModLoader/ModLoader.tscn" id="5_rdl47"]
-[ext_resource type="PackedScene" uid="uid://7tfets4irkba" path="res://Framework/Scenes/MenuUI/Options/Options.tscn" id="6_3jche"]
-[ext_resource type="PackedScene" uid="uid://rbcqvr4snrvn" path="res://Framework/Scenes/MenuUI/Credits/Credits.tscn" id="7_axwav"]
-[ext_resource type="PackedScene" uid="uid://djhd6uw7l1ok" path="res://Level.tscn" id="8_hndj4"]
+[ext_resource type="Resource" uid="uid://vvs0u1pmps52" path="res://Framework/Scenes/Scenes.tres" id="2_trjd1"]
 [ext_resource type="PackedScene" uid="uid://jrjqky6ag6gg" path="res://Framework/GodotUtils/Autoloads/Console/GameConsole.tscn" id="8_i1ct5"]
 
 [node name="Autoloads" type="Node"]
 process_mode = 3
 script = ExtResource("1_byaaa")
+_scenes = ExtResource("2_trjd1")
 
-[node name="ComponentManager" type="Node" parent="."]
-script = ExtResource("2_6wcni")
-
-[node name="SceneManager" type="Node" parent="ComponentManager"]
-unique_name_in_owner = true
-script = ExtResource("3_31ojt")
-_sceneMainMenu = ExtResource("4_v8bjg")
-_sceneModLoader = ExtResource("5_rdl47")
-_sceneOptions = ExtResource("6_3jche")
-_sceneCredits = ExtResource("7_axwav")
-_sceneGame = ExtResource("8_hndj4")
-
-[node name="Debug" type="CanvasLayer" parent="ComponentManager"]
+[node name="Debug" type="CanvasLayer" parent="."]
 layer = 128
 
-[node name="Console" parent="ComponentManager/Debug" instance=ExtResource("8_i1ct5")]
+[node name="Console" parent="Debug" instance=ExtResource("8_i1ct5")]
 unique_name_in_owner = true
-
-[node name="Commands" type="Node" parent="ComponentManager/Debug"]
-script = ExtResource("2_rdl47")

Framework/Scenes/Autoloads.tscn

@@ -6,27 +6,27 @@
 
 namespace __TEMPLATE__.UI;
 
-public partial class Commands : Node
+public class Commands
 {
-    public override void _Ready()
+    public static void RegisterAll()
     {
         GameConsole.RegisterCommand("help",  CommandHelp);
         GameConsole.RegisterCommand("quit",  CommandQuit).WithAliases("exit");
         GameConsole.RegisterCommand("debug", CommandDebug);
     }
 
-    private void CommandHelp(string[] args)
+    private static void CommandHelp(string[] args)
     {
         IEnumerable<string> cmds = GameConsole.Instance.GetCommands().Select(x => x.Name);
         Logger.Log(cmds.ToFormattedString());
     }
 
-    private async void CommandQuit(string[] args)
+    private async static void CommandQuit(string[] args)
     {
         await Global.Instance.QuitAndCleanup();
     }
 
-    private void CommandDebug(string[] args)
+    private static void CommandDebug(string[] args)
     {
         if (args.Length <= 0)
         {

Framework/Scenes/Commands.cs

@@ -0,0 +1,14 @@
+using Godot;
+using System;
+
+namespace __TEMPLATE__.UI;
+
+[GlobalClass]
+public partial class Scenes : Resource
+{
+    [Export] public PackedScene MainMenu { get; set; }
+    [Export] public PackedScene ModLoader { get; set; }
+    [Export] public PackedScene Options { get; set; }
+    [Export] public PackedScene Credits { get; set; }
+    [Export] public PackedScene Game { get; set; }
+}

Framework/Scenes/Scenes.cs

@@ -0,0 +1 @@
+uid://17yxgcswri77

Framework/Scenes/Scenes.cs.uid

@@ -0,0 +1,17 @@
+[gd_resource type="Resource" script_class="Scenes" load_steps=7 format=3 uid="uid://vvs0u1pmps52"]
+
+[ext_resource type="PackedScene" uid="uid://rbcqvr4snrvn" path="res://Framework/Scenes/MenuUI/Credits/Credits.tscn" id="1_ybnuk"]
+[ext_resource type="PackedScene" uid="uid://djhd6uw7l1ok" path="res://Level.tscn" id="2_ne130"]
+[ext_resource type="PackedScene" uid="uid://d4a5xfmaulku1" path="res://Framework/Scenes/MenuUI/MainMenu/MainMenu.tscn" id="3_pwu7q"]
+[ext_resource type="PackedScene" uid="uid://d1jo48n2hdkih" path="res://Framework/GodotUtils/ModLoader/ModLoader.tscn" id="4_ey3ar"]
+[ext_resource type="PackedScene" uid="uid://7tfets4irkba" path="res://Framework/Scenes/MenuUI/Options/Options.tscn" id="5_ail4l"]
+[ext_resource type="Script" uid="uid://17yxgcswri77" path="res://Framework/Scenes/Scenes.cs" id="6_k4rdd"]
+
+[resource]
+script = ExtResource("6_k4rdd")
+MainMenu = ExtResource("3_pwu7q")
+ModLoader = ExtResource("4_ey3ar")
+Options = ExtResource("5_ail4l")
+Credits = ExtResource("1_ybnuk")
+Game = ExtResource("2_ne130")
+metadata/_custom_type_script = "uid://17yxgcswri77"