Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:57:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dont be an idiot

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-03-10 16:14:56 -08:00
parent ff30611234
commit 0c12c6ef90
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -435,6 +435,7 @@ void OpenGLDisplayPlugin::compositeOverlay() {
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mat4()); Uniform<glm::mat4>(*_program, _mvpUniform).Set(mat4());
drawUnitQuad(); drawUnitQuad();
} }
Uniform<float>(*_program, _alphaUniform).Set(1.0);
} }
void OpenGLDisplayPlugin::compositePointer() { void OpenGLDisplayPlugin::compositePointer() {
@ -461,6 +462,7 @@ void OpenGLDisplayPlugin::compositePointer() {
drawUnitQuad(); drawUnitQuad();
} }
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mat4()); Uniform<glm::mat4>(*_program, _mvpUniform).Set(mat4());
Uniform<float>(*_program, _alphaUniform).Set(1.0);
} }
void OpenGLDisplayPlugin::compositeLayers() { void OpenGLDisplayPlugin::compositeLayers() {

12
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
View file

@ -84,6 +84,7 @@ void HmdDisplayPlugin::compositeOverlay() {
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mvp); Uniform<glm::mat4>(*_program, _mvpUniform).Set(mvp);
_sphereSection->Draw(); _sphereSection->Draw();
}); });
Uniform<float>(*_program, _alphaUniform).Set(1.0);
} }
void HmdDisplayPlugin::compositePointer() { void HmdDisplayPlugin::compositePointer() {
@ -92,17 +93,15 @@ void HmdDisplayPlugin::compositePointer() {
//Mouse Pointer //Mouse Pointer
auto compositorHelper = DependencyManager::get<CompositorHelper>(); auto compositorHelper = DependencyManager::get<CompositorHelper>();
// set the alpha // set the alpha
auto overlayAlpha = compositorHelper->getAlpha(); auto overlayAlpha = compositorHelper->getAlpha();
qDebug() << __FUNCTION__ << "overlayAlpha:" << overlayAlpha;
if (overlayAlpha <= 0.0f) { if (overlayAlpha <= 0.0f) {
//return; // don't render the overlay at all. //return; // don't render the overlay at all.
qDebug() << "would bail early..."; qDebug() << "would bail early...";
} }
qDebug() << __FUNCTION__ << "overlayAlpha:" << overlayAlpha; qDebug() << __FUNCTION__ << "overlayAlpha:" << overlayAlpha;
Uniform<float>(*_program, _alphaUniform).Set(1.0f); Uniform<float>(*_program, _alphaUniform).Set(overlayAlpha);
_plane->Use(); _plane->Use();
@ -115,6 +114,7 @@ void HmdDisplayPlugin::compositePointer() {
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mvp); Uniform<glm::mat4>(*_program, _mvpUniform).Set(mvp);
_plane->Draw(); _plane->Draw();
}); });
Uniform<float>(*_program, _alphaUniform).Set(1.0);
} }
void HmdDisplayPlugin::internalPresent() { void HmdDisplayPlugin::internalPresent() {

3
libraries/gl/src/gl/OglplusHelpers.cpp
View file

@ -40,7 +40,8 @@ out vec4 FragColor;
void main() { void main() {
FragColor = texture(sampler, vTexCoord) * alpha; FragColor = texture(sampler, vTexCoord);
FragColor.a *= alpha;
} }
)FS"; )FS";