From e8da8e374cf17f4d603df7026d6426fead4691ad Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 22 Jun 2015 15:10:48 -0700 Subject: [PATCH] Simplify Overlays payloadGetBounds --- interface/src/ui/overlays/Overlay.h | 2 ++ interface/src/ui/overlays/OverlaysPayload.cpp | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/interface/src/ui/overlays/Overlay.h b/interface/src/ui/overlays/Overlay.h index 0264c6e3c0..c2f94050ec 100644 --- a/interface/src/ui/overlays/Overlay.h +++ b/interface/src/ui/overlays/Overlay.h @@ -47,6 +47,8 @@ public: void init(QScriptEngine* scriptEngine); virtual void update(float deltatime) {} virtual void render(RenderArgs* args) = 0; + + virtual AABox getBounds() const = 0; virtual bool addToScene(Overlay::Pointer overlay, std::shared_ptr scene, render::PendingChanges& pendingChanges); virtual void removeFromScene(Overlay::Pointer overlay, std::shared_ptr scene, render::PendingChanges& pendingChanges); diff --git a/interface/src/ui/overlays/OverlaysPayload.cpp b/interface/src/ui/overlays/OverlaysPayload.cpp index 4f94d9f34b..b7cacef80c 100644 --- a/interface/src/ui/overlays/OverlaysPayload.cpp +++ b/interface/src/ui/overlays/OverlaysPayload.cpp @@ -46,12 +46,7 @@ namespace render { } } template <> const Item::Bound payloadGetBound(const Overlay::Pointer& overlay) { - if (overlay->is3D()) { - return std::dynamic_pointer_cast(overlay)->getBounds(); - } else { - QRect bounds = std::dynamic_pointer_cast(overlay)->getBounds(); - return AABox(glm::vec3(bounds.x(), bounds.y(), 0.0f), glm::vec3(bounds.width(), bounds.height(), 0.1f)); - } + return overlay->getBounds(); } template <> int payloadGetLayer(const Overlay::Pointer& overlay) { // MAgic number while we are defining the layering mechanism: