Refactor the way resources are loaded (#191)

* WIP

* WIP

* Font works

* WIP: Only Music remains

* Looks like it's working

* Fix oopsie

* Core/ObjectRef: Add cast functions

* Update ChangeLog.md

* Audio/SoundStream: Make sound stream thread-safe

src/Nazara/Utility/Formats/DDSLoader.cpp

@@ -38,7 +38,7 @@ namespace Nz
 				return (magic == DDS_Magic) ? Ternary_True : Ternary_False;
 			}
 
-			static bool Load(Image* image, Stream& stream, const ImageParams& parameters)
+			static ImageRef Load(Stream& stream, const ImageParams& parameters)
 			{
 				NazaraUnused(parameters);
 
@@ -81,14 +81,14 @@ namespace Nz
 				// First, identify the type
 				ImageType type;
 				if (!IdentifyImageType(header, headerDX10, &type))
-					return false;
+					return nullptr;
 
 				// Then the format
 				PixelFormatType format;
 				if (!IdentifyPixelFormat(header, headerDX10, &format))
-					return false;
+					return nullptr;
 
-				image->Create(type, format, width, height, depth, levelCount);
+				ImageRef image = Image::New(type, format, width, height, depth, levelCount);
 
 				// Read all mipmap levels
 				for (unsigned int i = 0; i < image->GetLevelCount(); i++)
@@ -100,7 +100,7 @@ namespace Nz
 					if (byteStream.Read(ptr, byteCount) != byteCount)
 					{
 						NazaraError("Failed to read level #" + String::Number(i));
-						return false;
+						return nullptr;
 					}
 
 					if (width > 1)
@@ -117,7 +117,7 @@ namespace Nz
 				if (parameters.loadFormat != PixelFormatType_Undefined)
 					image->Convert(parameters.loadFormat);
 
-				return true;
+				return image;
 			}
 
 		private:

src/Nazara/Utility/Formats/FreeTypeLoader.cpp

@@ -361,7 +361,7 @@ namespace Nz
 				return Ternary_False;
 		}
 
-		bool LoadFile(Font* font, const String& filePath, const FontParams& parameters)
+		FontRef LoadFile(const String& filePath, const FontParams& parameters)
 		{
 			NazaraUnused(parameters);
 
@@ -370,25 +370,26 @@ namespace Nz
 			if (!face->SetFile(filePath))
 			{
 				NazaraError("Failed to open file");
-				return false;
+				return nullptr;
 			}
 
 			if (!face->Open())
 			{
 				NazaraError("Failed to open face");
-				return false;
+				return nullptr;
 			}
 
+			FontRef font = Font::New();
 			if (font->Create(face.get()))
 			{
 				face.release();
-				return true;
+				return font;
 			}
 			else
-				return false;
+				return nullptr;
 		}
 
-		bool LoadMemory(Font* font, const void* data, std::size_t size, const FontParams& parameters)
+		FontRef LoadMemory(const void* data, std::size_t size, const FontParams& parameters)
 		{
 			NazaraUnused(parameters);
 
@@ -398,19 +399,20 @@ namespace Nz
 			if (!face->Open())
 			{
 				NazaraError("Failed to open face");
-				return false;
+				return nullptr;
 			}
 
+			FontRef font = Font::New();
 			if (font->Create(face.get()))
 			{
 				face.release();
-				return true;
+				return font;
 			}
 			else
-				return false;
+				return nullptr;
 		}
 
-		bool LoadStream(Font* font, Stream& stream, const FontParams& parameters)
+		FontRef LoadStream(Stream& stream, const FontParams& parameters)
 		{
 			NazaraUnused(parameters);
 
@@ -420,16 +422,17 @@ namespace Nz
 			if (!face->Open())
 			{
 				NazaraError("Failed to open face");
-				return false;
+				return nullptr;
 			}
 
+			FontRef font = Font::New();
 			if (font->Create(face.get()))
 			{
 				face.release();
-				return true;
+				return font;
 			}
 			else
-				return false;
+				return nullptr;
 		}
 	}
 
