Added a Library to most reference-counted classes

Former-commit-id: 3ed409a71dcd5ce4eec7672ac26f8fff00e3b136
2015-01-28 18:06:05 +01:00
parent e18e490c59
commit 53162c1722
34 changed files with 438 additions and 32 deletions
--- a/include/Nazara/Audio/SoundBuffer.hpp
+++ b/include/Nazara/Audio/SoundBuffer.hpp
@@ -12,6 +12,7 @@
 #include <Nazara/Core/InputStream.hpp>
 #include <Nazara/Core/NonCopyable.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/RefCounted.hpp>
 #include <Nazara/Core/Resource.hpp>
@@ -29,6 +30,7 @@ class NzSoundBuffer;

 using NzSoundBufferConstListener = NzObjectListenerWrapper<const NzSoundBuffer>;
 using NzSoundBufferConstRef = NzObjectRef<const NzSoundBuffer>;
+using NzSoundBufferLibrary = NzObjectLibrary<NzSoundBuffer>;
 using NzSoundBufferListener = NzObjectListenerWrapper<NzSoundBuffer>;
 using NzSoundBufferLoader = NzResourceLoader<NzSoundBuffer, NzSoundBufferParams>;
 using NzSoundBufferRef = NzObjectRef<NzSoundBuffer>;
@@ -38,7 +40,9 @@ struct NzSoundBufferImpl;
 class NAZARA_API NzSoundBuffer : public NzRefCounted, public NzResource, NzNonCopyable
 {
 	friend NzSound;
+	friend NzSoundBufferLibrary;
 	friend NzSoundBufferLoader;
+	friend class NzAudio;

 	public:
 		NzSoundBuffer() = default;
@@ -66,8 +70,12 @@ class NAZARA_API NzSoundBuffer : public NzRefCounted, public NzResource, NzNonCo
 	private:
 		unsigned int GetOpenALBuffer() const;

+		static bool Initialize();
+		static void Uninitialize();
+
 		NzSoundBufferImpl* m_impl = nullptr;

+		static NzSoundBufferLibrary::LibraryMap s_library;
 		static NzSoundBufferLoader::LoaderList s_loaders;
 };

--- a/include/Nazara/Graphics/Material.hpp
+++ b/include/Nazara/Graphics/Material.hpp
@@ -9,6 +9,7 @@

 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/Color.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -38,12 +39,14 @@ class NzMaterial;

 using NzMaterialConstListener = NzObjectListenerWrapper<const NzMaterial>;
 using NzMaterialConstRef = NzObjectRef<const NzMaterial>;
+using NzMaterialLibrary = NzObjectLibrary<NzMaterial>;
 using NzMaterialListener = NzObjectListenerWrapper<NzMaterial>;
 using NzMaterialLoader = NzResourceLoader<NzMaterial, NzMaterialParams>;
 using NzMaterialRef = NzObjectRef<NzMaterial>;

 class NAZARA_API NzMaterial : public NzRefCounted, public NzResource
 {
+	friend NzMaterialLibrary;
 	friend NzMaterialLoader;
 	friend class NzGraphics;

@@ -172,8 +175,9 @@ class NAZARA_API NzMaterial : public NzRefCounted, public NzResource
 		float m_alphaThreshold;
 		float m_shininess;

-		static NzMaterialRef s_defaultMaterial;
+		static NzMaterialLibrary::LibraryMap s_library;
 		static NzMaterialLoader::LoaderList s_loaders;
+		static NzMaterialRef s_defaultMaterial;
 };

 #include <Nazara/Graphics/Material.inl>
--- a/include/Nazara/Graphics/ParticleController.hpp
+++ b/include/Nazara/Graphics/ParticleController.hpp
@@ -8,6 +8,7 @@
 #define NAZARA_PARTICLECONTROLLER_HPP

 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -18,17 +19,27 @@ class NzParticleSystem;

 using NzParticleControllerConstListener = NzObjectListenerWrapper<const NzParticleController>;
 using NzParticleControllerConstRef = NzObjectRef<const NzParticleController>;
