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

Core/RefCounted: Remove persistent boolean 

Former-commit-id: 6661b29e0e5e1dee8f4588688dc42865ce76e9ba [formerly 55e47c5ec3851e55243fb0e8e85d7fcc22f6cc1b]
Former-commit-id: 5442ab91a3a4b7da93c10bd06889785ac1faf034
This commit is contained in:
Lynix 2016-08-02 12:52:49 +02:00
parent 870305b403
commit 755bf0b04b
28 changed files with 4 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Audio/SoundBuffer.inl
View File

@ -18,8 +18,6 @@ namespace Nz
SoundBufferRef SoundBuffer::New(Args&&... args)
{
std::unique_ptr<SoundBuffer> object(new SoundBuffer(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

7
include/Nazara/Core/RefCounted.hpp
View File

@ -22,7 +22,7 @@ namespace Nz
class NAZARA_CORE_API RefCounted
{
public:
RefCounted(bool persistent = true);
RefCounted();
RefCounted(const RefCounted&) = delete;
RefCounted(RefCounted&&) = default;
virtual ~RefCounted();
@ -31,17 +31,12 @@ namespace Nz
unsigned int GetReferenceCount() const;
bool IsPersistent() const;
bool RemoveReference() const;
bool SetPersistent(bool persistent = true, bool checkReferenceCount = false);
RefCounted& operator=(const RefCounted&) = delete;
RefCounted& operator=(RefCounted&&) = default;
private:
std::atomic_bool m_persistent;
mutable std::atomic_uint m_referenceCount;
};
}

2
include/Nazara/Graphics/Billboard.inl
View File

@ -234,8 +234,6 @@ namespace Nz
BillboardRef Billboard::New(Args&&... args)
{
std::unique_ptr<Billboard> object(new Billboard(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Graphics/ColorBackground.inl
View File

@ -18,8 +18,6 @@ namespace Nz
ColorBackgroundRef ColorBackground::New(Args&&... args)
{
std::unique_ptr<ColorBackground> object(new ColorBackground(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Graphics/Material.inl
View File

@ -1099,8 +1099,6 @@ namespace Nz
MaterialRef Material::New(Args&&... args)
{
std::unique_ptr<Material> object(new Material(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Graphics/Model.inl
View File

@ -18,8 +18,6 @@ namespace Nz
ModelRef Model::New(Args&&... args)
{
std::unique_ptr<Model> object(new Model(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Graphics/SkyboxBackground.inl
View File

@ -119,8 +119,6 @@ namespace Nz
SkyboxBackgroundRef SkyboxBackground::New(Args&&... args)
{
std::unique_ptr<SkyboxBackground> object(new SkyboxBackground(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Graphics/Sprite.inl
View File

@ -271,8 +271,6 @@ namespace Nz
SpriteRef Sprite::New(Args&&... args)
{
std::unique_ptr<Sprite> object(new Sprite(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Graphics/TextSprite.inl
View File

@ -210,8 +210,6 @@ namespace Nz
TextSpriteRef TextSprite::New(Args&&... args)
{
std::unique_ptr<TextSprite> object(new TextSprite(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Graphics/TextureBackground.inl
View File

@ -41,8 +41,6 @@ namespace Nz
TextureBackgroundRef TextureBackground::New(Args&&... args)
{
std::unique_ptr<TextureBackground> object(new TextureBackground(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Graphics/TileMap.inl
View File

@ -432,8 +432,6 @@ namespace Nz
TileMapRef TileMap::New(Args&&... args)
{
std::unique_ptr<TileMap> object(new TileMap(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

16
include/Nazara/Physics/Geom.inl
View File

@ -11,8 +11,6 @@ namespace Nz
BoxGeomRef BoxGeom::New(Args&&... args)
{
std::unique_ptr<BoxGeom> object(new BoxGeom(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
@ -20,8 +18,6 @@ namespace Nz
CapsuleGeomRef CapsuleGeom::New(Args&&... args)
{
std::unique_ptr<CapsuleGeom> object(new CapsuleGeom(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
@ -29,8 +25,6 @@ namespace Nz
CompoundGeomRef CompoundGeom::New(Args&&... args)
{
std::unique_ptr<CompoundGeom> object(new CompoundGeom(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
@ -38,8 +32,6 @@ namespace Nz
ConeGeomRef ConeGeom::New(Args&&... args)
{
std::unique_ptr<ConeGeom> object(new ConeGeom(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
@ -47,8 +39,6 @@ namespace Nz
ConvexHullGeomRef ConvexHullGeom::New(Args&&... args)
{
std::unique_ptr<ConvexHullGeom> object(new ConvexHullGeom(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
@ -56,8 +46,6 @@ namespace Nz
CylinderGeomRef CylinderGeom::New(Args&&... args)
{
std::unique_ptr<CylinderGeom> object(new CylinderGeom(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
@ -65,8 +53,6 @@ namespace Nz
NullGeomRef NullGeom::New(Args&&... args)
{
std::unique_ptr<NullGeom> object(new NullGeom(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
@ -74,8 +60,6 @@ namespace Nz
SphereGeomRef SphereGeom::New(Args&&... args)
{
std::unique_ptr<SphereGeom> object(new SphereGeom(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Renderer/RenderBuffer.inl
View File

@ -11,8 +11,6 @@ namespace Nz
RenderBufferRef RenderBuffer::New(Args&&... args)
{
std::unique_ptr<RenderBuffer> object(new RenderBuffer(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Renderer/Shader.inl
View File

@ -11,8 +11,6 @@ namespace Nz
ShaderRef Shader::New(Args&&... args)
{
std::unique_ptr<Shader> object(new Shader(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Renderer/Texture.inl
View File

@ -11,8 +11,6 @@ namespace Nz
TextureRef Texture::New(Args&&... args)
{
std::unique_ptr<Texture> object(new Texture(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}

2
include/Nazara/Renderer/UberShaderPreprocessor.inl
View File

@ -11,8 +11,6 @@ namespace Nz
UberShaderPreprocessorRef UberShaderPreprocessor::New(Args&&... args)
{
std::unique_ptr<UberShaderPreprocessor> object(new UberShaderPreprocessor(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/Animation.inl
View File

@ -11,8 +11,6 @@ namespace Nz
AnimationRef Animation::New(Args&&... args)
{
std::unique_ptr<Animation> object(new Animation(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/Buffer.inl
View File

@ -11,8 +11,6 @@ namespace Nz
BufferRef Buffer::New(Args&&... args)
{
std::unique_ptr<Buffer> object(new Buffer(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/Font.inl
View File

@ -11,8 +11,6 @@ namespace Nz
FontRef Font::New(Args&&... args)
{
std::unique_ptr<Font> object(new Font(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/Image.inl
View File

@ -11,8 +11,6 @@ namespace Nz
ImageRef Image::New(Args&&... args)
{
std::unique_ptr<Image> object(new Image(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/IndexBuffer.inl
View File

@ -11,8 +11,6 @@ namespace Nz
IndexBufferRef IndexBuffer::New(Args&&... args)
{
std::unique_ptr<IndexBuffer> object(new IndexBuffer(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/Mesh.inl
View File

@ -11,8 +11,6 @@ namespace Nz
MeshRef Mesh::New(Args&&... args)
{
std::unique_ptr<Mesh> object(new Mesh(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/SkeletalMesh.inl
View File

@ -11,8 +11,6 @@ namespace Nz
SkeletalMeshRef SkeletalMesh::New(Args&&... args)
{
std::unique_ptr<SkeletalMesh> object(new SkeletalMesh(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/Skeleton.inl
View File

@ -11,8 +11,6 @@ namespace Nz
SkeletonRef Skeleton::New(Args&&... args)
{
std::unique_ptr<Skeleton> object(new Skeleton(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/StaticMesh.inl
View File

@ -11,8 +11,6 @@ namespace Nz
StaticMeshRef StaticMesh::New(Args&&... args)
{
std::unique_ptr<StaticMesh> object(new StaticMesh(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/VertexBuffer.inl
View File

@ -11,8 +11,6 @@ namespace Nz
VertexBufferRef VertexBuffer::New(Args&&... args)
{
std::unique_ptr<VertexBuffer> object(new VertexBuffer(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

2
include/Nazara/Utility/VertexDeclaration.inl
View File

@ -11,8 +11,6 @@ namespace Nz
VertexDeclarationRef VertexDeclaration::New(Args&&... args)
{
std::unique_ptr<VertexDeclaration> object(new VertexDeclaration(std::forward<Args>(args)...));
object->SetPersistent(false);
return object.release();
}
}

41
src/Nazara/Core/RefCounted.cpp
View File

@ -23,13 +23,10 @@ namespace Nz
*/
/*!
* \brief Constructs a RefCounted object with a persistance aspect
*
* \param persistent if false, object is destroyed when no more referenced
* \brief Constructs a RefCounted object
*/
RefCounted::RefCounted(bool persistent) :
m_persistent(persistent),
RefCounted::RefCounted() :
m_referenceCount(0)
{
}
@ -67,16 +64,6 @@ namespace Nz
return m_referenceCount;
}
/*!
* \brief Checks whether the object is persistent
* \return true if object is not destroyed when no more referenced
*/
bool RefCounted::IsPersistent() const
{
return m_persistent;
}
/*!
* \brief Removes a reference to the object
* \return true if object is deleted because no more referenced
@ -94,7 +81,7 @@ namespace Nz
}
#endif
if (--m_referenceCount == 0 && !m_persistent)
if (--m_referenceCount == 0)
{
delete this; // Suicide
@ -103,26 +90,4 @@ namespace Nz
else
return false;
}
/*!
* \brief Sets the persistence of the object
* \return true if object is deleted because no more referenced
*
* \param persistent Sets the persistence of the object
* \param checkReferenceCount Checks if the object should be destroyed if true
*/
bool RefCounted::SetPersistent(bool persistent, bool checkReferenceCount)
{
m_persistent = persistent;
if (checkReferenceCount && !persistent && m_referenceCount == 0)
{
delete this;
return true;
}
else
return false;
}
}