@@ -439,7 +442,7 @@ namespace Nz
 		{
 			if (FT_Init_FreeType(&s_library) == 0)
 			{
-				s_libraryOwner.reset(new FreeTypeLibrary);
+				s_libraryOwner = std::make_shared<FreeTypeLibrary>();
 				FontLoader::RegisterLoader(IsSupported, Check, LoadStream, LoadFile, LoadMemory);
 			}
 			else

src/Nazara/Utility/Formats/MD2Loader.cpp

@@ -46,13 +46,13 @@ namespace Nz
 			return Ternary_False;
 		}
 
-		bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
+		MeshRef Load(Stream& stream, const MeshParams& parameters)
 		{
 			MD2_Header header;
 			if (stream.Read(&header, sizeof(MD2_Header)) != sizeof(MD2_Header))
 			{
 				NazaraError("Failed to read header");
-				return false;
+				return nullptr;
 			}
 
 			#ifdef NAZARA_BIG_ENDIAN
@@ -76,14 +76,15 @@ namespace Nz
 			if (stream.GetSize() < header.offset_end)
 			{
 				NazaraError("Incomplete MD2 file");
-				return false;
+				return nullptr;
 			}
 
 			// Since the engine no longer supports keyframe animations, let's make a static mesh
+			MeshRef mesh = Nz::Mesh::New();
 			if (!mesh->CreateStatic())
 			{
 				NazaraInternalError("Failed to create mesh");
-				return false;
+				return nullptr;
 			}
 
 			// Extract skins (texture name)
@@ -253,7 +254,7 @@ namespace Nz
 			if (parameters.center)
 				mesh->Recenter();
 
-			return true;
+			return mesh;
 		}
 	}
 

src/Nazara/Utility/Formats/MD5AnimLoader.cpp

@@ -28,7 +28,7 @@ namespace Nz
 			return parser.Check();
 		}
 
-		bool Load(Animation* animation, Stream& stream, const AnimationParams& /*parameters*/)
+		AnimationRef Load(Stream& stream, const AnimationParams& /*parameters*/)
 		{
 			///TODO: Utiliser les paramètres
 			MD5AnimParser parser(stream);
@@ -36,7 +36,7 @@ namespace Nz
 			if (!parser.Parse())
 			{
 				NazaraError("MD5Anim parser failed");
-				return false;
+				return nullptr;
 			}
 
 			const MD5AnimParser::Frame* frames = parser.GetFrames();
@@ -46,6 +46,7 @@ namespace Nz
 			UInt32 jointCount = parser.GetJointCount();
 
 			// À ce stade, nous sommes censés avoir assez d'informations pour créer l'animation
+			AnimationRef animation = Animation::New();
 			animation->CreateSkeletal(frameCount, jointCount);
 
 			Sequence sequence;
@@ -84,7 +85,7 @@ namespace Nz
 				}
 			}
 
-			return true;
+			return animation;
 		}
 	}
 

src/Nazara/Utility/Formats/MD5MeshLoader.cpp

@@ -35,13 +35,13 @@ namespace Nz
 			return parser.Check();
 		}
 
-		bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
+		MeshRef Load(Stream& stream, const MeshParams& parameters)
 		{
 			MD5MeshParser parser(stream);
 			if (!parser.Parse())
 			{
 				NazaraError("MD5Mesh parser failed");
-				return false;
+				return nullptr;
 			}
 
 			// Pour que le squelette soit correctement aligné, il faut appliquer un quaternion "de correction" aux joints à la base du squelette
@@ -62,6 +62,7 @@ namespace Nz
 
 			if (parameters.animated)
 			{
+				MeshRef mesh = Mesh::New();
 				mesh->CreateSkeletal(jointCount);
 
 				Skeleton* skeleton = mesh->GetSkeleton();
@@ -218,13 +219,16 @@ namespace Nz
 							mesh->SetAnimation(path);
 					}
 				}
