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

Graphics/PropertyHandler: Warn if an option if set but doesn't exist in material

This commit is contained in:
SirLynix 2024-02-07 15:55:14 +01:00
parent 37e90ecea9
commit 5a46ebda36
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Graphics/PropertyHandler/OptionValuePropertyHandler.cpp
View File

@ -34,6 +34,8 @@ namespace Nz
m_optionHash = optionData->hash; m_optionHash = optionData->hash;
m_propertyIndex = propertyIndex; m_propertyIndex = propertyIndex;
} }
else
NazaraWarningFmt("option {0} not found in shader for property {1}", m_optionName, m_propertyName);
} }
void OptionValuePropertyHandler::Update(MaterialInstance& materialInstance) const void OptionValuePropertyHandler::Update(MaterialInstance& materialInstance) const

15
src/Nazara/Graphics/PropertyHandler/TexturePropertyHandler.cpp
View File

@ -42,15 +42,20 @@ namespace Nz
m_propertyIndex = propertyIndex; m_propertyIndex = propertyIndex;
m_optionHash = 0; m_optionHash = 0;
if (const ShaderReflection::OptionData* optionData = reflection.GetOptionByName(m_optionName)) if (!m_optionName.empty())
{ {
if (IsPrimitiveType(optionData->type) && std::get<nzsl::Ast::PrimitiveType>(optionData->type) == nzsl::Ast::PrimitiveType::Boolean) if (const ShaderReflection::OptionData* optionData = reflection.GetOptionByName(m_optionName))
{ {
NazaraAssert(optionData->hash != 0, "unexpected option hash"); if (IsPrimitiveType(optionData->type) && std::get<nzsl::Ast::PrimitiveType>(optionData->type) == nzsl::Ast::PrimitiveType::Boolean)
m_optionHash = optionData->hash; {
NazaraAssert(optionData->hash != 0, "unexpected option hash");
m_optionHash = optionData->hash;
}
else
NazaraErrorFmt("option {0} is not a boolean option (got {1})", m_optionName, nzsl::Ast::ToString(optionData->type));
} }
else else
NazaraErrorFmt("option {0} is not a boolean option (got {1})", m_optionName, nzsl::Ast::ToString(optionData->type)); NazaraWarningFmt("option {0} not found in shader for property {1}", m_optionName, m_propertyName);
} }
} }