Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix build buster, CR feedback

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-03-10 16:44:59 -08:00
parent 387c156ce3
commit 92c47fdc8b
3 changed files with 58 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/display-plugins/src/display-plugins/CompositorHelper.h
View file

@ -145,7 +145,7 @@ private:
float _fadeInAlpha { true }; float _fadeInAlpha { true };
float _oculusUIRadius { 1.0f }; float _oculusUIRadius { 1.0f };
quint64 _fadeStarted { 0.0f }; quint64 _fadeStarted { 0 };
float _fadeFailsafeEndValue { 1.0f }; float _fadeFailsafeEndValue { 1.0f };
void checkFadeFailsafe(); void checkFadeFailsafe();
void startFadeFailsafe(float endValue); void startFadeFailsafe(float endValue);

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

@ -410,27 +410,26 @@ void OpenGLDisplayPlugin::updateFramerate() {
void OpenGLDisplayPlugin::compositeOverlay() { void OpenGLDisplayPlugin::compositeOverlay() {
using namespace oglplus; using namespace oglplus;
// set the alpha
auto compositorHelper = DependencyManager::get<CompositorHelper>(); auto compositorHelper = DependencyManager::get<CompositorHelper>();
// check the alpha
auto overlayAlpha = compositorHelper->getAlpha(); auto overlayAlpha = compositorHelper->getAlpha();
if (overlayAlpha > 0.0f) {
// set the alpha
Uniform<float>(*_program, _alphaUniform).Set(overlayAlpha);
if (overlayAlpha <= 0.0f) {
return; // don't render the overlay at all.
}
Uniform<float>(*_program, _alphaUniform).Set(overlayAlpha);
// Overlay draw
if (isStereo()) {
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mat4());
for_each_eye([&](Eye eye) {
eyeViewport(eye);
drawUnitQuad();
});
} else {
// Overlay draw // Overlay draw
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mat4()); if (isStereo()) {
drawUnitQuad(); Uniform<glm::mat4>(*_program, _mvpUniform).Set(mat4());
for_each_eye([&](Eye eye) {
eyeViewport(eye);
drawUnitQuad();
});
} else {
// Overlay draw
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mat4());
drawUnitQuad();
}
} }
Uniform<float>(*_program, _alphaUniform).Set(1.0); Uniform<float>(*_program, _alphaUniform).Set(1.0);
} }
@ -439,21 +438,21 @@ void OpenGLDisplayPlugin::compositePointer() {
using namespace oglplus; using namespace oglplus;
auto compositorHelper = DependencyManager::get<CompositorHelper>(); auto compositorHelper = DependencyManager::get<CompositorHelper>();
// set the alpha // check the alpha
auto overlayAlpha = compositorHelper->getAlpha(); auto overlayAlpha = compositorHelper->getAlpha();
if (overlayAlpha <= 0.0f) { if (overlayAlpha > 0.0f) {
return; // don't render the overlay at all. // set the alpha
} Uniform<float>(*_program, _alphaUniform).Set(overlayAlpha);
Uniform<float>(*_program, _alphaUniform).Set(overlayAlpha);
Uniform<glm::mat4>(*_program, _mvpUniform).Set(compositorHelper->getReticleTransform(glm::mat4())); Uniform<glm::mat4>(*_program, _mvpUniform).Set(compositorHelper->getReticleTransform(glm::mat4()));
if (isStereo()) { if (isStereo()) {
for_each_eye([&](Eye eye) { for_each_eye([&](Eye eye) {
eyeViewport(eye); eyeViewport(eye);
drawUnitQuad();
});
} else {
drawUnitQuad(); drawUnitQuad();
}); }
} else {
drawUnitQuad();
} }
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mat4()); Uniform<glm::mat4>(*_program, _mvpUniform).Set(mat4());
Uniform<float>(*_program, _alphaUniform).Set(1.0); Uniform<float>(*_program, _alphaUniform).Set(1.0);

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

@ -62,53 +62,49 @@ void HmdDisplayPlugin::uncustomizeContext() {
void HmdDisplayPlugin::compositeOverlay() { void HmdDisplayPlugin::compositeOverlay() {
using namespace oglplus; using namespace oglplus;
// set the alpha
auto compositorHelper = DependencyManager::get<CompositorHelper>(); auto compositorHelper = DependencyManager::get<CompositorHelper>();
// check the alpha
auto overlayAlpha = compositorHelper->getAlpha(); auto overlayAlpha = compositorHelper->getAlpha();
if (overlayAlpha > 0.0f) {
// set the alpha
Uniform<float>(*_program, _alphaUniform).Set(overlayAlpha);
if (overlayAlpha <= 0.0f) { _sphereSection->Use();
return; // don't render the overlay at all. for_each_eye([&](Eye eye) {
eyeViewport(eye);
auto modelView = glm::inverse(_currentRenderEyePoses[eye]); // *glm::translate(mat4(), vec3(0, 0, -1));
auto mvp = _eyeProjections[eye] * modelView;
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mvp);
_sphereSection->Draw();
});
} }
Uniform<float>(*_program, _alphaUniform).Set(overlayAlpha);
_sphereSection->Use();
for_each_eye([&](Eye eye) {
eyeViewport(eye);
auto modelView = glm::inverse(_currentRenderEyePoses[eye]); // *glm::translate(mat4(), vec3(0, 0, -1));
auto mvp = _eyeProjections[eye] * modelView;
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mvp);
_sphereSection->Draw();
});
Uniform<float>(*_program, _alphaUniform).Set(1.0); Uniform<float>(*_program, _alphaUniform).Set(1.0);
} }
void HmdDisplayPlugin::compositePointer() { void HmdDisplayPlugin::compositePointer() {
using namespace oglplus; using namespace oglplus;
//Mouse Pointer
auto compositorHelper = DependencyManager::get<CompositorHelper>(); auto compositorHelper = DependencyManager::get<CompositorHelper>();
// set the alpha // check the alpha
auto overlayAlpha = compositorHelper->getAlpha(); auto overlayAlpha = compositorHelper->getAlpha();
if (overlayAlpha <= 0.0f) { if (overlayAlpha > 0.0f) {
return; // don't render the overlay at all. // set the alpha
Uniform<float>(*_program, _alphaUniform).Set(overlayAlpha);
// Mouse pointer
_plane->Use();
// Reconstruct the headpose from the eye poses
auto headPosition = (vec3(_currentRenderEyePoses[Left][3]) + vec3(_currentRenderEyePoses[Right][3])) / 2.0f;
for_each_eye([&](Eye eye) {
eyeViewport(eye);
auto reticleTransform = compositorHelper->getReticleTransform(_currentRenderEyePoses[eye], headPosition);
auto mvp = _eyeProjections[eye] * reticleTransform;
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mvp);
_plane->Draw();
});
} }
Uniform<float>(*_program, _alphaUniform).Set(overlayAlpha);
_plane->Use();
// Reconstruct the headpose from the eye poses
auto headPosition = (vec3(_currentRenderEyePoses[Left][3]) + vec3(_currentRenderEyePoses[Right][3])) / 2.0f;
for_each_eye([&](Eye eye) {
eyeViewport(eye);
auto reticleTransform = compositorHelper->getReticleTransform(_currentRenderEyePoses[eye], headPosition);
auto mvp = _eyeProjections[eye] * reticleTransform;
Uniform<glm::mat4>(*_program, _mvpUniform).Set(mvp);
_plane->Draw();
});
Uniform<float>(*_program, _alphaUniform).Set(1.0); Uniform<float>(*_program, _alphaUniform).Set(1.0);
} }