Rework ResourceLoader, ResourceManager and ObjectLibrary

They're no longer static
This commit is contained in:
Jérôme Leclercq
2021-05-22 18:20:05 +02:00
parent 3437f43af6
commit a52103a641
21 changed files with 217 additions and 234 deletions

View File

@@ -245,10 +245,10 @@ namespace Nz
if (file)
{
sf_close(file);
return Ternary_True;
return Ternary::True;
}
else
return Ternary_False;
return Ternary::False;
}
SoundStreamRef LoadSoundStreamFile(const std::filesystem::path& filePath, const SoundStreamParams& parameters)
@@ -301,10 +301,10 @@ namespace Nz
if (file)
{
sf_close(file);
return Ternary_True;
return Ternary::True;
}
else
return Ternary_False;
return Ternary::False;
}
SoundBufferRef LoadSoundBuffer(Stream& stream, const SoundBufferParams& parameters)

View File

@@ -27,7 +27,7 @@ namespace Nz
{
bool skip;
if (parameters.custom.GetBooleanParameter("SkipNativeDDSLoader", &skip) && skip)
return Ternary_False;
return Ternary::False;
ByteStream byteStream(&stream);
byteStream.SetDataEndianness(Endianness_LittleEndian);
@@ -35,7 +35,7 @@ namespace Nz
UInt32 magic;
byteStream >> magic;
return (magic == DDS_Magic) ? Ternary_True : Ternary_False;
return (magic == DDS_Magic) ? Ternary::True : Ternary::False;
}
static ImageRef Load(Stream& stream, const ImageParams& parameters)

View File

@@ -398,15 +398,15 @@ namespace Nz
{
bool skip;
if (parameters.custom.GetBooleanParameter("SkipNativeFreeTypeLoader", &skip) && skip)
return Ternary_False;
return Ternary::False;
FreeTypeStream face;
face.SetStream(stream);
if (face.Check())
return Ternary_True;
return Ternary::True;
else
return Ternary_False;
return Ternary::False;
}
FontRef LoadFile(const std::filesystem::path& filePath, const FontParams& parameters)

View File

@@ -29,7 +29,7 @@ namespace Nz
{
bool skip;
if (parameters.custom.GetBooleanParameter("SkipNativeMD2Loader", &skip) && skip)
return Ternary_False;
return Ternary::False;
UInt32 magic[2];
if (stream.Read(&magic[0], 2*sizeof(UInt32)) == 2*sizeof(UInt32))
@@ -40,10 +40,10 @@ namespace Nz
#endif
if (magic[0] == md2Ident && magic[1] == 8)
return Ternary_True;
return Ternary::True;
}
return Ternary_False;
return Ternary::False;
}
MeshRef Load(Stream& stream, const MeshParams& parameters)

View File

@@ -21,7 +21,7 @@ namespace Nz
{
bool skip;
if (parameters.custom.GetBooleanParameter("SkipNativeMD5AnimLoader", &skip) && skip)
return Ternary_False;
return Ternary::False;
MD5AnimParser parser(stream);
return parser.Check();

View File

@@ -37,11 +37,11 @@ namespace Nz
if (std::sscanf(&m_currentLine[0], " MD5Version %u", &version) == 1)
{
if (version == 10)
return Ternary_True;
return Ternary::True;
}
}
return Ternary_False;
return Ternary::False;
}
UInt32 MD5AnimParser::GetAnimatedComponentCount() const

View File

@@ -29,7 +29,7 @@ namespace Nz
{
bool skip;
if (parameters.custom.GetBooleanParameter("SkipNativeMD5MeshLoader", &skip) && skip)
return Ternary_False;
return Ternary::False;
MD5MeshParser parser(stream);
return parser.Check();

View File

@@ -37,11 +37,11 @@ namespace Nz
if (std::sscanf(&m_currentLine[0], " MD5Version %u", &version) == 1)
{
if (version == 10)
return Ternary_True;
return Ternary::True;
}
}
return Ternary_False;
return Ternary::False;
}
const MD5MeshParser::Joint* MD5MeshParser::GetJoints() const

View File

@@ -33,13 +33,13 @@ namespace Nz
bool skip;
if (parameters.custom.GetBooleanParameter("SkipNativeOBJLoader", &skip) && skip)
return Ternary_False;
return Ternary::False;
OBJParser parser;
if (!parser.Check(stream))
return Ternary_False;
return Ternary::False;
return Ternary_Unknown;
return Ternary::Unknown;
}
bool ParseMTL(Mesh* mesh, const std::filesystem::path& filePath, const std::string* materials, const OBJParser::Mesh* meshes, std::size_t meshCount)

View File

@@ -49,16 +49,16 @@ namespace Nz
{
bool skip;
if (parameters.custom.GetBooleanParameter("SkipNativePCXLoader", &skip) && skip)
return Ternary_False;
return Ternary::False;
UInt8 manufacturer;
if (stream.Read(&manufacturer, 1) == 1)
{
if (manufacturer == 0x0a)
return Ternary_True;
return Ternary::True;
}
return Ternary_False;
return Ternary::False;
}
ImageRef Load(Stream& stream, const ImageParams& parameters)

View File

@@ -46,13 +46,13 @@ namespace Nz
{
bool skip;
if (parameters.custom.GetBooleanParameter("SkipNativeSTBLoader", &skip) && skip)
return Ternary_False;
return Ternary::False;
int width, height, bpp;
if (stbi_info_from_callbacks(&callbacks, &stream, &width, &height, &bpp))
return Ternary_True;
return Ternary::True;
else
return Ternary_False;
return Ternary::False;
}
ImageRef Load(Stream& stream, const ImageParams& parameters)