Revert "Core/RefCounted: Remove persistent boolean"
This reverts commit db2ef3e90c3871290d114a9e6437b412e96c65aa [formerly a3f6ff88a25e63374eb6ce5b18269da2ba743b06] [formerly cfa12604fbb0da76fc27288b210ee1254a8b3a38 [formerly dee6ce858398e2de38ef1af00c1c630fd0126e09]] [formerly 1a23f0fddcd80ac33030061b7a00a3cfd43cb7fe [formerly d3cb17069c71449ae3f1cba6de55ea70f509e7a4] [formerly b2f8f82e9f3427310204f2e8a61d7bdfd96202d2 [formerly 5d117720d08d6d6243b3428d4b3f8aea1abef845]]]. Former-commit-id: a7af09faec974d268de6680f2c0c16d531048935 [formerly 37761044d13cf2e2041c9eed9ff113a41efd87f8] [formerly ae05b7afb5f43daf90cd8182bf24c98067be4d16 [formerly 6633982a51ba117a749f08efda338455eabe59b3]] Former-commit-id: a4c99f7c8c26a0c1276eb5262871a1964d470bfb [formerly 741d46a0838a64e92aaa46fe563493da10d62c98] Former-commit-id: fe30e63aeb19e56fa64447bdd884766f84f305dd
This commit is contained in:
@@ -18,6 +18,8 @@ namespace Nz
|
||||
SoundBufferRef SoundBuffer::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<SoundBuffer> object(new SoundBuffer(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace Nz
|
||||
class NAZARA_CORE_API RefCounted
|
||||
{
|
||||
public:
|
||||
RefCounted();
|
||||
RefCounted(bool persistent = true);
|
||||
RefCounted(const RefCounted&) = delete;
|
||||
RefCounted(RefCounted&&) = default;
|
||||
virtual ~RefCounted();
|
||||
@@ -31,12 +31,17 @@ 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;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -234,6 +234,8 @@ namespace Nz
|
||||
BillboardRef Billboard::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Billboard> object(new Billboard(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,8 @@ namespace Nz
|
||||
ColorBackgroundRef ColorBackground::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<ColorBackground> object(new ColorBackground(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1099,6 +1099,8 @@ namespace Nz
|
||||
MaterialRef Material::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Material> object(new Material(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,8 @@ namespace Nz
|
||||
ModelRef Model::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Model> object(new Model(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -119,6 +119,8 @@ namespace Nz
|
||||
SkyboxBackgroundRef SkyboxBackground::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<SkyboxBackground> object(new SkyboxBackground(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -271,6 +271,8 @@ namespace Nz
|
||||
SpriteRef Sprite::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Sprite> object(new Sprite(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -210,6 +210,8 @@ namespace Nz
|
||||
TextSpriteRef TextSprite::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<TextSprite> object(new TextSprite(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,6 +41,8 @@ namespace Nz
|
||||
TextureBackgroundRef TextureBackground::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<TextureBackground> object(new TextureBackground(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -432,6 +432,8 @@ namespace Nz
|
||||
TileMapRef TileMap::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<TileMap> object(new TileMap(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
BoxGeomRef BoxGeom::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<BoxGeom> object(new BoxGeom(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
|
||||
@@ -18,6 +20,8 @@ namespace Nz
|
||||
CapsuleGeomRef CapsuleGeom::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<CapsuleGeom> object(new CapsuleGeom(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
|
||||
@@ -25,6 +29,8 @@ namespace Nz
|
||||
CompoundGeomRef CompoundGeom::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<CompoundGeom> object(new CompoundGeom(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
|
||||
@@ -32,6 +38,8 @@ namespace Nz
|
||||
ConeGeomRef ConeGeom::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<ConeGeom> object(new ConeGeom(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
|
||||
@@ -39,6 +47,8 @@ namespace Nz
|
||||
ConvexHullGeomRef ConvexHullGeom::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<ConvexHullGeom> object(new ConvexHullGeom(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
|
||||
@@ -46,6 +56,8 @@ namespace Nz
|
||||
CylinderGeomRef CylinderGeom::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<CylinderGeom> object(new CylinderGeom(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
|
||||
@@ -53,6 +65,8 @@ namespace Nz
|
||||
NullGeomRef NullGeom::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<NullGeom> object(new NullGeom(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
|
||||
@@ -60,6 +74,8 @@ namespace Nz
|
||||
SphereGeomRef SphereGeom::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<SphereGeom> object(new SphereGeom(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
RenderBufferRef RenderBuffer::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<RenderBuffer> object(new RenderBuffer(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
ShaderRef Shader::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Shader> object(new Shader(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
TextureRef Texture::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Texture> object(new Texture(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
UberShaderPreprocessorRef UberShaderPreprocessor::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<UberShaderPreprocessor> object(new UberShaderPreprocessor(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
AnimationRef Animation::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Animation> object(new Animation(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
BufferRef Buffer::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Buffer> object(new Buffer(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
FontRef Font::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Font> object(new Font(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
ImageRef Image::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Image> object(new Image(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
IndexBufferRef IndexBuffer::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<IndexBuffer> object(new IndexBuffer(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
MeshRef Mesh::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Mesh> object(new Mesh(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
SkeletalMeshRef SkeletalMesh::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<SkeletalMesh> object(new SkeletalMesh(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
SkeletonRef Skeleton::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<Skeleton> object(new Skeleton(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
StaticMeshRef StaticMesh::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<StaticMesh> object(new StaticMesh(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
VertexBufferRef VertexBuffer::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<VertexBuffer> object(new VertexBuffer(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,8 @@ namespace Nz
|
||||
VertexDeclarationRef VertexDeclaration::New(Args&&... args)
|
||||
{
|
||||
std::unique_ptr<VertexDeclaration> object(new VertexDeclaration(std::forward<Args>(args)...));
|
||||
object->SetPersistent(false);
|
||||
|
||||
return object.release();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user