Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 11:18:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trying to address the overlays to not be visisble in 2nd camera

Browse source
This commit is contained in:
Sam Gateau 2018-01-21 23:47:45 -08:00
parent c622cd8293
commit d38d13cbb9
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/ui/overlays/ModelOverlay.cpp
View file

@ -87,7 +87,7 @@ void ModelOverlay::update(float deltatime) {
if (_visibleDirty) {
_visibleDirty = false;
// don't show overlays in mirrors
_model->setVisibleInScene(getVisible(), scene, render::ItemKey::VISIBLE_MASK_1);
_model->setVisibleInScene(getVisible(), scene, render::ItemKey::VISIBLE_MASK_0 * getVisible());
}
if (_drawInFrontDirty) {
_drawInFrontDirty = false;
@ -121,8 +121,10 @@ void ModelOverlay::removeFromScene(Overlay::Pointer overlay, const render::Scene
}
void ModelOverlay::setVisible(bool visible) {
Overlay::setVisible(visible);
_visibleDirty = true;
if (visible != getVisible()) {
Overlay::setVisible(visible);
_visibleDirty = true;
}
}
void ModelOverlay::setDrawInFront(bool drawInFront) {

4
interface/src/ui/overlays/OverlaysPayload.cpp
View file

@ -46,9 +46,9 @@ namespace render {
}
if (overlay->getVisible()) {
builder.withViewVisibilityMask(render::ItemKey::VISIBLE_MASK_1); // don't draw overlays in mirror
builder.withViewVisibilityMask(render::ItemKey::VISIBLE_MASK_0); // don't draw overlays in mirror
} else {
builder.withViewVisibilityMask(render::ItemKey::VISIBLE_MASK_ALL);
builder.withViewVisibilityMask(render::ItemKey::VISIBLE_MASK_NONE);
}
return builder.build();