+
+				return mesh;
 			}
 			else
 			{
+				MeshRef mesh = Mesh::New();
 				if (!mesh->CreateStatic()) // Ne devrait jamais échouer
 				{
 					NazaraInternalError("Failed to create mesh");
-					return false;
+					return nullptr;
 				}
 
 				mesh->SetMaterialCount(meshCount);
@@ -309,9 +313,9 @@ namespace Nz
 
 				if (parameters.center)
 					mesh->Recenter();
-			}
 
-			return true;
+				return mesh;
+			}
 		}
 	}
 

src/Nazara/Utility/Formats/OBJLoader.cpp

@@ -153,7 +153,7 @@ namespace Nz
 			return true;
 		}
 
-		bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
+		MeshRef Load(Stream& stream, const MeshParams& parameters)
 		{
 			long long reservedVertexCount;
 			if (!parameters.custom.GetIntegerParameter("NativeOBJLoader_VertexCount", &reservedVertexCount))
@@ -163,9 +163,10 @@ namespace Nz
 			if (!parser.Parse(stream, reservedVertexCount))
 			{
 				NazaraError("OBJ parser failed");
-				return false;
+				return nullptr;
 			}
 
+			MeshRef mesh = Mesh::New();
 			mesh->CreateStatic();
 
 			const String* materials = parser.GetMaterials();
@@ -341,7 +342,7 @@ namespace Nz
 				ParseMTL(mesh, stream.GetDirectory() + mtlLib, materials, meshes, meshCount);
 			}
 
-			return true;
+			return mesh;
 		}
 	}
 

src/Nazara/Utility/Formats/PCXLoader.cpp

@@ -61,7 +61,7 @@ namespace Nz
 			return Ternary_False;
 		}
 
-		bool Load(Image* image, Stream& stream, const ImageParams& parameters)
+		ImageRef Load(Stream& stream, const ImageParams& parameters)
 		{
 			NazaraUnused(parameters);
 
@@ -69,7 +69,7 @@ namespace Nz
 			if (stream.Read(&header, sizeof(pcx_header)) != sizeof(pcx_header))
 			{
 				NazaraError("Failed to read header");
-				return false;
+				return nullptr;
 			}
 
 			#ifdef NAZARA_BIG_ENDIAN
@@ -91,10 +91,11 @@ namespace Nz
 			unsigned int width = header.xmax - header.xmin+1;
 			unsigned int height = header.ymax - header.ymin+1;
 
+			ImageRef image = Image::New();
 			if (!image->Create(ImageType_2D, PixelFormatType_RGB8, width, height, 1, (parameters.levelCount > 0) ? parameters.levelCount : 1))
 			{
 				NazaraError("Failed to create image");
-				return false;
+				return nullptr;
 			}
 
 			UInt8* pixels = image->GetPixels();
@@ -119,7 +120,7 @@ namespace Nz
 								if (!stream.Read(&rle_value, 1))
 								{
 									NazaraError("Failed to read stream (byte " + String::Number(stream.GetCursorPos()) + ')');
-									return false;
+									return nullptr;
 								}
 
 								if (rle_value < 0xc0)
@@ -130,7 +131,7 @@ namespace Nz
 									if (!stream.Read(&rle_value, 1))
 									{
 										NazaraError("Failed to read stream (byte " + String::Number(stream.GetCursorPos()) + ')');
-										return false;
+										return nullptr;
 									}
 								}
 							}
@@ -174,7 +175,7 @@ namespace Nz
 									if (!stream.Read(&rle_value, 1))
 									{
 										NazaraError("Failed to read stream (byte " + String::Number(stream.GetCursorPos()) + ')');
-										return false;
+										return nullptr;
 									}
 
 									if (rle_value < 0xc0)
@@ -185,7 +186,7 @@ namespace Nz
 										if (!stream.Read(&rle_value, 1))
 										{
 											NazaraError("Failed to read stream (byte " + String::Number(stream.GetCursorPos()) + ')');
-											return false;
+											return nullptr;
 										}
 									}
 								}
