Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

FINALLY fix transparent textures rendering wrong

Browse source
This commit is contained in:
SamGondelman 2018-06-12 16:48:47 -07:00
parent 6f011b70ac
commit 10a0f77d4c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/model-networking/src/model-networking/ModelCache.cpp
View file

@ -422,7 +422,7 @@ bool Geometry::areTexturesLoaded() const {
} }
// Failed texture downloads need to be considered as 'loaded' // Failed texture downloads need to be considered as 'loaded'
// or the object will never fade in // or the object will never fade in
bool finished = texture->isLoaded() || texture->isFailed(); bool finished = texture->isFailed() || (texture->isLoaded() && texture->getGPUTexture() && texture->getGPUTexture()->isDefined());
if (!finished) { if (!finished) {
return true; return true;
} }
@ -434,8 +434,11 @@ bool Geometry::areTexturesLoaded() const {
} }
// If material textures are loaded, check the material translucency // If material textures are loaded, check the material translucency
// FIXME: This should not be done here. The opacity map should already be reset in Material::setTextureMap.
// However, currently that code can be called before the albedo map is defined, so resetOpacityMap will fail.
// Geometry::areTexturesLoaded() is called repeatedly until it returns true, so we do the check here for now
const auto albedoTexture = material->_textures[NetworkMaterial::MapChannel::ALBEDO_MAP]; const auto albedoTexture = material->_textures[NetworkMaterial::MapChannel::ALBEDO_MAP];
if (albedoTexture.texture && albedoTexture.texture->getGPUTexture()) { if (albedoTexture.texture) {
material->resetOpacityMap(); material->resetOpacityMap();
} }
} }