diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp index 4ef2648e10..ea96eeae7e 100644 --- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp @@ -435,6 +435,7 @@ void OpenGLDisplayPlugin::compositeOverlay() { Uniform(*_program, _mvpUniform).Set(mat4()); drawUnitQuad(); } + Uniform(*_program, _alphaUniform).Set(1.0); } void OpenGLDisplayPlugin::compositePointer() { @@ -461,6 +462,7 @@ void OpenGLDisplayPlugin::compositePointer() { drawUnitQuad(); } Uniform(*_program, _mvpUniform).Set(mat4()); + Uniform(*_program, _alphaUniform).Set(1.0); } void OpenGLDisplayPlugin::compositeLayers() { diff --git a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp index 8427141e24..d4865d8ada 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp @@ -84,6 +84,7 @@ void HmdDisplayPlugin::compositeOverlay() { Uniform(*_program, _mvpUniform).Set(mvp); _sphereSection->Draw(); }); + Uniform(*_program, _alphaUniform).Set(1.0); } void HmdDisplayPlugin::compositePointer() { @@ -92,17 +93,15 @@ void HmdDisplayPlugin::compositePointer() { //Mouse Pointer auto compositorHelper = DependencyManager::get(); + // set the alpha auto overlayAlpha = compositorHelper->getAlpha(); - - qDebug() << __FUNCTION__ << "overlayAlpha:" << overlayAlpha; - if (overlayAlpha <= 0.0f) { - //return; // don't render the overlay at all. - qDebug() << "would bail early..."; + //return; // don't render the overlay at all. + qDebug() << "would bail early..."; } qDebug() << __FUNCTION__ << "overlayAlpha:" << overlayAlpha; - Uniform(*_program, _alphaUniform).Set(1.0f); + Uniform(*_program, _alphaUniform).Set(overlayAlpha); _plane->Use(); @@ -115,6 +114,7 @@ void HmdDisplayPlugin::compositePointer() { Uniform(*_program, _mvpUniform).Set(mvp); _plane->Draw(); }); + Uniform(*_program, _alphaUniform).Set(1.0); } void HmdDisplayPlugin::internalPresent() { diff --git a/libraries/gl/src/gl/OglplusHelpers.cpp b/libraries/gl/src/gl/OglplusHelpers.cpp index d583e6de6c..1dd7068448 100644 --- a/libraries/gl/src/gl/OglplusHelpers.cpp +++ b/libraries/gl/src/gl/OglplusHelpers.cpp @@ -40,7 +40,8 @@ out vec4 FragColor; void main() { - FragColor = texture(sampler, vTexCoord) * alpha; + FragColor = texture(sampler, vTexCoord); + FragColor.a *= alpha; } )FS";