From ff66eb584df0ecda189b4515a2212d329a67b258 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 19 Jun 2015 10:48:07 -0700 Subject: [PATCH] Add correct line3doverlay bounds --- interface/src/ui/overlays/Line3DOverlay.cpp | 10 ++++++++++ interface/src/ui/overlays/Line3DOverlay.h | 1 + 2 files changed, 11 insertions(+) diff --git a/interface/src/ui/overlays/Line3DOverlay.cpp b/interface/src/ui/overlays/Line3DOverlay.cpp index 34c983d7b2..44c6ec7ef6 100644 --- a/interface/src/ui/overlays/Line3DOverlay.cpp +++ b/interface/src/ui/overlays/Line3DOverlay.cpp @@ -32,6 +32,16 @@ Line3DOverlay::Line3DOverlay(const Line3DOverlay* line3DOverlay) : Line3DOverlay::~Line3DOverlay() { } +AABox Line3DOverlay::getBounds() const { + auto start = _position + _start; + auto end = _position + _end; + + auto min = glm::min(start, end); + auto max = glm::max(start, end); + + return AABox(min, max - min); +} + void Line3DOverlay::render(RenderArgs* args) { if (!_visible) { return; // do nothing if we're not visible diff --git a/interface/src/ui/overlays/Line3DOverlay.h b/interface/src/ui/overlays/Line3DOverlay.h index 9f4c9d8b4b..ac5f18d8ed 100644 --- a/interface/src/ui/overlays/Line3DOverlay.h +++ b/interface/src/ui/overlays/Line3DOverlay.h @@ -21,6 +21,7 @@ public: Line3DOverlay(const Line3DOverlay* line3DOverlay); ~Line3DOverlay(); virtual void render(RenderArgs* args); + virtual AABox getBounds() const override; // getters const glm::vec3& getStart() const { return _start; }