From 54204833df7eaa1fa63b57b6c6d729dc911a3ed6 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 9 Oct 2017 12:17:56 -0700 Subject: [PATCH] add a getParentTree call for overlays --- interface/src/ui/overlays/Base3DOverlay.cpp | 6 ++++++ interface/src/ui/overlays/Base3DOverlay.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp index 4210e76097..b4d08df740 100644 --- a/interface/src/ui/overlays/Base3DOverlay.cpp +++ b/interface/src/ui/overlays/Base3DOverlay.cpp @@ -299,3 +299,9 @@ Transform Base3DOverlay::evalRenderTransform() { void Base3DOverlay::setRenderTransform(const Transform& transform) { _renderTransform = transform; } + +SpatialParentTree* Base3DOverlay::getParentTree() const { + auto entityTreeRenderer = qApp->getEntities(); + EntityTreePointer entityTree = entityTreeRenderer ? entityTreeRenderer->getTree() : nullptr; + return entityTree.get(); +} diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h index 3e65f163e2..6ce81c7434 100644 --- a/interface/src/ui/overlays/Base3DOverlay.h +++ b/interface/src/ui/overlays/Base3DOverlay.h @@ -53,7 +53,7 @@ public: virtual AABox getBounds() const override = 0; void update(float deltatime) override; - + void notifyRenderTransformChange() const; void setProperties(const QVariantMap& properties) override; @@ -67,6 +67,8 @@ public: return findRayIntersection(origin, direction, distance, face, surfaceNormal); } + virtual SpatialParentTree* getParentTree() const override; + protected: virtual void locationChanged(bool tellPhysics = true) override; virtual void parentDeleted() override;