mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 15:44:36 +00:00
Finished up splash screen implementation.
* Added stub methods for non-Windows platforms * Move canvas show to after tools have loaded * Fix a tab
This commit is contained in:
parent
5a1f6967ce
commit
346ad5bdaa
9 changed files with 43 additions and 13 deletions
|
|
@ -2716,6 +2716,6 @@ ConsoleMethod( GuiCanvas, hideWindow, void, 2, 2, "" )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
object->getPlatformWindow()->hide();
|
object->getPlatformWindow()->hide();
|
||||||
WindowManager->setDisplayWindow(false);
|
WindowManager->setDisplayWindow(false);
|
||||||
object->getPlatformWindow()->setDisplayWindow(false);
|
object->getPlatformWindow()->setDisplayWindow(false);
|
||||||
}
|
}
|
||||||
|
|
@ -70,6 +70,11 @@ bool Platform::displaySplashWindow()
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool Platform::closeSplashWindow()
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
#pragma mark ---- File IO ----
|
#pragma mark ---- File IO ----
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
bool dPathCopy(const char* source, const char* dest, bool nooverwrite)
|
bool dPathCopy(const char* source, const char* dest, bool nooverwrite)
|
||||||
|
|
|
||||||
|
|
@ -93,6 +93,7 @@ void Platform::openFile(const char *path) { }
|
||||||
|
|
||||||
// window
|
// window
|
||||||
bool Platform::displaySplashWindow(String path) { return false; }
|
bool Platform::displaySplashWindow(String path) { return false; }
|
||||||
|
bool Platform::closeSplashWindow() { return false; }
|
||||||
|
|
||||||
// font
|
// font
|
||||||
PlatformFont *createPlatformFont(const char *name, U32 size, U32 charset) { return NULL; }
|
PlatformFont *createPlatformFont(const char *name, U32 size, U32 charset) { return NULL; }
|
||||||
|
|
|
||||||
|
|
@ -249,6 +249,15 @@ if ($displayHelp) {
|
||||||
else {
|
else {
|
||||||
onStart();
|
onStart();
|
||||||
echo("Engine initialized...");
|
echo("Engine initialized...");
|
||||||
|
|
||||||
|
if( !$isDedicated )
|
||||||
|
{
|
||||||
|
// As we know at this point that the initial load is complete,
|
||||||
|
// we can hide any splash screen we have, and show the canvas.
|
||||||
|
// This keeps things looking nice, instead of having a blank window
|
||||||
|
closeSplashWindow();
|
||||||
|
Canvas.showWindow();
|
||||||
|
}
|
||||||
|
|
||||||
// Auto-load on the 360
|
// Auto-load on the 360
|
||||||
if( $platform $= "xenon" )
|
if( $platform $= "xenon" )
|
||||||
|
|
|
||||||
|
|
@ -246,6 +246,15 @@ if ($displayHelp) {
|
||||||
else {
|
else {
|
||||||
onStart();
|
onStart();
|
||||||
echo("Engine initialized...");
|
echo("Engine initialized...");
|
||||||
|
|
||||||
|
if( !$isDedicated )
|
||||||
|
{
|
||||||
|
// As we know at this point that the initial load is complete,
|
||||||
|
// we can hide any splash screen we have, and show the canvas.
|
||||||
|
// This keeps things looking nice, instead of having a blank window
|
||||||
|
closeSplashWindow();
|
||||||
|
Canvas.showWindow();
|
||||||
|
}
|
||||||
|
|
||||||
// Auto-load on the 360
|
// Auto-load on the 360
|
||||||
if( $platform $= "xenon" )
|
if( $platform $= "xenon" )
|
||||||
|
|
|
||||||
|
|
@ -29,12 +29,6 @@ function loadStartup()
|
||||||
// The index of the current splash screen
|
// The index of the current splash screen
|
||||||
$StartupIdx = 0;
|
$StartupIdx = 0;
|
||||||
|
|
||||||
// As we know at this point that the initial load is complete,
|
|
||||||
// we can hide any splash screen we have, and show the canvas.
|
|
||||||
// This keeps things looking nice, instead of having a blank window
|
|
||||||
closeSplashWindow();
|
|
||||||
Canvas.showWindow();
|
|
||||||
|
|
||||||
// A list of the splash screens and logos
|
// A list of the splash screens and logos
|
||||||
// to cycle through. Note that they have to
|
// to cycle through. Note that they have to
|
||||||
// be in consecutive numerical order
|
// be in consecutive numerical order
|
||||||
|
|
|
||||||
|
|
@ -249,6 +249,15 @@ if ($displayHelp) {
|
||||||
else {
|
else {
|
||||||
onStart();
|
onStart();
|
||||||
echo("Engine initialized...");
|
echo("Engine initialized...");
|
||||||
|
|
||||||
|
if( !$isDedicated )
|
||||||
|
{
|
||||||
|
// As we know at this point that the initial load is complete,
|
||||||
|
// we can hide any splash screen we have, and show the canvas.
|
||||||
|
// This keeps things looking nice, instead of having a blank window
|
||||||
|
closeSplashWindow();
|
||||||
|
Canvas.showWindow();
|
||||||
|
}
|
||||||
|
|
||||||
// Auto-load on the 360
|
// Auto-load on the 360
|
||||||
if( $platform $= "xenon" )
|
if( $platform $= "xenon" )
|
||||||
|
|
|
||||||
|
|
@ -246,6 +246,15 @@ if ($displayHelp) {
|
||||||
else {
|
else {
|
||||||
onStart();
|
onStart();
|
||||||
echo("Engine initialized...");
|
echo("Engine initialized...");
|
||||||
|
|
||||||
|
if( !$isDedicated )
|
||||||
|
{
|
||||||
|
// As we know at this point that the initial load is complete,
|
||||||
|
// we can hide any splash screen we have, and show the canvas.
|
||||||
|
// This keeps things looking nice, instead of having a blank window
|
||||||
|
closeSplashWindow();
|
||||||
|
Canvas.showWindow();
|
||||||
|
}
|
||||||
|
|
||||||
// Auto-load on the 360
|
// Auto-load on the 360
|
||||||
if( $platform $= "xenon" )
|
if( $platform $= "xenon" )
|
||||||
|
|
|
||||||
|
|
@ -29,12 +29,6 @@ function loadStartup()
|
||||||
// The index of the current splash screen
|
// The index of the current splash screen
|
||||||
$StartupIdx = 0;
|
$StartupIdx = 0;
|
||||||
|
|
||||||
// As we know at this point that the initial load is complete,
|
|
||||||
// we can hide any splash screen we have, and show the canvas.
|
|
||||||
// This keeps things looking nice, instead of having a blank window
|
|
||||||
closeSplashWindow();
|
|
||||||
Canvas.showWindow();
|
|
||||||
|
|
||||||
// A list of the splash screens and logos
|
// A list of the splash screens and logos
|
||||||
// to cycle through. Note that they have to
|
// to cycle through. Note that they have to
|
||||||
// be in consecutive numerical order
|
// be in consecutive numerical order
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue