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

Merge pull request #15668 from SamGondelman/transparent

Browse source 
BUGZ-197, BUGZ-372: Fix some transparency issues on AMD
This commit is contained in:
Shannon Romano 2019-06-04 08:46:13 -07:00 committed by GitHub
commit 7a62ce21f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities-renderer/src/RenderableImageEntityItem.cpp
View file

@ -163,7 +163,7 @@ void ImageEntityRenderer::doRender(RenderArgs* args) {
transform = _renderTransform; transform = _renderTransform;
}); });
if (!_visible || !texture || !texture->isLoaded()) { if (!_visible || !texture || !texture->isLoaded() || color.a == 0.0f) {
return; return;
} }
@ -214,4 +214,4 @@ void ImageEntityRenderer::doRender(RenderArgs* args) {
); );
batch->setResourceTexture(0, nullptr); batch->setResourceTexture(0, nullptr);
} }

4
libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
View file

@ -270,6 +270,10 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) {
} }
}); });
if (outColor.a == 0.0f) {
return;
}
if (proceduralRender) { if (proceduralRender) {
if (render::ShapeKey(args->_globalShapeKey).isWireframe() || primitiveMode == PrimitiveMode::LINES) { if (render::ShapeKey(args->_globalShapeKey).isWireframe() || primitiveMode == PrimitiveMode::LINES) {
geometryCache->renderWireShape(batch, geometryShape, outColor); geometryCache->renderWireShape(batch, geometryShape, outColor);

2
libraries/render-utils/src/ShadingModel.slh
View file

@ -222,7 +222,7 @@ void evalFragShadingGloss(out vec3 diffuse, out vec3 specular,
} }
vec3 evalSpecularWithOpacity(vec3 specular, float opacity) { vec3 evalSpecularWithOpacity(vec3 specular, float opacity) {
return specular / opacity; return specular / mix(1.0, opacity, float(opacity > 0.0));
} }
<@if not GETFRESNEL0@> <@if not GETFRESNEL0@>