+using NzParticleControllerLibrary = NzObjectLibrary<NzParticleController>;
 using NzParticleControllerListener = NzObjectListenerWrapper<NzParticleController>;
 using NzParticleControllerRef = NzObjectRef<NzParticleController>;

 class NAZARA_API NzParticleController : public NzRefCounted
 {
+	friend NzParticleControllerLibrary;
+	friend class NzGraphics;
+
 	public:
 		NzParticleController() = default;
 		NzParticleController(const NzParticleController& controller);
 		virtual ~NzParticleController();

 		virtual void Apply(NzParticleSystem& system, NzParticleMapper& mapper, unsigned int startId, unsigned int endId, float elapsedTime) = 0;
+
+	private:
+		static bool Initialize();
+		static void Uninitialize();
+
+		static NzParticleControllerLibrary::LibraryMap s_library;
 };

 #endif // NAZARA_PARTICLECONTROLLER_HPP
--- a/include/Nazara/Graphics/ParticleDeclaration.hpp
+++ b/include/Nazara/Graphics/ParticleDeclaration.hpp
@@ -8,6 +8,7 @@
 #define NAZARA_PARTICLEDECLARATION_HPP

 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -18,11 +19,13 @@ class NzParticleDeclaration;

 using NzParticleDeclarationConstListener = NzObjectListenerWrapper<const NzParticleDeclaration>;
 using NzParticleDeclarationConstRef = NzObjectRef<const NzParticleDeclaration>;
+using NzParticleDeclarationLibrary = NzObjectLibrary<NzParticleDeclaration>;
 using NzParticleDeclarationListener = NzObjectListenerWrapper<NzParticleDeclaration>;
 using NzParticleDeclarationRef = NzObjectRef<NzParticleDeclaration>;

 class NAZARA_API NzParticleDeclaration : public NzRefCounted
 {
+	friend NzParticleDeclarationLibrary;
 	friend class NzGraphics;

 	public:
@@ -65,6 +68,7 @@ class NAZARA_API NzParticleDeclaration : public NzRefCounted
 		unsigned int m_stride;

 		static NzParticleDeclaration s_declarations[nzParticleLayout_Max+1];
+		static NzParticleDeclarationLibrary::LibraryMap s_library;
 };

 #endif // NAZARA_PARTICLEDECLARATION_HPP
--- a/include/Nazara/Graphics/ParticleGenerator.hpp
+++ b/include/Nazara/Graphics/ParticleGenerator.hpp
@@ -8,6 +8,7 @@
 #define NAZARA_PARTICLEGENERATOR_HPP

 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -18,17 +19,27 @@ class NzParticleSystem;

 using NzParticleGeneratorConstListener = NzObjectListenerWrapper<const NzParticleGenerator>;
 using NzParticleGeneratorConstRef = NzObjectRef<const NzParticleGenerator>;
+using NzParticleGeneratorLibrary = NzObjectLibrary<NzParticleGenerator>;
 using NzParticleGeneratorListener = NzObjectListenerWrapper<NzParticleGenerator>;
 using NzParticleGeneratorRef = NzObjectRef<NzParticleGenerator>;

 class NAZARA_API NzParticleGenerator : public NzRefCounted
 {
+	friend NzParticleGeneratorLibrary;
+	friend class NzGraphics;
+
 	public:
 		NzParticleGenerator() = default;
 		NzParticleGenerator(const NzParticleGenerator& generator);
 		virtual ~NzParticleGenerator();

 		virtual void Generate(NzParticleSystem& system, NzParticleMapper& mapper, unsigned int startId, unsigned int endId) = 0;
+
+	private:
+		static bool Initialize();
+		static void Uninitialize();
+
+		static NzParticleGeneratorLibrary::LibraryMap s_library;
 };

 #endif // NAZARA_PARTICLEGENERATOR_HPP
