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

New module: Platform - Split window management from Utility module (#128)

Browse Source 
* New module: Platform - Split window management from Utility module

Final touch

* NDK/SDK: Bring back initialization of Utility
This commit is contained in:
Gawaboumga
2017-08-30 10:22:50 +02:00
committed by Jérôme Leclercq
parent 41a1b5d493
commit 5aa072cee3
125 changed files with 1049 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Renderer/OpenGL.cpp
View File

@@ -10,7 +10,7 @@
#include <Nazara/Renderer/Context.hpp>
#include <Nazara/Renderer/RenderTarget.hpp>
#if defined(NAZARA_PLATFORM_GLX)
#include <Nazara/Utility/X11/Display.hpp>
#include <Nazara/Platform/X11/Display.hpp>
#endif // NAZARA_PLATFORM_GLX
#include <cstring>
#include <set>

7
src/Nazara/Renderer/Renderer.cpp
View File

@@ -25,6 +25,7 @@
#include <Nazara/Utility/Utility.hpp>
#include <Nazara/Utility/VertexBuffer.hpp>
#include <Nazara/Utility/VertexDeclaration.hpp>
#include <Nazara/Platform/Platform.hpp>
#include <map>
#include <memory>
#include <set>
@@ -579,9 +580,9 @@ namespace Nz
}
// Initialisation des dépendances
if (!Utility::Initialize())
if (!Platform::Initialize())
{
NazaraError("Failed to initialize Utility module");
NazaraError("Failed to initialize Platform module");
return false;
}
@@ -1402,7 +1403,7 @@ namespace Nz
NazaraNotice("Uninitialized: Renderer module");
// Libération des dépendances
Utility::Uninitialize();
Platform::Uninitialize();
}
void Renderer::EnableInstancing(bool instancing)