@@ -225,21 +226,21 @@ namespace Nz
 					if (!stream.Read(&magic, 1))
 					{
 						NazaraError("Failed to read stream (byte " + String::Number(stream.GetCursorPos()) + ')');
-						return false;
+						return nullptr;
 					}
 
 					/* first byte must be equal to 0x0c (12) */
 					if (magic != 0x0c)
 					{
 						NazaraError("Colormap's first byte must be 0x0c (0x" + String::Number(magic, 16) + ')');
-						return false;
+						return nullptr;
 					}
 
 					/* read palette */
 					if (stream.Read(palette, 768) != 768)
 					{
 						NazaraError("Failed to read palette");
-						return false;
+						return nullptr;
 					}
 
 					stream.SetCursorPos(curPos);
@@ -258,7 +259,7 @@ namespace Nz
 								if (!stream.Read(&rle_value, 1))
 								{
 									NazaraError("Failed to read stream (byte " + String::Number(stream.GetCursorPos()) + ')');
-									return false;
+									return nullptr;
 								}
 
 								if (rle_value < 0xc0)
@@ -269,7 +270,7 @@ namespace Nz
 									if (!stream.Read(&rle_value, 1))
 									{
 										NazaraError("Failed to read stream (byte " + String::Number(stream.GetCursorPos()) + ')');
-										return false;
+										return nullptr;
 									}
 								}
 							}
@@ -302,7 +303,7 @@ namespace Nz
 									if (!stream.Read(&rle_value, 1))
 									{
 										NazaraError("Failed to read stream (byte " + String::Number(stream.GetCursorPos()) + ')');
-										return false;
+										return nullptr;
 									}
 
 									if (rle_value < 0xc0)
@@ -313,7 +314,7 @@ namespace Nz
 										if (!stream.Read(&rle_value, 1))
 										{
 											NazaraError("Failed to read stream (byte " + String::Number(stream.GetCursorPos()) + ')');
-											return false;
+											return nullptr;
 										}
 									}
 								}
@@ -329,13 +330,13 @@ namespace Nz
 
 				default:
 					NazaraError("Unsupported " + String::Number(bitCount) + " bitcount for pcx files");
-					return false;
+					return nullptr;
 			}
 
 			if (parameters.loadFormat != PixelFormatType_Undefined)
 				image->Convert(parameters.loadFormat);
 
-			return true;
+			return image;
 		}
 	}
 

src/Nazara/Utility/Formats/STBLoader.cpp

@@ -4,6 +4,7 @@
 
 #include <Nazara/Utility/Formats/STBLoader.hpp>
 #include <stb/stb_image.h>
+#include <Nazara/Core/CallOnExit.hpp>
 #include <Nazara/Core/Endianness.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Stream.hpp>
@@ -54,7 +55,7 @@ namespace Nz
 				return Ternary_False;
 		}
 
-		bool Load(Image* image, Stream& stream, const ImageParams& parameters)
+		ImageRef Load(Stream& stream, const ImageParams& parameters)
 		{
 			// Je charge tout en RGBA8 et je converti ensuite via la méthode Convert
 			// Ceci à cause d'un bug de STB lorsqu'il s'agit de charger certaines images (ex: JPG) en "default"
@@ -64,24 +65,29 @@ namespace Nz
 			if (!ptr)
 			{
 				NazaraError("Failed to load image: " + String(stbi_failure_reason()));
-				return false;
+				return nullptr;
 			}
 
+			CallOnExit freeStbiImage([ptr]()
+			{
+				stbi_image_free(ptr);
+			});
+
+			ImageRef image = Image::New();
 			if (!image->Create(ImageType_2D, PixelFormatType_RGBA8, width, height, 1, (parameters.levelCount > 0) ? parameters.levelCount : 1))
 			{
 				NazaraError("Failed to create image");
-				stbi_image_free(ptr);
-
-				return false;
+				return nullptr;
 			}
 
 			image->Update(ptr);
-			stbi_image_free(ptr);
+
+			freeStbiImage.CallAndReset();
 
 			if (parameters.loadFormat != PixelFormatType_Undefined)
 				image->Convert(parameters.loadFormat);
 
-			return true;
+			return image;
 		}
 	}