sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix WindowHandles

Browse Source
This commit is contained in:
Lynix
2020-05-27 18:55:03 +02:00
parent 65ee3c5c2a
commit 2d189dc85e
11 changed files with 143 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Renderer/ContextParameters.hpp
View File

@@ -26,7 +26,7 @@ namespace Nz
minorVersion(defaultMinorVersion),
stencilBits(parameters.stencilBits),
shareContext(defaultShareContext),
window(0),
window(nullptr),
compatibilityProfile(defaultCompatibilityProfile),
debugMode(defaultDebugMode),
doubleBuffered(defaultDoubleBuffered),
@@ -41,7 +41,7 @@ namespace Nz
UInt8 minorVersion;
UInt8 stencilBits;
const Context* shareContext;
WindowHandle window;
void* window;
bool compatibilityProfile;
bool debugMode;
bool doubleBuffered;

4
include/Nazara/Renderer/RenderWindow.hpp
View File

@@ -29,7 +29,7 @@ namespace Nz
public:
RenderWindow() = default;
RenderWindow(VideoMode mode, const String& title, WindowStyleFlags style = WindowStyle_Default, const ContextParameters& parameters = ContextParameters());
explicit RenderWindow(WindowHandle handle, const ContextParameters& parameters = ContextParameters());
explicit RenderWindow(void* handle, const ContextParameters& parameters = ContextParameters());
RenderWindow(const RenderWindow&) = delete;
RenderWindow(RenderWindow&&) = delete; ///TODO
virtual ~RenderWindow();
@@ -38,7 +38,7 @@ namespace Nz
bool CopyToImage(AbstractImage* image, const Rectui& rect, const Vector3ui& dstPos = Vector3ui(0U)) const;
bool Create(VideoMode mode, const String& title, WindowStyleFlags style = WindowStyle_Default, const ContextParameters& parameters = ContextParameters());
bool Create(WindowHandle handle, const ContextParameters& parameters = ContextParameters());
bool Create(void* handle, const ContextParameters& parameters = ContextParameters());
void Display();