TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Adjusted init'ing logic to defer to project settings for the name of the play gui and mainMenu gui instead of hardcoding them

Browse source
This commit is contained in:
Areloch 2019-08-07 01:27:39 -05:00
parent e6e2ee0d50
commit fee1ceab3c
18 changed files with 151 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/module/moduleManager.cpp
View file

@ -191,6 +191,8 @@ bool ModuleManager::scanModules( const char* pPath, const bool rootOnly )
return false;
}
Torque::FS::sgMountSystem;
// Fetch extension length.
const U32 extensionLength = dStrlen( mModuleExtension );

2
Templates/BaseGame/cleanShaders.bat
View file

@ -1,6 +1,6 @@
REM Delete procedural shaders
del /q /a:-R game\shaders\procedural\*.*
del /q /a:-R game\data\shaderCache\*.*
REM Delete dumped shader disassembly files

2
Templates/BaseGame/cleanShaders.command
View file

@ -1,4 +1,4 @@
#!/bin/sh
cd "`dirname "$0"`"
rm -rf game/shaders/procedural/*.*
rm -rf game/data/shaderCache/*.*

12
Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.cs
View file

@ -45,8 +45,11 @@ function GameConnection::initialControlSet(%this)
// first check if the editor is active
if (!isToolBuild() || !isMethod("Editor", "checkActiveLoadDone") || !Editor::checkActiveLoadDone())
{
if (isObject(PlayGui) && Canvas.getContent() != PlayGui.getId())
Canvas.setContent(PlayGui);
%playGUIName = ProjectSettings.value("UI/playGUIName");
Canvas.setContent(%playGUIName);
if (isObject(%playGUIName) && Canvas.getContent() != %playGUIName.getId())
Canvas.setContent(%playGUIName);
}
}
@ -117,8 +120,9 @@ function disconnectedCleanup()
$sceneLighting::terminateLighting = true;
// Back to the launch screen
if (isObject( MainMenuGui ))
Canvas.setContent( MainMenuGui );
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Canvas.setContent( %mainMenuGUI );
// Before we destroy the client physics world
// make sure all ServerConnection objects are deleted.

5
Templates/BaseGame/game/core/clientServer/scripts/server/server.cs
View file

@ -107,8 +107,9 @@ function createAndConnectToLocalServer( %serverType, %level )
MessageBoxOK("Error starting local server!", "There was an error when trying to connect to the local server.");
if(isObject(MainMenuGui))
Canvas.setContent(MainMenuGui);
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Canvas.setContent( %mainMenuGUI );
return false;
}

4
Templates/BaseGame/game/core/settings.xml
View file

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<ProjectSettings>
<Group name="UI">
<Setting name="mainMenuName">MainMenuGUI</Setting>
<Setting name="playGUIName">PlayGUI</Setting>
</Group>
<Group name="AssetManagement">
<Group name="Modules">
<Setting name="coreModulePath">core/</Setting>

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

@ -66,7 +66,6 @@ function UI::create( %this )
%dbList = new ArrayObject(LevelFilesList);
loadStartup();
//Canvas.pushDialog(MainMenuGui);
}
function Game::destroy( %this )

2
Templates/BaseGame/game/data/ui/scripts/guis/loadingGui.gui
View file

@ -27,7 +27,7 @@
profile = "GuiDefaultProfile";
visible = "1";
active = "1";
command = "disconnect();\nCanvas.setContent(MainMenuGui);";
command = "disconnect();\nCanvas.setContent(ProjectSettings.value(\"UI/mainMenuName\"));";
accelerator = "escape";
tooltipProfile = "GuiToolTipProfile";
hovertime = "1000";

4
Templates/BaseGame/game/data/ui/scripts/startupGui.cs
View file

@ -144,7 +144,9 @@ function StartupGui::onDone(%this)
//BlankGui.delete();
//flushTextureCache();
Canvas.setContent(MainMenuGui);
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Canvas.setContent( %mainMenuGUI );
}
else
{

2
Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.cs
View file

@ -414,7 +414,7 @@ function ESettingsWindow::getGameplaySettings(%this)
SettingsInspector.startGroup("Game Modes");
SettingsInspector.addSettingsField("Gameplay/GameModes/defaultModeName", "Default Gamemode Name", "string", "");
SettingsInspector.endGroup();
}
}
function ESettingsWindow::getGameOptionsSettings(%this)
{

2
Templates/BaseGame/game/tools/guiEditor/gui/guiEditor.ed.gui
View file

@ -129,7 +129,7 @@
minExtent = "8 8";
canSave = "1";
visible = "1";
command = "GuiEdit(); Editor.close(\"PlayGui\");";
command = "GuiEdit(); Editor.close(ProjectSettings.value(\"UI/playGUIName\"));";
tooltipProfile = "ToolsGuiToolTipProfile";
ToolTip = "Play Game";
hovertime = "1000";

3
Templates/BaseGame/game/tools/main.cs
View file

@ -291,7 +291,8 @@ function fastLoadWorldEdit(%val)
}
else
{
Editor.close("PlayGui");
%playGUIName = ProjectSettings.value("UI/playGUIName");
Editor.close(%playGUIName);
}
}
else

224
Templates/BaseGame/game/tools/settings.xml
View file

@ -1,148 +1,131 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<EditorSettings>
<Group name="ConvexEditor">
<Setting name="materialName">Grid_512_Orange</Setting>
</Group>
<Group name="NavEditor">
<Setting name="SpawnClass">AIPlayer</Setting>
</Group>
<Group name="WorldEditor">
<Setting name="displayType">6</Setting>
<Setting name="orthoFOV">50</Setting>
<Setting name="torsionPath">AssetWork_Debug.exe</Setting>
<Setting name="dropType">screenCenter</Setting>
<Setting name="forceLoadDAE">0</Setting>
<Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
<Setting name="orthoShowGrid">1</Setting>
<Setting name="undoLimit">40</Setting>
<Group name="Render">
<Setting name="showMousePopupInfo">1</Setting>
<Setting name="renderObjText">1</Setting>
<Setting name="renderPopupBackground">1</Setting>
<Setting name="renderSelectionBox">1</Setting>
<Setting name="renderObjHandle">1</Setting>
<Setting name="torsionPath">AssetWork_Debug.exe</Setting>
<Setting name="orthoShowGrid">1</Setting>
<Setting name="orthoFOV">50</Setting>
<Setting name="currentEditor">WorldEditorInspectorPlugin</Setting>
<Setting name="displayType">6</Setting>
<Setting name="forceLoadDAE">0</Setting>
<Group name="Theme">
<Setting name="windowTitleBGNAColor">180 180 180 255</Setting>
<Setting name="windowTitleBGColor">50 50 50 255</Setting>
<Setting name="windowTitleFontColor">215 215 215 255</Setting>
<Setting name="windowTitleBGHLColor">48 48 48 255</Setting>
<Setting name="windowTitleFontHLColor">255 255 255 255</Setting>
</Group>
<Group name="Grid">
<Setting name="gridSize">1</Setting>
<Setting name="gridOriginColor">255 255 255 100</Setting>
<Setting name="gridSnap">0</Setting>
<Setting name="gridMinorColor">51 51 51 100</Setting>
<Setting name="gridSize">1</Setting>
<Setting name="gridColor">102 102 102 100</Setting>
</Group>
<Group name="Color">
<Setting name="selectionBoxColor">255 255 0 255</Setting>
<Setting name="objMouseOverColor">0 255 0 255</Setting>
<Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
<Setting name="dragRectColor">255 255 0 255</Setting>
<Setting name="objectTextColor">255 255 255 255</Setting>
<Setting name="popupBackgroundColor">100 100 100 255</Setting>
<Setting name="objSelectColor">255 0 0 255</Setting>
</Group>
<Group name="Tools">
<Setting name="objectsUseBoxCenter">1</Setting>
<Setting name="snapGround">0</Setting>
<Setting name="dropAtScreenCenterMax">100</Setting>
<Setting name="dropAtScreenCenterScalar">1</Setting>
<Setting name="snapSoft">0</Setting>
<Setting name="snapSoftSize">2</Setting>
<Setting name="boundingBoxCollision">0</Setting>
</Group>
<Group name="ObjectIcons">
<Setting name="fadeIcons">1</Setting>
<Setting name="fadeIconsEndAlpha">0</Setting>
<Setting name="fadeIconsStartAlpha">255</Setting>
<Setting name="fadeIconsEndDist">20</Setting>
<Setting name="fadeIconsStartDist">8</Setting>
</Group>
<Group name="Theme">
<Setting name="windowTitleFontColor">215 215 215 255</Setting>
<Setting name="windowTitleBGNAColor">180 180 180 255</Setting>
<Setting name="windowTitleFontHLColor">255 255 255 255</Setting>
<Setting name="windowTitleBGColor">50 50 50 255</Setting>
<Setting name="windowTitleBGHLColor">48 48 48 255</Setting>
<Setting name="gridMinorColor">51 51 51 100</Setting>
<Setting name="gridSnap">0</Setting>
</Group>
<Group name="Images">
<Setting name="lockedHandle">tools/worldEditor/images/LockedHandle</Setting>
<Setting name="defaultHandle">tools/worldEditor/images/DefaultHandle</Setting>
<Setting name="selectHandle">tools/worldEditor/images/SelectHandle</Setting>
</Group>
<Group name="ObjectIcons">
<Setting name="fadeIconsStartDist">8</Setting>
<Setting name="fadeIcons">1</Setting>
<Setting name="fadeIconsEndAlpha">0</Setting>
<Setting name="fadeIconsStartAlpha">255</Setting>
<Setting name="fadeIconsEndDist">20</Setting>
</Group>
<Group name="Render">
<Setting name="showMousePopupInfo">1</Setting>
<Setting name="renderObjText">1</Setting>
<Setting name="renderObjHandle">1</Setting>
<Setting name="renderPopupBackground">1</Setting>
<Setting name="renderSelectionBox">1</Setting>
</Group>
<Group name="Tools">
<Setting name="objectsUseBoxCenter">1</Setting>
<Setting name="snapSoftSize">2</Setting>
<Setting name="snapSoft">0</Setting>
<Setting name="dropAtScreenCenterMax">100</Setting>
<Setting name="dropAtScreenCenterScalar">1</Setting>
<Setting name="boundingBoxCollision">0</Setting>
<Setting name="snapGround">0</Setting>
</Group>
<Group name="Docs">
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="forumURL">http://www.garagegames.com/products/torque-3d/forums</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
</Group>
</Group>
<Group name="AxisGizmo">
<Setting name="axisGizmoMaxScreenLen">100</Setting>
<Setting name="snapRotations">0</Setting>
<Setting name="rotationSnap">15</Setting>
<Setting name="mouseRotateScalar">0.8</Setting>
<Setting name="mouseScaleScalar">0.8</Setting>
<Setting name="renderInfoText">1</Setting>
<Setting name="renderWhenUsed">0</Setting>
<Group name="Grid">
<Setting name="planeDim">500</Setting>
<Setting name="renderPlane">0</Setting>
<Setting name="renderPlaneHashes">0</Setting>
<Setting name="snapToGrid">0</Setting>
<Setting name="gridColor">255 255 255 20</Setting>
<Setting name="gridSize">10 10 10</Setting>
<Group name="Color">
<Setting name="objMouseOverColor">0 255 0 255</Setting>
<Setting name="dragRectColor">255 255 0 255</Setting>
<Setting name="popupBackgroundColor">100 100 100 255</Setting>
<Setting name="selectionBoxColor">255 255 0 255</Setting>
<Setting name="objMouseOverSelectColor">0 0 255 255</Setting>
<Setting name="objSelectColor">255 0 0 255</Setting>
<Setting name="objectTextColor">255 255 255 255</Setting>
</Group>
</Group>
<Group name="Theme">
<Setting name="dividerLightColor">96 94 92 255</Setting>
<Setting name="windowBackgroundColor">32 31 30 255</Setting>
<Setting name="tooltipTextColor">255 255 255 255</Setting>
<Setting name="fieldTextColor">178 175 172 255</Setting>
<Setting name="dividerDarkColor">17 16 15 255</Setting>
<Setting name="headerTextColor">236 234 232 255</Setting>
<Setting name="tabsSELColor">59 58 57 255</Setting>
<Setting name="fieldBGSELColor">100 98 96 255</Setting>
<Setting name="fieldBGHLColor">72 70 68 255</Setting>
<Setting name="tooltipDividerColor">72 70 68 255</Setting>
<Setting name="fieldTextSELColor">240 240 240 255</Setting>
<Setting name="fieldBGColor">59 58 57 255</Setting>
<Setting name="fieldTextHLColor">234 232 230 255</Setting>
<Setting name="dividerMidColor">50 49 48 255</Setting>
<Setting name="tabsColor">37 36 35 255</Setting>
<Setting name="tabsHLColor">50 49 48 255</Setting>
<Setting name="headerColor">50 49 48 255</Setting>
<Setting name="tooltipBGColor">43 43 43 255</Setting>
</Group>
<Group name="GuiEditor">
<Setting name="previewResolution">1024 768</Setting>
<Setting name="lastPath">tools/gui</Setting>
<Setting name="previewResolution">1024 768</Setting>
<Group name="Rendering">
<Setting name="drawGuides">1</Setting>
<Setting name="drawBorderLines">1</Setting>
</Group>
<Group name="Snapping">
<Setting name="snapToEdges">1</Setting>
<Setting name="snap2Grid">0</Setting>
<Setting name="snap2GridSize">8</Setting>
<Setting name="snapToCenters">1</Setting>
<Setting name="snapToControls">1</Setting>
<Setting name="snapToCanvas">1</Setting>
<Setting name="snapToGuides">1</Setting>
<Setting name="sensitivity">2</Setting>
</Group>
<Group name="Help">
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
</Group>
<Group name="Library">
<Setting name="viewType">Categorized</Setting>
</Group>
<Group name="EngineDevelopment">
<Setting name="showEditorGuis">0</Setting>
<Setting name="showEditorProfiles">0</Setting>
<Setting name="toggleIntoEditor">0</Setting>
</Group>
<Group name="Snapping">
<Setting name="snapToControls">1</Setting>
<Setting name="snap2GridSize">8</Setting>
<Setting name="snapToCenters">1</Setting>
<Setting name="snap2Grid">0</Setting>
<Setting name="snapToCanvas">1</Setting>
<Setting name="snapToGuides">1</Setting>
<Setting name="sensitivity">2</Setting>
<Setting name="snapToEdges">1</Setting>
</Group>
<Group name="Rendering">
<Setting name="drawBorderLines">1</Setting>
<Setting name="drawGuides">1</Setting>
</Group>
<Group name="Help">
<Setting name="documentationReference">../../../Documentation/Torque 3D - Script Manual.chm</Setting>
<Setting name="documentationLocal">../../../Documentation/Official Documentation.html</Setting>
<Setting name="documentationURL">http://www.garagegames.com/products/torque-3d/documentation/user</Setting>
</Group>
<Group name="Selection">
<Setting name="fullBox">0</Setting>
</Group>
<Group name="Library">
<Setting name="viewType">Categorized</Setting>
</Group>
</Group>
<Group name="ConvexEditor">
<Setting name="materialName">Grid_512_Orange</Setting>
</Group>
<Group name="NavEditor">
<Setting name="SpawnClass">AIPlayer</Setting>
<Group name="Theme">
<Setting name="tabsHLColor">50 49 48 255</Setting>
<Setting name="dividerLightColor">96 94 92 255</Setting>
<Setting name="dividerMidColor">50 49 48 255</Setting>
<Setting name="fieldTextHLColor">234 232 230 255</Setting>
<Setting name="dividerDarkColor">17 16 15 255</Setting>
<Setting name="fieldTextColor">178 175 172 255</Setting>
<Setting name="tabsColor">37 36 35 255</Setting>
<Setting name="tabsSELColor">59 58 57 255</Setting>
<Setting name="headerTextColor">236 234 232 255</Setting>
<Setting name="tooltipDividerColor">72 70 68 255</Setting>
<Setting name="windowBackgroundColor">32 31 30 255</Setting>
<Setting name="tooltipTextColor">255 255 255 255</Setting>
<Setting name="fieldBGColor">59 58 57 255</Setting>
<Setting name="fieldTextSELColor">240 240 240 255</Setting>
<Setting name="headerColor">50 49 48 255</Setting>
<Setting name="fieldBGHLColor">72 70 68 255</Setting>
<Setting name="fieldBGSELColor">100 98 96 255</Setting>
<Setting name="tooltipBGColor">43 43 43 255</Setting>
</Group>
<Group name="LevelInformation">
<Setting name="levelsDirectory">data/FPSGameplay/levels</Setting>
@ -155,4 +138,21 @@
</Group>
</Group>
</Group>
<Group name="AxisGizmo">
<Setting name="snapRotations">0</Setting>
<Setting name="renderInfoText">1</Setting>
<Setting name="rotationSnap">15</Setting>
<Setting name="renderWhenUsed">0</Setting>
<Setting name="mouseRotateScalar">0.8</Setting>
<Setting name="axisGizmoMaxScreenLen">100</Setting>
<Setting name="mouseScaleScalar">0.8</Setting>
<Group name="Grid">
<Setting name="renderPlane">0</Setting>
<Setting name="gridSize">10 10 10</Setting>
<Setting name="renderPlaneHashes">0</Setting>
<Setting name="gridColor">255 255 255 20</Setting>
<Setting name="snapToGrid">0</Setting>
<Setting name="planeDim">500</Setting>
</Group>
</Group>
</EditorSettings>

2
Templates/BaseGame/game/tools/worldEditor/gui/EditorGui.ed.gui
View file

@ -88,7 +88,7 @@
MinExtent = "8 8";
canSave = "1";
Visible = "1";
Command = "Editor.close(\"PlayGui\");";
Command = "Editor.close(ProjectSettings.value(\"UI/playGUIName\"));";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Play Game";
hovertime = "1000";

3
Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.cs
View file

@ -1965,7 +1965,8 @@ function EditorGui::handleEscape( %this )
if ( !%result )
{
Editor.close("PlayGui");
%playGUIName = ProjectSettings.value("UI/playGUIName");
Editor.close(%playGUIName);
}
}

8
Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.cs
View file

@ -132,7 +132,8 @@ function toggleEditor(%make)
}
else
{
Editor.close("PlayGui");
%playGUIName = ProjectSettings.value("UI/playGUIName");
Editor.close(%playGUIName);
}
}
else
@ -191,8 +192,9 @@ package EditorDisconnectOverride
{
if ( isObject( Editor ) && Editor.isEditorEnabled() )
{
if (isObject( MainMenuGui ))
Editor.close("MainMenuGui");
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Editor.close( %mainMenuGUI );
}
Parent::disconnect();

5
Templates/BaseGame/game/tools/worldEditor/scripts/menuHandlers.ed.cs
View file

@ -115,8 +115,9 @@ function EditorDoExitMission(%saveFirst)
EditorClearDirty();
}
if (isObject( MainMenuGui ))
Editor.close("MainMenuGui");
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Editor.close( %mainMenuGUI );
disconnect();
}

2
Templates/BaseGame/game/tools/worldEditor/scripts/menus.ed.cs
View file

@ -157,7 +157,7 @@ function EditorGui::buildMenus(%this)
%fileMenu.appendItem( "Add FMOD Designer Audio..." TAB "" TAB "AddFMODProjectDlg.show();" );
%fileMenu.appendItem("-");
%fileMenu.appendItem("Play Level" TAB "F11" TAB "Editor.close(\"PlayGui\");");
%fileMenu.appendItem("Play Level" TAB "F11" TAB "Editor.close(ProjectSettings.value(\"UI/playGUIName\"));");
%fileMenu.appendItem("Exit Level" TAB "" TAB "EditorExitMission();");
%fileMenu.appendItem("Quit" TAB %quitShortcut TAB "EditorQuitGame();");