mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Remove SDL_Window from IDrawingEngine and UiContext

Browse Source
This commit is contained in:
Ted John
2017-06-10 17:05:21 +01:00
parent b32f0b276d
commit fc899d15ef
10 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/UiContext.cpp
View File

@@ -102,7 +102,7 @@ public:
}
// Window
SDL_Window * GetWindow() override
void * GetWindow() override
{
return _window;
}

7
src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
View File

@@ -55,7 +55,7 @@ public:
explicit HardwareDisplayDrawingEngine(IUiContext * uiContext)
: _uiContext(uiContext)
{
UNUSED(_uiContext); // Will be used in due course to retrieve window information
_window = (SDL_Window *)_uiContext->GetWindow();
}
~HardwareDisplayDrawingEngine() override
@@ -65,10 +65,9 @@ public:
SDL_DestroyRenderer(_sdlRenderer);
}
void Initialise(SDL_Window * window) override
void Initialise() override
{
_window = window;
_sdlRenderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
_sdlRenderer = SDL_CreateRenderer(_window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
}
void Resize(uint32 width, uint32 height) override

5
src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp
View File

@@ -46,7 +46,7 @@ public:
explicit SoftwareDrawingEngine(IUiContext * uiContext)
: _uiContext(uiContext)
{
UNUSED(_uiContext); // Will be used in due course to retrieve window information
_window = (SDL_Window *)_uiContext->GetWindow();
}
~SoftwareDrawingEngine() override
@@ -56,9 +56,8 @@ public:
SDL_FreePalette(_palette);
}
void Initialise(SDL_Window * window) override
void Initialise() override
{
_window = window;
}
void Resize(uint32 width, uint32 height) override

6
src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
View File

@@ -250,7 +250,7 @@ public:
OpenGLDrawingEngine(IUiContext * uiContext)
: _uiContext(uiContext)
{
UNUSED(_uiContext); // Will be used in due course to retrieve window information
_window = (SDL_Window *)_uiContext->GetWindow();
_drawingContext = new OpenGLDrawingContext(this);
}
@@ -266,10 +266,8 @@ public:
SDL_GL_DeleteContext(_context);
}
void Initialise(SDL_Window * window) override
void Initialise() override
{
_window = window;
OpenGLVersion requiredVersion = OPENGL_MINIMUM_REQUIRED_VERSION;
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, requiredVersion.Major);

2
src/openrct2/drawing/IDrawingEngine.h
View File

@@ -51,7 +51,7 @@ namespace OpenRCT2 { namespace Drawing
{
virtual ~IDrawingEngine() { }
virtual void Initialise(SDL_Window * window) abstract;
virtual void Initialise() abstract;
virtual void Resize(uint32 width, uint32 height) abstract;
virtual void SetPalette(const rct_palette_entry * colours) abstract;

2
src/openrct2/drawing/NewDrawing.cpp
View File

@@ -104,7 +104,7 @@ extern "C"
{
try
{
drawingEngine->Initialise(uiContext->GetWindow());
drawingEngine->Initialise();
drawingEngine->SetUncappedFrameRate(gConfigGeneral.uncap_fps == 1);
_drawingEngine = drawingEngine;
}

2
src/openrct2/drawing/X8DrawingEngine.cpp
View File

@@ -151,7 +151,7 @@ X8DrawingEngine::~X8DrawingEngine()
delete [] _bits;
}
void X8DrawingEngine::Initialise(SDL_Window * window)
void X8DrawingEngine::Initialise()
{
}

2
src/openrct2/drawing/X8DrawingEngine.h
View File

@@ -85,7 +85,7 @@ namespace OpenRCT2 { namespace Drawing
explicit X8DrawingEngine();
~X8DrawingEngine() override;
void Initialise(SDL_Window * window) override;
void Initialise() override;
void Resize(uint32 width, uint32 height) override;
void SetPalette(const rct_palette_entry * palette) override;
void SetUncappedFrameRate(bool uncapped) override;

2
src/openrct2/ui/DummyUiContext.cpp
View File

@@ -28,7 +28,7 @@ namespace OpenRCT2 { namespace Ui
{
void CreateWindow() override { }
void CloseWindow() override { }
SDL_Window * GetWindow() override { return nullptr; }
void * GetWindow() override { return nullptr; }
sint32 GetWidth() override { return 0; }
sint32 GetHeight() override { return 0; }
void SetFullscreenMode(FULLSCREEN_MODE mode) override { }

8
src/openrct2/ui/UiContext.h
View File

@@ -22,8 +22,6 @@
#include "../Context.h"
#include "../interface/Cursors.h"
struct SDL_Window;
namespace OpenRCT2
{
namespace Drawing
@@ -92,9 +90,9 @@ namespace OpenRCT2
virtual ~IUiContext() = default;
// Window
virtual void CreateWindow() abstract;
virtual void CloseWindow() abstract;
virtual SDL_Window * GetWindow() abstract;
virtual void CreateWindow() abstract;
virtual void CloseWindow() abstract;
virtual void * GetWindow() abstract;
virtual sint32 GetWidth() abstract;
virtual sint32 GetHeight() abstract;
virtual void SetFullscreenMode(FULLSCREEN_MODE mode) abstract;