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

Merge pull request #1434 from blackwc/fullscreen-cli-fix

Browse source 
fullscreen and windowed mode cli fix
This commit is contained in:
Anis 2016-02-19 16:59:42 +01:00
commit 5947933f99
4 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/Empty/game/core/main.cs
View file

@ -141,11 +141,11 @@ function parseArgs()
switch$ (%arg) switch$ (%arg)
{ {
case "-fullscreen": case "-fullscreen":
setFullScreen(true); $cliFullscreen = true;
$argUsed[%i]++; $argUsed[%i]++;
case "-windowed": case "-windowed":
setFullScreen(false); $cliFullscreen = false;
$argUsed[%i]++; $argUsed[%i]++;
case "-openGL": case "-openGL":

9
Templates/Empty/game/core/scripts/client/canvas.cs
View file

@ -39,9 +39,14 @@ function configureCanvas()
%rate = getWord($pref::Video::mode, $WORD::REFRESH); %rate = getWord($pref::Video::mode, $WORD::REFRESH);
%fsaa = getWord($pref::Video::mode, $WORD::AA); %fsaa = getWord($pref::Video::mode, $WORD::AA);
echo("--------------"); if($cliFullscreen !$= "") {
echo("Attempting to set resolution to \"" @ $pref::Video::mode @ "\""); %fs = $cliFullscreen;
$cliFullscreen = "";
}
echo("--------------");
echo("Attempting to set resolution to \"" @ %resX SPC %resY SPC %fs SPC %bpp SPC %rate SPC %fsaa @ "\"");
%deskRes = getDesktopResolution(); %deskRes = getDesktopResolution();
%deskResX = getWord(%deskRes, $WORD::RES_X); %deskResX = getWord(%deskRes, $WORD::RES_X);
%deskResY = getWord(%deskRes, $WORD::RES_Y); %deskResY = getWord(%deskRes, $WORD::RES_Y);

4
Templates/Full/game/core/main.cs
View file

@ -141,11 +141,11 @@ function parseArgs()
switch$ (%arg) switch$ (%arg)
{ {
case "-fullscreen": case "-fullscreen":
setFullScreen(true); $cliFullscreen = true;
$argUsed[%i]++; $argUsed[%i]++;
case "-windowed": case "-windowed":
setFullScreen(false); $cliFullscreen = false;
$argUsed[%i]++; $argUsed[%i]++;
case "-openGL": case "-openGL":

9
Templates/Full/game/core/scripts/client/canvas.cs
View file

@ -39,9 +39,14 @@ function configureCanvas()
%rate = getWord($pref::Video::mode, $WORD::REFRESH); %rate = getWord($pref::Video::mode, $WORD::REFRESH);
%fsaa = getWord($pref::Video::mode, $WORD::AA); %fsaa = getWord($pref::Video::mode, $WORD::AA);
echo("--------------"); if($cliFullscreen !$= "") {
echo("Attempting to set resolution to \"" @ $pref::Video::mode @ "\""); %fs = $cliFullscreen;
$cliFullscreen = "";
}
echo("--------------");
echo("Attempting to set resolution to \"" @ %resX SPC %resY SPC %fs SPC %bpp SPC %rate SPC %fsaa @ "\"");
%deskRes = getDesktopResolution(); %deskRes = getDesktopResolution();
%deskResX = getWord(%deskRes, $WORD::RES_X); %deskResX = getWord(%deskRes, $WORD::RES_X);
%deskResY = getWord(%deskRes, $WORD::RES_Y); %deskResY = getWord(%deskRes, $WORD::RES_Y);