From 19cd537e6586a73bebe990d6d1fd241ca3215ca0 Mon Sep 17 00:00:00 2001 From: samcake Date: Fri, 15 Sep 2017 11:10:25 -0700 Subject: [PATCH] addressing review comments --- interface/src/ui/overlays/Base3DOverlay.cpp | 4 ++-- interface/src/ui/overlays/Web3DOverlay.cpp | 2 +- interface/src/ui/overlays/Web3DOverlay.h | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp index 53af2ea882..6f55260133 100644 --- a/interface/src/ui/overlays/Base3DOverlay.cpp +++ b/interface/src/ui/overlays/Base3DOverlay.cpp @@ -271,11 +271,12 @@ void Base3DOverlay::update(float duration) { // TODO: Fix the value to be computed in main thread now and passed by value to the render item. // This is the simplest fix for the web overlay of the tablet for now if (_renderTransformDirty) { + _renderTransformDirty = false; auto itemID = getRenderItemID(); if (render::Item::isValidID(itemID)) { render::ScenePointer scene = qApp->getMain3DScene(); render::Transaction transaction; - transaction.updateItem(itemID, [](Overlay& data) { + transaction.updateItem(itemID, [](Overlay& data) { auto overlay3D = dynamic_cast(&data); if (overlay3D) { auto latestTransform = overlay3D->evalRenderTransform(); @@ -284,7 +285,6 @@ void Base3DOverlay::update(float duration) { }); scene->enqueueTransaction(transaction); } - _renderTransformDirty = false; } } diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp index 809536add9..eb8451e5c3 100644 --- a/interface/src/ui/overlays/Web3DOverlay.cpp +++ b/interface/src/ui/overlays/Web3DOverlay.cpp @@ -184,7 +184,7 @@ void Web3DOverlay::update(float deltatime) { // update globalPosition _webSurface->getSurfaceContext()->setContextProperty("globalPosition", vec3toVariant(getPosition())); } - Billboard3DOverlay::update(deltatime); + Parent::update(deltatime); } QString Web3DOverlay::pickURL() { diff --git a/interface/src/ui/overlays/Web3DOverlay.h b/interface/src/ui/overlays/Web3DOverlay.h index 2eae7f33da..18cac96d65 100644 --- a/interface/src/ui/overlays/Web3DOverlay.h +++ b/interface/src/ui/overlays/Web3DOverlay.h @@ -21,6 +21,8 @@ class Web3DOverlay : public Billboard3DOverlay { Q_OBJECT public: + using Parent = Billboard3DOverlay; + static const QString QML; static QString const TYPE; virtual QString getType() const override { return TYPE; }