TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2264 from chaigler/cleanup_gfx_initial_init

Browse source 
Resolves #740 - Remove redundant code in _GFXInitGetInitialRes()
This commit is contained in:
Areloch 2018-07-09 13:51:57 -05:00 committed by GitHub
parent 2caa826cfd 8992744856
commit 1c6ef2a6c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Engine/source/gfx/gfxInit.cpp
View file

@ -84,28 +84,15 @@ inline static void _GFXInitReportAdapters(Vector<GFXAdapter*> &adapters)
}
}
inline static void _GFXInitGetInitialRes(GFXVideoMode &vm, const Point2I &initialSize)
inline static void _GFXInitGetInitialRes(GFXVideoMode &vm)
{
const U32 kDefaultWindowSizeX = 800;
const U32 kDefaultWindowSizeY = 600;
const bool kDefaultFullscreen = false;
const U32 kDefaultBitDepth = 32;
const U32 kDefaultRefreshRate = 60;
// cache the desktop size of the main screen
GFXVideoMode desktopVm = GFXInit::getDesktopResolution();
// load pref variables, properly choose windowed / fullscreen
const String resString = Con::getVariable("$pref::Video::mode");
// Set defaults into the video mode, then have it parse the user string.
vm.resolution.x = kDefaultWindowSizeX;
vm.resolution.y = kDefaultWindowSizeY;
vm.fullScreen = kDefaultFullscreen;
vm.bitDepth = kDefaultBitDepth;
vm.refreshRate = kDefaultRefreshRate;
vm.wideScreen = false;
// Parse video mode settings from pref string
vm.parseFromString(resString);
}
@ -365,7 +352,7 @@ GFXAdapter *GFXInit::getBestAdapterChoice()
GFXVideoMode GFXInit::getInitialVideoMode()
{
GFXVideoMode vm;
_GFXInitGetInitialRes(vm, Point2I(800,600));
_GFXInitGetInitialRes(vm);
return vm;
}