--- a/include/Nazara/Graphics/ParticleRenderer.hpp
+++ b/include/Nazara/Graphics/ParticleRenderer.hpp
@@ -8,6 +8,7 @@
 #define NAZARA_PARTICLERENDERER_HPP

 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -19,17 +20,27 @@ class NzParticleSystem;

 using NzParticleRendererConstListener = NzObjectListenerWrapper<const NzParticleRenderer>;
 using NzParticleRendererConstRef = NzObjectRef<const NzParticleRenderer>;
+using NzParticleRendererLibrary = NzObjectLibrary<NzParticleRenderer>;
 using NzParticleRendererListener = NzObjectListenerWrapper<NzParticleRenderer>;
 using NzParticleRendererRef = NzObjectRef<NzParticleRenderer>;

 class NAZARA_API NzParticleRenderer : public NzRefCounted
 {
+	friend NzParticleRendererLibrary;
+	friend class NzGraphics;
+
 	public:
 		NzParticleRenderer() = default;
 		NzParticleRenderer(const NzParticleRenderer& renderer);
 		virtual ~NzParticleRenderer();

 		virtual void Render(const NzParticleSystem& system, const NzParticleMapper& mapper, unsigned int startId, unsigned int endId, NzAbstractRenderQueue* renderQueue) = 0;
+
+	private:
+		static bool Initialize();
+		static void Uninitialize();
+
+		static NzParticleRendererLibrary::LibraryMap s_library;
 };

 #endif // NAZARA_PARTICLERENDERER_HPP
--- a/include/Nazara/Renderer/Context.hpp
+++ b/include/Nazara/Renderer/Context.hpp
@@ -8,6 +8,7 @@
 #define NAZARA_CONTEXT_HPP

 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -19,6 +20,7 @@ class NzContext;

 using NzContextConstListener = NzObjectListenerWrapper<const NzContext>;
 using NzContextConstRef = NzObjectRef<const NzContext>;
+using NzContextLibrary = NzObjectLibrary<NzContext>;
 using NzContextListener = NzObjectListenerWrapper<NzContext>;
 using NzContextRef = NzObjectRef<NzContext>;

@@ -27,6 +29,7 @@ class NzContextImpl;
 class NAZARA_API NzContext : public NzRefCounted
 {
 	friend NzContextImpl;
+	friend NzContextLibrary;
 	friend class NzOpenGL;

 	public:
@@ -55,6 +58,7 @@ class NAZARA_API NzContext : public NzRefCounted

 		static std::unique_ptr<NzContext> s_reference;
 		static std::vector<std::unique_ptr<NzContext>> s_contexts;
+		static NzContextLibrary::LibraryMap s_library;
 };

 #endif // NAZARA_CONTEXT_HPP
--- a/include/Nazara/Renderer/RenderBuffer.hpp
+++ b/include/Nazara/Renderer/RenderBuffer.hpp
@@ -9,6 +9,7 @@

 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/NonCopyable.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -18,11 +19,15 @@ class NzRenderBuffer;

 using NzRenderBufferConstListener = NzObjectListenerWrapper<const NzRenderBuffer>;
 using NzRenderBufferConstRef = NzObjectRef<const NzRenderBuffer>;
+using NzRenderBufferLibrary = NzObjectLibrary<NzRenderBuffer>;
 using NzRenderBufferListener = NzObjectListenerWrapper<NzRenderBuffer>;
 using NzRenderBufferRef = NzObjectRef<NzRenderBuffer>;

 class NAZARA_API NzRenderBuffer : public NzRefCounted, NzNonCopyable
 {
+	friend NzRenderBufferLibrary;
+	friend class NzRenderer;
+
 	public:
 		NzRenderBuffer();
 		~NzRenderBuffer();
@@ -43,10 +48,15 @@ class NAZARA_API NzRenderBuffer : public NzRefCounted, NzNonCopyable
 		template<typename... Args> static NzRenderBufferRef New(Args&&... args);

 	private:
+		static bool Initialize();
+		static void Uninitialize();
+
 		nzPixelFormat m_pixelFormat;
 		unsigned int m_height;
 		unsigned int m_id;
 		unsigned int m_width;
+
+		static NzRenderBufferLibrary::LibraryMap s_library;
 };

 #include <Nazara/Renderer/RenderBuffer.inl>
