TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 07:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moves the BaseUI module to utilize the queuedExec function to make overriding UI elements easier

Browse source
This commit is contained in:
Areloch 2020-07-26 16:39:49 -05:00
parent b2c4ff7745
commit 0e37214a8b
2 changed files with 42 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Templates/BaseGame/game/data/ui/UI.cs
View file

@ -30,57 +30,55 @@ function UI::initClient(%this)
{
//Load UI stuff
//we need to load this because some of the menu profiles use the sounds here
//exec("./datablocks/guiSounds.cs");
//%this.queueExec("./datablocks/guiSounds.cs");
//Profiles
exec("./scripts/profiles.cs");
%this.queueExec("/scripts/profiles.cs");
//Now gui files
exec("./scripts/menuInputButtons.cs");
%this.queueExec("/scripts/menuInputButtons.cs");
exec("./guis/mainMenu.cs");
exec("./guis/mainMenu.gui");
%this.queueExec("/guis/mainMenu.cs");
%this.queueExec("/guis/mainMenu.gui");
exec("./guis/chooseLevelDlg.cs");
exec("./guis/chooseLevelDlg.gui");
%this.queueExec("/guis/chooseLevelDlg.cs");
%this.queueExec("/guis/chooseLevelDlg.gui");
exec("./guis/joinServerMenu.cs");
exec("./guis/joinServerMenu.gui");
%this.queueExec("/guis/joinServerMenu.cs");
%this.queueExec("/guis/joinServerMenu.gui");
exec("./guis/loadingGui.gui");
%this.queueExec("/guis/loadingGui.gui");
exec("./guis/optionsMenu.cs");
exec("./guis/optionsMenu.gui");
%this.queueExec("/guis/optionsMenu.cs");
%this.queueExec("/guis/optionsMenu.gui");
exec("./guis/pauseMenu.cs");
exec("./guis/pauseMenu.gui");
%this.queueExec("/guis/pauseMenu.cs");
%this.queueExec("/guis/pauseMenu.gui");
exec("./guis/remapDlg.gui");
exec("./guis/remapConfirmDlg.gui");
%this.queueExec("/guis/remapDlg.gui");
%this.queueExec("/guis/remapConfirmDlg.gui");
exec("./guis/profiler.cs");
exec("./guis/profiler.gui");
%this.queueExec("/guis/profiler.cs");
%this.queueExec("/guis/profiler.gui");
exec("./guis/netGraphGui.gui");
exec("./guis/RecordingsDlg.gui");
%this.queueExec("/guis/netGraphGui.gui");
%this.queueExec("/guis/RecordingsDlg.gui");
exec("./guis/guiMusicPlayer.cs");
exec("./guis/guiMusicPlayer.gui");
%this.queueExec("/guis/guiMusicPlayer.cs");
%this.queueExec("/guis/guiMusicPlayer.gui");
exec("./guis/startupGui.cs");
exec("./guis/startupGui.gui");
%this.queueExec("/guis/startupGui.cs");
%this.queueExec("/guis/startupGui.gui");
// Load Editor Dialogs
exec("./guis/messageBoxDlg.gui");
%this.queueExec("/guis/messageBoxDlg.gui");
//Load scripts
exec("./scripts/controlsMenu.cs");
exec("./scripts/messageBoxes.cs");
exec("./scripts/help.cs");
exec("./scripts/cursors.cs");
exec("./scripts/utility.cs");
loadStartup();
%this.queueExec("/scripts/controlsMenu.cs");
%this.queueExec("/scripts/messageBoxes.cs");
%this.queueExec("/scripts/help.cs");
%this.queueExec("/scripts/cursors.cs");
%this.queueExec("/scripts/utility.cs");
}
function UI::onCreateClientConnection(%this){}

17
Templates/BaseGame/game/main.cs.in
View file

@ -28,12 +28,19 @@ ModuleDatabase.LoadGroup( "Game" );
//Finally, initialize the client/server structure
ModuleDatabase.LoadExplicit( "Core_ClientServer" );
//If nothing else set a main menu, try to do so now
if(!isObject(Canvas.getContent()))
if(isFunction("loadStartup"))
{
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Canvas.setContent( %mainMenuGUI );
loadStartup();
}
else
{
//If nothing else set a main menu, try to do so now
if(!isObject(Canvas.getContent()))
{
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Canvas.setContent( %mainMenuGUI );
}
}
closeSplashWindow();