Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:43:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Taking into account comments

Browse source
This commit is contained in:
Olivier Prat 2019-04-22 21:30:57 +02:00
parent 7d412f9109
commit 8dabcb76b8
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libraries/render-utils/src/RenderPipelines.cpp
View file

@ -755,18 +755,21 @@ bool RenderPipelines::bindMaterials(graphics::MultiMaterial& multiMaterial, gpu:
}); });
// For shadows, we only need opacity mask information // For shadows, we only need opacity mask information
if (renderMode != render::Args::RenderMode::SHADOW_RENDER_MODE || multiMaterial.getMaterialKey().isOpacityMaskMap()) { auto key = multiMaterial.getMaterialKey();
if (renderMode != render::Args::RenderMode::SHADOW_RENDER_MODE || key.isOpacityMaskMap()) {
auto& schemaBuffer = multiMaterial.getSchemaBuffer(); auto& schemaBuffer = multiMaterial.getSchemaBuffer();
batch.setUniformBuffer(gr::Buffer::Material, schemaBuffer); batch.setUniformBuffer(gr::Buffer::Material, schemaBuffer);
if (enableTextures) { if (enableTextures) {
batch.setResourceTextureTable(multiMaterial.getTextureTable()); batch.setResourceTextureTable(multiMaterial.getTextureTable());
} else { } else {
auto key = multiMaterial.getMaterialKey(); if (renderMode != render::Args::RenderMode::SHADOW_RENDER_MODE) {
if (key.isLightmapMap()) { if (key.isLightmapMap()) {
defaultMaterialTextures->setTexture(gr::Texture::MaterialEmissiveLightmap, textureCache->getBlackTexture()); defaultMaterialTextures->setTexture(gr::Texture::MaterialEmissiveLightmap, textureCache->getBlackTexture());
} else if (key.isEmissiveMap()) { } else if (key.isEmissiveMap()) {
defaultMaterialTextures->setTexture(gr::Texture::MaterialEmissiveLightmap, textureCache->getGrayTexture()); defaultMaterialTextures->setTexture(gr::Texture::MaterialEmissiveLightmap, textureCache->getGrayTexture());
}
} }
batch.setResourceTextureTable(defaultMaterialTextures); batch.setResourceTextureTable(defaultMaterialTextures);
} }
return true; return true;