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

Graphics/Material: Fix error message when module is not init

This commit is contained in:
SirLynix 2023-11-04 17:52:47 +01:00
parent c80e06226f
commit fa54f1a3e4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nazara/Graphics/Material.cpp
View File

@ -199,7 +199,7 @@ namespace Nz
std::shared_ptr<Material> Material::Get(MaterialType lightingType) std::shared_ptr<Material> Material::Get(MaterialType lightingType)
{ {
Graphics* graphics = Graphics::Instance(); Graphics* graphics = Graphics::Instance();
NazaraAssert(graphics, "Utility module has not been initialized"); NazaraAssert(graphics, "Graphics module has not been initialized");
return graphics->GetDefaultMaterials().materials[lightingType].material; return graphics->GetDefaultMaterials().materials[lightingType].material;
} }
@ -207,7 +207,7 @@ namespace Nz
std::shared_ptr<Material> Material::LoadFromFile(const std::filesystem::path& filePath, const MaterialParams& params) std::shared_ptr<Material> Material::LoadFromFile(const std::filesystem::path& filePath, const MaterialParams& params)
{ {
Graphics* graphics = Graphics::Instance(); Graphics* graphics = Graphics::Instance();
NazaraAssert(graphics, "Utility module has not been initialized"); NazaraAssert(graphics, "Graphics module has not been initialized");
return graphics->GetMaterialLoader().LoadFromFile(filePath, params); return graphics->GetMaterialLoader().LoadFromFile(filePath, params);
} }
@ -215,7 +215,7 @@ namespace Nz
std::shared_ptr<Material> Material::LoadFromMemory(const void* data, std::size_t size, const MaterialParams& params) std::shared_ptr<Material> Material::LoadFromMemory(const void* data, std::size_t size, const MaterialParams& params)
{ {
Graphics* graphics = Graphics::Instance(); Graphics* graphics = Graphics::Instance();
NazaraAssert(graphics, "Utility module has not been initialized"); NazaraAssert(graphics, "Graphics module has not been initialized");
return graphics->GetMaterialLoader().LoadFromMemory(data, size, params); return graphics->GetMaterialLoader().LoadFromMemory(data, size, params);
} }
@ -223,7 +223,7 @@ namespace Nz
std::shared_ptr<Material> Material::LoadFromStream(Stream& stream, const MaterialParams& params) std::shared_ptr<Material> Material::LoadFromStream(Stream& stream, const MaterialParams& params)
{ {
Graphics* graphics = Graphics::Instance(); Graphics* graphics = Graphics::Instance();
NazaraAssert(graphics, "Utility module has not been initialized"); NazaraAssert(graphics, "Graphics module has not been initialized");
return graphics->GetMaterialLoader().LoadFromStream(stream, params); return graphics->GetMaterialLoader().LoadFromStream(stream, params);
} }