Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 17:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

works now

Browse source
This commit is contained in:
Seth Alves 2018-03-15 10:31:55 -07:00
parent bb370caccc
commit a5b94f22fa
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/Base3DOverlay.h
View file

@ -56,7 +56,7 @@ public:
virtual void setDrawInFront(bool value) { _drawInFront = value; } virtual void setDrawInFront(bool value) { _drawInFront = value; }
virtual void setDrawHUDLayer(bool value) { _drawHUDLayer = value; } virtual void setDrawHUDLayer(bool value) { _drawHUDLayer = value; }
void setIsGrabbable(bool value) { _isGrabbable = value; } void setIsGrabbable(bool value) { _isGrabbable = value; }
void setIsVisibleInSecondaryCamera(bool value) { _isVisibleInSecondaryCamera = value; } virtual void setIsVisibleInSecondaryCamera(bool value) { _isVisibleInSecondaryCamera = value; }
virtual AABox getBounds() const override = 0; virtual AABox getBounds() const override = 0;

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

@ -92,7 +92,7 @@ void ModelOverlay::update(float deltatime) {
// don't show overlays in mirrors or spectator-cam unless _isVisibleInSecondaryCamera is true // don't show overlays in mirrors or spectator-cam unless _isVisibleInSecondaryCamera is true
_model->setVisibleInScene(getVisible(), scene, _model->setVisibleInScene(getVisible(), scene,
render::ItemKey::TAG_BITS_0 | render::ItemKey::TAG_BITS_0 |
_isVisibleInSecondaryCamera ? render::ItemKey::TAG_BITS_1 : render::ItemKey::TAG_BITS_NONE, (_isVisibleInSecondaryCamera ? render::ItemKey::TAG_BITS_1 : render::ItemKey::TAG_BITS_NONE),
false); false);
} }
if (_drawInFrontDirty) { if (_drawInFrontDirty) {

5
interface/src/ui/overlays/ModelOverlay.h
View file

@ -36,6 +36,11 @@ public:
void clearSubRenderItemIDs(); void clearSubRenderItemIDs();
void setSubRenderItemIDs(const render::ItemIDs& ids); void setSubRenderItemIDs(const render::ItemIDs& ids);
virtual void setIsVisibleInSecondaryCamera(bool value) override {
Base3DOverlay::setIsVisibleInSecondaryCamera(value);
_visibleDirty = true;
}
void setProperties(const QVariantMap& properties) override; void setProperties(const QVariantMap& properties) override;
QVariant getProperty(const QString& property) override; QVariant getProperty(const QString& property) override;
virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance,

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

@ -51,7 +51,7 @@ namespace render {
// always visible in primary view. if isVisibleInSecondaryCamera, also draw in secondary view // always visible in primary view. if isVisibleInSecondaryCamera, also draw in secondary view
uint32_t viewTaskBits = render::ItemKey::TAG_BITS_0 | uint32_t viewTaskBits = render::ItemKey::TAG_BITS_0 |
overlay->getIsVisibleInSecondaryCamera() ? render::ItemKey::TAG_BITS_1 : render::ItemKey::TAG_BITS_NONE; (overlay->getIsVisibleInSecondaryCamera() ? render::ItemKey::TAG_BITS_1 : render::ItemKey::TAG_BITS_NONE);
builder.withTagBits(viewTaskBits); builder.withTagBits(viewTaskBits);