evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

further MaterialDatabase checks

Browse Source
This commit is contained in:
Kae 2024-06-02 14:02:16 +10:00
parent 41bad6c97c
commit 986db9cfc5
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/game/StarMaterialDatabase.hpp
View File

@ -188,15 +188,21 @@ private:
}; };
inline MaterialRenderProfileConstPtr MaterialDatabase::materialRenderProfile(MaterialId materialId) const { inline MaterialRenderProfileConstPtr MaterialDatabase::materialRenderProfile(MaterialId materialId) const {
if (materialId >= m_materials.size()) if (materialId < m_materials.size()) {
return {}; if (auto const& mat = m_materials[materialId])
return m_materials[materialId]->materialRenderProfile; return mat->materialRenderProfile;
}
return {};
} }
inline MaterialRenderProfileConstPtr MaterialDatabase::modRenderProfile(ModId modId) const { inline MaterialRenderProfileConstPtr MaterialDatabase::modRenderProfile(ModId modId) const {
if (modId >= m_mods.size()) if (modId < m_mods.size()) {
return {}; if (auto const& mod = m_mods[modId])
return m_mods[modId]->modRenderProfile; return mod->modRenderProfile;
}
return {};
} }
inline bool MaterialDatabase::foregroundLightTransparent(MaterialId materialId) const { inline bool MaterialDatabase::foregroundLightTransparent(MaterialId materialId) const {

1
source/game/StarTileDrawer.cpp
View File

@ -106,7 +106,6 @@ bool TileDrawer::produceTerrainDrawables(Drawables& drawables,
}; };
auto materialRenderProfile = materialDatabase->materialRenderProfile(material); auto materialRenderProfile = materialDatabase->materialRenderProfile(material);
auto modRenderProfile = materialDatabase->modRenderProfile(mod); auto modRenderProfile = materialDatabase->modRenderProfile(mod);
if (materialRenderProfile) { if (materialRenderProfile) {

1
source/rendering/StarTilePainter.cpp
View File

@ -277,7 +277,6 @@ bool TilePainter::produceTerrainPrimitives(HashMap<QuadZLevel, List<RenderPrimit
}; };
auto materialRenderProfile = materialDatabase->materialRenderProfile(material); auto materialRenderProfile = materialDatabase->materialRenderProfile(material);
auto modRenderProfile = materialDatabase->modRenderProfile(mod); auto modRenderProfile = materialDatabase->modRenderProfile(mod);
if (materialRenderProfile) { if (materialRenderProfile) {