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

Merge remote-tracking branch 'origin/master' into Resource-Update

Browse Source 
Conflicts:
	include/Nazara/Audio/Music.hpp
	include/Nazara/Audio/SoundBuffer.hpp
	include/Nazara/Core/Resource.hpp
	include/Nazara/Core/ResourceListener.hpp
	include/Nazara/Graphics/Material.hpp
	include/Nazara/Renderer/Context.hpp
	include/Nazara/Renderer/RenderBuffer.hpp
	include/Nazara/Renderer/Shader.hpp
	include/Nazara/Renderer/Texture.hpp
	include/Nazara/Renderer/UberShader.hpp
	include/Nazara/Utility/Animation.hpp
	include/Nazara/Utility/Buffer.hpp
	include/Nazara/Utility/Image.hpp
	include/Nazara/Utility/IndexBuffer.hpp
	include/Nazara/Utility/Mesh.hpp
	include/Nazara/Utility/SkeletalMesh.hpp
	include/Nazara/Utility/Skeleton.hpp
	include/Nazara/Utility/StaticMesh.hpp
	include/Nazara/Utility/SubMesh.hpp
	include/Nazara/Utility/VertexBuffer.hpp
	include/Nazara/Utility/VertexDeclaration.hpp
	src/Nazara/Core/Resource.cpp
	src/Nazara/Core/ResourceListener.cpp
	src/Nazara/Graphics/DeferredRenderQueue.cpp
	src/Nazara/Graphics/ForwardRenderQueue.cpp
	src/Nazara/Graphics/SkinningManager.cpp
	src/Nazara/Renderer/RenderTexture.cpp
	src/Nazara/Renderer/Renderer.cpp
	src/Nazara/Utility/Mesh.cpp

Former-commit-id: 99b5ad26a19fe9c9f8118da7b5920bffe89f60f8
This commit is contained in:
Lynix
2015-01-25 19:29:55 +01:00
parent 9e04e8a0e4 9e96a2061f
commit 5f5be93992
579 changed files with 11958 additions and 3706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
include/Nazara/Core/ObjectRef.inl
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2014 Jérôme Leclercq
// Copyright (C) 2015 Jérôme Leclercq
// This file is part of the "Nazara Engine - Core module"
// For conditions of distribution and use, see copyright notice in Config.hpp
@@ -7,70 +7,70 @@
template<typename T>
NzObjectRef<T>::NzObjectRef() :
m_resource(nullptr)
m_object(nullptr)
{
}
template<typename T>
NzObjectRef<T>::NzObjectRef(T* resource) :
m_resource(resource)
NzObjectRef<T>::NzObjectRef(T* object) :
m_object(object)
{
if (m_resource)
m_resource->AddReference();
if (m_object)
m_object->AddReference();
}
template<typename T>
NzObjectRef<T>::NzObjectRef(const NzObjectRef& ref) :
m_resource(ref.m_resource)
m_object(ref.m_object)
{
if (m_resource)
m_resource->AddReference();
if (m_object)
m_object->AddReference();
}
template<typename T>
NzObjectRef<T>::NzObjectRef(NzObjectRef&& ref) noexcept :
m_resource(ref.m_resource)
m_object(ref.m_object)
{
ref.m_resource = nullptr; // On vole la référence
ref.m_object = nullptr; // On vole la référence
}
template<typename T>
NzObjectRef<T>::~NzObjectRef()
{
if (m_resource)
m_resource->RemoveReference();
if (m_object)
m_object->RemoveReference();
}
template<typename T>
bool NzObjectRef<T>::IsValid() const
{
return m_resource != nullptr;
return m_object != nullptr;
}
template<typename T>
T* NzObjectRef<T>::Release()
{
T* resource = m_resource;
m_resource = nullptr;
T* object = m_object;
m_object = nullptr;
return resource;
return object;
}
template<typename T>
bool NzObjectRef<T>::Reset(T* resource)
bool NzObjectRef<T>::Reset(T* object)
{
bool destroyed = false;
if (m_resource != resource)
if (m_object != object)
{
if (m_resource)
if (m_object)
{
destroyed = m_resource->RemoveReference();
m_resource = nullptr;
destroyed = m_object->RemoveReference();
m_object = nullptr;
}
m_resource = resource;
if (m_resource)
m_resource->AddReference();
m_object = object;
if (m_object)
m_object->AddReference();
}
return destroyed;
@@ -79,7 +79,7 @@ bool NzObjectRef<T>::Reset(T* resource)
template<typename T>
NzObjectRef<T>& NzObjectRef<T>::Swap(NzObjectRef& ref)
{
std::swap(m_resource, ref.m_resource);
std::swap(m_object, ref.m_object);
return *this;
}
@@ -93,19 +93,19 @@ NzObjectRef<T>::operator bool() const
template<typename T>
NzObjectRef<T>::operator T*() const
{
return m_resource;
return m_object;
}
template<typename T>
T* NzObjectRef<T>::operator->() const
{
return m_resource;
return m_object;
}
template<typename T>
NzObjectRef<T>& NzObjectRef<T>::operator=(T* resource)
NzObjectRef<T>& NzObjectRef<T>::operator=(T* object)
{
Reset(resource);
Reset(object);
return *this;
}
@@ -113,7 +113,7 @@ NzObjectRef<T>& NzObjectRef<T>::operator=(T* resource)
template<typename T>
NzObjectRef<T>& NzObjectRef<T>::operator=(const NzObjectRef& ref)
{
Reset(ref.m_resource);
Reset(ref.m_object);
return *this;
}
@@ -123,7 +123,7 @@ NzObjectRef<T>& NzObjectRef<T>::operator=(NzObjectRef&& ref) noexcept
{
Reset();
std::swap(m_resource, ref.m_resource);
std::swap(m_object, ref.m_object);
return *this;
}