--- a/include/Nazara/Renderer/Texture.hpp
+++ b/include/Nazara/Renderer/Texture.hpp
@@ -9,6 +9,7 @@

 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/NonCopyable.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -22,6 +23,7 @@ class NzTexture;

 using NzTextureConstListener = NzObjectListenerWrapper<const NzTexture>;
 using NzTextureConstRef = NzObjectRef<const NzTexture>;
+using NzTextureLibrary = NzObjectLibrary<NzTexture>;
 using NzTextureListener = NzObjectListenerWrapper<NzTexture>;
 using NzTextureRef = NzObjectRef<NzTexture>;

@@ -29,6 +31,7 @@ struct NzTextureImpl;

 class NAZARA_API NzTexture : public NzAbstractImage, public NzRefCounted, public NzResource, NzNonCopyable
 {
+	friend NzTextureLibrary;
 	friend class NzRenderer;

 	public:
@@ -106,7 +109,12 @@ class NAZARA_API NzTexture : public NzAbstractImage, public NzRefCounted, public
 	private:
 		bool CreateTexture(bool proxy);

+		static bool Initialize();
+		static void Uninitialize();
+
 		NzTextureImpl* m_impl = nullptr;
+
+		static NzTextureLibrary::LibraryMap s_library;
 };

 #include <Nazara/Renderer/Texture.inl>
--- a/include/Nazara/Utility/Animation.hpp
+++ b/include/Nazara/Utility/Animation.hpp
@@ -8,6 +8,7 @@
 #define NAZARA_ANIMATION_HPP

 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -33,6 +34,7 @@ class NzSkeleton;

 using NzAnimationConstListener = NzObjectListenerWrapper<const NzAnimation>;
 using NzAnimationConstRef = NzObjectRef<const NzAnimation>;
+using NzAnimationLibrary = NzObjectLibrary<NzAnimation>;
 using NzAnimationListener = NzObjectListenerWrapper<NzAnimation>;
 using NzAnimationLoader = NzResourceLoader<NzAnimation, NzAnimationParams>;
 using NzAnimationRef = NzObjectRef<NzAnimation>;
@@ -41,7 +43,9 @@ struct NzAnimationImpl;

 class NAZARA_API NzAnimation : public NzRefCounted, public NzResource
 {
+	friend NzAnimationLibrary;
 	friend NzAnimationLoader;
+	friend class NzUtility;

 	public:
 		NzAnimation() = default;
@@ -83,8 +87,12 @@ class NAZARA_API NzAnimation : public NzRefCounted, public NzResource
 		template<typename... Args> static NzAnimationRef New(Args&&... args);

 	private:
+		static bool Initialize();
+		static void Uninitialize();
+
 		NzAnimationImpl* m_impl = nullptr;

+		static NzAnimationLibrary::LibraryMap s_library;
 		static NzAnimationLoader::LoaderList s_loaders;
 };

--- a/include/Nazara/Utility/Font.hpp
+++ b/include/Nazara/Utility/Font.hpp
@@ -9,6 +9,7 @@

 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/NonCopyable.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/Resource.hpp>
@@ -29,13 +30,16 @@ struct NzFontGlyph;

 using NzFontConstListener = NzObjectListenerWrapper<const NzFont>;
 using NzFontConstRef = NzObjectRef<const NzFont>;
