Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-11 21:52:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15200 from SamGondelman/web

Browse source 
Case 21755: Allow Web Entities to use alpha from html/qml textures
This commit is contained in:
Sam Gondelman 2019-03-21 18:04:57 -07:00 committed by GitHub
commit 385970c39d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/render-utils/src/simple_opaque_web_browser.slf
View file

@ -28,7 +28,7 @@ layout(location=RENDER_UTILS_ATTR_TEXCOORD01) in vec4 _texCoord01;
#define _texCoord1 _texCoord01.zw
void main(void) {
vec4 texel = texture(originalTexture, _texCoord0.st);
vec4 texel = texture(originalTexture, _texCoord0);
texel = color_sRGBAToLinear(texel);
packDeferredFragmentUnlit(normalize(_normalWS), 1.0, _color.rgb * texel.rgb);
}

4
libraries/render-utils/src/simple_transparent_web_browser.slf
View file

@ -28,11 +28,11 @@ layout(location=RENDER_UTILS_ATTR_TEXCOORD01) in vec4 _texCoord01;
#define _texCoord1 _texCoord01.zw
void main(void) {
vec4 texel = texture(originalTexture, _texCoord0.st);
vec4 texel = texture(originalTexture, _texCoord0);
texel = color_sRGBAToLinear(texel);
packDeferredFragmentTranslucent(
normalize(_normalWS),
_color.a,
_color.a * texel.a,
_color.rgb * texel.rgb,
DEFAULT_ROUGHNESS);
}