mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-06 08:41:32 +00:00
Code Issues Releases Wiki Activity

Don't expect TangentSpaceGenerator to work without texcoords

Browse source
This commit is contained in:
AnyOldName3 2024-10-24 13:36:49 +01:00
parent e9627e9b0c
commit 6330d80b9e
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
components/shader/shadervisitor.cpp
View file

@ -889,12 +889,29 @@ namespace Shader
if (mAllowedToModifyStateSets && (useShader || generateTangents)) if (mAllowedToModifyStateSets && (useShader || generateTangents))
{ {
// make sure that all UV sets are there // make sure that all UV sets are there
for (std::map<int, std::string>::const_iterator it = reqs.mTextures.begin(); it != reqs.mTextures.end(); // it's not safe to assume there's one for slot zero, so try and use one from another slot if possible
++it) // if there are none at all, bail.
// the TangentSpaceGenerator would bail, but getTangentArray would give an empty array, which is enough to
// bypass null checks, but feeds the driver a bad pointer
if (sourceGeometry.getTexCoordArray(0) == nullptr)
{ {
if (sourceGeometry.getTexCoordArray(it->first) == nullptr) for (const auto& array : sourceGeometry.getTexCoordArrayList())
{ {
sourceGeometry.setTexCoordArray(it->first, sourceGeometry.getTexCoordArray(0)); if (array)
{
sourceGeometry.setTexCoordArray(0, array);
break;
}
}
if (sourceGeometry.getTexCoordArray(0) == nullptr)
return changed;
}
for (const auto& [unit, name] : reqs.mTextures)
{
if (sourceGeometry.getTexCoordArray(unit) == nullptr)
{
sourceGeometry.setTexCoordArray(unit, sourceGeometry.getTexCoordArray(0));
changed = true; changed = true;
} }
} }