+using NzFontLibrary = NzObjectLibrary<NzFont>;
 using NzFontListener = NzObjectListenerWrapper<NzFont>;
 using NzFontLoader = NzResourceLoader<NzFont, NzFontParams>;
 using NzFontRef = NzObjectRef<NzFont>;

 class NAZARA_API NzFont : public NzRefCounted, public NzResource, NzAbstractAtlas::Listener, NzNonCopyable
 {
+	friend NzFontLibrary;
 	friend NzFontLoader;
+	friend class NzUtility;

 	public:
 		struct Glyph;
@@ -83,16 +87,12 @@ class NAZARA_API NzFont : public NzRefCounted, public NzResource, NzAbstractAtla
 		static unsigned int GetDefaultGlyphBorder();
 		static unsigned int GetDefaultMinimumStepSize();

-		static bool Initialize();
-
 		template<typename... Args> static NzFontRef New(Args&&... args);

 		static void SetDefaultAtlas(const std::shared_ptr<NzAbstractAtlas>& atlas);
 		static void SetDefaultGlyphBorder(unsigned int borderSize);
 		static void SetDefaultMinimumStepSize(unsigned int minimumStepSize);

-		static void Uninitialize();
-
 		enum ModicationCode
 		{
 			ModificationCode_AtlasChanged,
@@ -131,6 +131,9 @@ class NAZARA_API NzFont : public NzRefCounted, public NzResource, NzAbstractAtla
 		void OnAtlasReleased(const NzAbstractAtlas* atlas, void* userdata) override;
 		const Glyph& PrecacheGlyph(GlyphMap& glyphMap, unsigned int characterSize, nzUInt32 style, char32_t character) const;

+		static bool Initialize();
+		static void Uninitialize();
+
 		std::shared_ptr<NzAbstractAtlas> m_atlas;
 		std::unique_ptr<NzFontData> m_data;
 		mutable std::unordered_map<nzUInt64, std::unordered_map<nzUInt64, int>> m_kerningCache;
@@ -141,6 +144,7 @@ class NAZARA_API NzFont : public NzRefCounted, public NzResource, NzAbstractAtla

 		static std::shared_ptr<NzAbstractAtlas> s_defaultAtlas;
 		static NzFontRef s_defaultFont;
+		static NzFontLibrary::LibraryMap s_library;
 		static NzFontLoader::LoaderList s_loaders;
 		static unsigned int s_defaultGlyphBorder;
 		static unsigned int s_defaultMinimumStepSize;
--- a/include/Nazara/Utility/Image.hpp
+++ b/include/Nazara/Utility/Image.hpp
@@ -10,6 +10,7 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/Color.hpp>
 #include <Nazara/Core/InputStream.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -36,13 +37,16 @@ class NzImage;

 using NzImageConstListener = NzObjectListenerWrapper<const NzImage>;
 using NzImageConstRef = NzObjectRef<const NzImage>;
+using NzImageLibrary = NzObjectLibrary<NzImage>;
 using NzImageListener = NzObjectListenerWrapper<NzImage>;
 using NzImageLoader = NzResourceLoader<NzImage, NzImageParams>;
 using NzImageRef = NzObjectRef<NzImage>;

 class NAZARA_API NzImage : public NzAbstractImage, public NzRefCounted, public NzResource
 {
+	friend NzImageLibrary;
 	friend NzImageLoader;
+	friend class NzUtility;

 	public:
 		struct SharedImage;
@@ -145,8 +149,12 @@ class NAZARA_API NzImage : public NzAbstractImage, public NzRefCounted, public N
 		void EnsureOwnership();
 		void ReleaseImage();

+		static bool Initialize();
+		static void Uninitialize();
+
 		SharedImage* m_sharedImage;

+		static NzImageLibrary::LibraryMap s_library;
 		static NzImageLoader::LoaderList s_loaders;
 };

--- a/include/Nazara/Utility/Mesh.hpp
+++ b/include/Nazara/Utility/Mesh.hpp
@@ -9,6 +9,7 @@

 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/InputStream.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/Primitive.hpp>
@@ -55,6 +56,7 @@ typedef NzVertexStruct_XYZ_Normal_UV_Tangent_Skinning NzSkeletalMeshVertex;

 using NzMeshConstListener = NzObjectListenerWrapper<const NzMesh>;
 using NzMeshConstRef = NzObjectRef<const NzMesh>;
+using NzMeshLibrary = NzObjectLibrary<NzMesh>;
 using NzMeshListener = NzObjectListenerWrapper<NzMesh>;
 using NzMeshLoader = NzResourceLoader<NzMesh, NzMeshParams>;
 using NzMeshRef = NzObjectRef<NzMesh>;
@@ -63,7 +65,9 @@ struct NzMeshImpl;

 class NAZARA_API NzMesh : public NzRefCounted, public NzResource
 {
+	friend NzMeshLibrary;
 	friend NzMeshLoader;
+	friend class NzUtility;

 	public:
 		NzMesh() = default;
@@ -128,6 +132,10 @@ class NAZARA_API NzMesh : public NzRefCounted, public NzResource
 	private:
 		NzMeshImpl* m_impl = nullptr;

+		static bool Initialize();
+		static void Uninitialize();
+
+		static NzMeshLibrary::LibraryMap s_library;
 		static NzMeshLoader::LoaderList s_loaders;
 };

--- a/include/Nazara/Utility/Skeleton.hpp
+++ b/include/Nazara/Utility/Skeleton.hpp
@@ -8,6 +8,7 @@
 #define NAZARA_SKELETON_HPP

 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -19,6 +20,7 @@ class NzSkeleton;

 using NzSkeletonConstListener = NzObjectListenerWrapper<const NzSkeleton>;
 using NzSkeletonConstRef = NzObjectRef<const NzSkeleton>;
+using NzSkeletonLibrary = NzObjectLibrary<NzSkeleton>;
 using NzSkeletonListener = NzObjectListenerWrapper<NzSkeleton>;
 using NzSkeletonRef = NzObjectRef<NzSkeleton>;

@@ -27,6 +29,8 @@ struct NzSkeletonImpl;
 class NAZARA_API NzSkeleton : public NzRefCounted
 {
 	friend NzJoint;
+	friend NzSkeletonLibrary;
+	friend class NzUtility;

 	public:
 		NzSkeleton() = default;
@@ -60,7 +64,12 @@ class NAZARA_API NzSkeleton : public NzRefCounted
 		void InvalidateJointMap();
 		void UpdateJointMap() const;

+		static bool Initialize();
+		static void Uninitialize();
+
 		NzSkeletonImpl* m_impl = nullptr;
+
+		static NzSkeletonLibrary::LibraryMap s_library;
 };

 #include <Nazara/Utility/Skeleton.inl>
--- a/include/Nazara/Utility/VertexDeclaration.hpp
+++ b/include/Nazara/Utility/VertexDeclaration.hpp
@@ -8,6 +8,7 @@
 #define NAZARA_VERTEXDECLARATION_HPP

 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/ObjectLibrary.hpp>
 #include <Nazara/Core/ObjectListenerWrapper.hpp>
 #include <Nazara/Core/ObjectRef.hpp>
 #include <Nazara/Core/RefCounted.hpp>
@@ -17,11 +18,13 @@ class NzVertexDeclaration;

 using NzVertexDeclarationConstListener = NzObjectListenerWrapper<const NzVertexDeclaration>;
 using NzVertexDeclarationConstRef = NzObjectRef<const NzVertexDeclaration>;
+using NzVertexDeclarationLibrary = NzObjectLibrary<NzVertexDeclaration>;
 using NzVertexDeclarationListener = NzObjectListenerWrapper<NzVertexDeclaration>;
 using NzVertexDeclarationRef = NzObjectRef<NzVertexDeclaration>;

 class NAZARA_API NzVertexDeclaration : public NzRefCounted
 {
+	friend NzVertexDeclarationLibrary;
 	friend class NzUtility;

 	public:
@@ -66,6 +69,7 @@ class NAZARA_API NzVertexDeclaration : public NzRefCounted
 		unsigned int m_stride;

 		static NzVertexDeclaration s_declarations[nzVertexLayout_Max+1];
+		static NzVertexDeclarationLibrary::LibraryMap s_library;
 };

 #include <Nazara/Utility/VertexDeclaration.hpp>