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

Merge branch 'alpha40_SetVdeoShenanigans' of https://github.com/Azaezel/Torque3D into Preview4_0

Browse source
This commit is contained in:
Areloch 2019-11-16 10:15:39 -06:00
commit 21dfe4f16d
7 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/windowManager/mac/macWindow.h
View file

@ -42,7 +42,7 @@ public:
virtual GFXDevice *getGFXDevice() { return mDevice; }
virtual GFXWindowTarget *getGFXTarget() { return mTarget; }
virtual void setVideoMode(const GFXVideoMode &mode);
virtual void _setVideoMode(const GFXVideoMode &mode);
virtual const GFXVideoMode &getVideoMode() { return mCurrentMode; }
virtual WindowId getWindowId() { return mWindowId; }

2
Engine/source/windowManager/mac/macWindow.mm
View file

@ -259,7 +259,7 @@ void MacWindow::_disassociateCocoaWindow()
mCocoaWindow = NULL;
}
void MacWindow::setVideoMode(const GFXVideoMode &mode)
void MacWindow::_setVideoMode(const GFXVideoMode &mode)
{
mCurrentMode = mode;
setSize(mCurrentMode.resolution);

2
Engine/source/windowManager/platformWindow.h
View file

@ -511,7 +511,7 @@ public:
virtual void* getPlatformDrawable() const = 0;
protected:
virtual void _setFullscreen(const bool fullScreen) {};
virtual void _setVideoMode(const GFXVideoMode &mode) {};
virtual void _setVideoMode(const GFXVideoMode &mode) = 0;
};
#endif

2
Engine/source/windowManager/sdl/sdlWindow.cpp
View file

@ -156,7 +156,7 @@ void* PlatformWindowSDL::getSystemWindow(const WindowSystem system)
return NULL;
}
void PlatformWindowSDL::setVideoMode( const GFXVideoMode &mode )
void PlatformWindowSDL::_setVideoMode( const GFXVideoMode &mode )
{
mVideoMode = mode;
mSuppressReset = true;

2
Engine/source/windowManager/sdl/sdlWindow.h
View file

@ -115,7 +115,7 @@ public:
virtual GFXDevice *getGFXDevice();
virtual GFXWindowTarget *getGFXTarget();
virtual void setVideoMode(const GFXVideoMode &mode);
virtual void _setVideoMode(const GFXVideoMode &mode);
virtual const GFXVideoMode &getVideoMode();
virtual bool clearFullscreen();
virtual bool isFullscreen();

3
Engine/source/windowManager/win32/win32Window.cpp
View file

@ -143,7 +143,7 @@ const GFXVideoMode & Win32Window::getVideoMode()
return mVideoMode;
}
void Win32Window::setVideoMode( const GFXVideoMode &mode )
void Win32Window::_setVideoMode( const GFXVideoMode &mode )
{
bool needCurtain = ( mVideoMode.fullScreen != mode.fullScreen );
@ -277,7 +277,6 @@ void Win32Window::setVideoMode( const GFXVideoMode &mode )
mOwningManager->raiseCurtain();
SetForegroundWindow( getHWND() );
resizeEvent.trigger( this, true );
}
bool Win32Window::clearFullscreen()

2
Engine/source/windowManager/win32/win32Window.h
View file

@ -164,7 +164,7 @@ public:
virtual GFXDevice *getGFXDevice();
virtual GFXWindowTarget *getGFXTarget();
virtual void setVideoMode(const GFXVideoMode &mode);
virtual void _setVideoMode(const GFXVideoMode &mode);
virtual const GFXVideoMode &getVideoMode();
virtual bool clearFullscreen();
virtual bool isFullscreen();