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

Merge branch 'Preview4_0_DevHead' into tsneo

Browse source 
# Conflicts:
#	Engine/source/console/consoleInternal.cpp
This commit is contained in:
Jeff Hutchinson 2021-06-18 21:13:49 -04:00
commit acde0c3f0b
17 changed files with 96 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/gui/core/guiCanvas.cpp
View file

@ -1760,7 +1760,11 @@ void GuiCanvas::renderFrame(bool preRenderOnly, bool bufferSwap /* = true */)
const char *pref = Con::getVariable( "$pref::Video::mode" );
mode.parseFromString( pref );
mode.antialiasLevel = 0;
Point2I winPos = mPlatformWindow->getPosition(); // Save position so we can put window back.
mPlatformWindow->setVideoMode(mode);
// setVideoMode (above) will center the window on the display device. If the window had been positioned
// by the user or from script, put it back where it was before the light manager change.
mPlatformWindow->setPosition(winPos);
Con::printf( "AntiAliasing has been disabled; it is not compatible with AdvancedLighting." );
}
@ -1772,7 +1776,11 @@ void GuiCanvas::renderFrame(bool preRenderOnly, bool bufferSwap /* = true */)
if ( prefAA != mode.antialiasLevel )
{
mode.parseFromString( pref );
Point2I winPos = mPlatformWindow->getPosition(); // Save position so we can put window back.
mPlatformWindow->setVideoMode(mode);
// setVideoMode (above) will center the window on the display device. If the window had been positioned
// by the user or from script, put it back where it was before the light manager change.
mPlatformWindow->setPosition(winPos);
Con::printf( "AntiAliasing has been enabled while running BasicLighting." );
}