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

Minor changes 

Former-commit-id: 5954ff863d8f51d7ed47a1b84ae9ff0a5348ecce
This commit is contained in:
Lynix 2013-08-16 00:27:42 +02:00
parent 699328aa1f
commit e31a670041
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Nazara/Core/ResourceRef.hpp
View File

@ -17,7 +17,7 @@ class NzResourceRef
static_assert(std::is_base_of<NzResource, T>::value, "ResourceRef should only be used with resource type"); static_assert(std::is_base_of<NzResource, T>::value, "ResourceRef should only be used with resource type");
public: public:
NzResourceRef() = default; NzResourceRef();
NzResourceRef(T* resource); NzResourceRef(T* resource);
NzResourceRef(const NzResourceRef& ref); NzResourceRef(const NzResourceRef& ref);
NzResourceRef(NzResourceRef&& ref) noexcept; NzResourceRef(NzResourceRef&& ref) noexcept;
@ -37,7 +37,7 @@ class NzResourceRef
NzResourceRef& operator=(NzResourceRef&& ref) noexcept; NzResourceRef& operator=(NzResourceRef&& ref) noexcept;
private: private:
T* m_resource = nullptr; T* m_resource;
}; };
#include <Nazara/Core/ResourceRef.inl> #include <Nazara/Core/ResourceRef.inl>

6
include/Nazara/Core/ResourceRef.inl
View File

@ -5,6 +5,12 @@
#include <Nazara/Core/Initializer.hpp> #include <Nazara/Core/Initializer.hpp>
#include <Nazara/Core/Debug.hpp> #include <Nazara/Core/Debug.hpp>
template<typename T>
NzResourceRef<T>::NzResourceRef() :
m_resource(nullptr)
{
}
template<typename T> template<typename T>
NzResourceRef<T>::NzResourceRef(T* resource) : NzResourceRef<T>::NzResourceRef(T* resource) :
m_resource(resource) m_resource(resource)

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

@ -1197,13 +1197,14 @@ void NzOpenGL::Uninitialize()
{ {
if (s_initialized) if (s_initialized)
{ {
s_initialized = false;
NzContext::Uninitialize(); NzContext::Uninitialize();
for (bool& ext : s_openGLextensions) for (bool& ext : s_openGLextensions)
ext = false; ext = false;
s_glslVersion = 0; s_glslVersion = 0;
s_initialized = false;
s_openGLextensionSet.clear(); s_openGLextensionSet.clear();
s_openglVersion = 0; s_openglVersion = 0;
s_rendererName.Clear(false); s_rendererName.Clear(false);