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

Merge branch 'master' into NDK

Browse Source 
Conflicts:
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua
	include/Nazara/Renderer/OpenGL.hpp
	src/Nazara/Core/String.cpp

Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f
This commit is contained in:
Lynix
2015-09-20 23:41:21 +02:00
parent ea3644ef44 f1c8d09a82
commit b16abf0d09
45 changed files with 3702 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nazara/Renderer/Win32/ContextImpl.cpp
View File

@@ -226,6 +226,14 @@ void NzContextImpl::Destroy()
}
}
void NzContextImpl::EnableVerticalSync(bool enabled)
{
if (wglSwapInterval)
wglSwapInterval(enabled ? 1 : 0);
else
NazaraError("Vertical sync not supported");
}
void NzContextImpl::SwapBuffers()
{
::SwapBuffers(m_deviceContext);

5
src/Nazara/Renderer/Win32/ContextImpl.hpp
View File

@@ -17,8 +17,13 @@ class NzContextImpl
NzContextImpl();
bool Activate();
bool Create(NzContextParameters& parameters);
void Destroy();
void EnableVerticalSync(bool enabled);
void SwapBuffers();
static bool Desactivate();