From df034ea6dab2caa30cdb5b551bcfdf07ef5d1870 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 27 Feb 2017 11:27:59 -0800 Subject: [PATCH] remove commented-out code --- interface/src/ui/overlays/Overlays.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp index f1f835fea3..ad7fbd6cc2 100644 --- a/interface/src/ui/overlays/Overlays.cpp +++ b/interface/src/ui/overlays/Overlays.cpp @@ -345,23 +345,14 @@ OverlayID Overlays::getOverlayAtPoint(const glm::vec2& point) { const float LARGE_NEGATIVE_FLOAT = -9999999; glm::vec3 origin(pointCopy.x, pointCopy.y, LARGE_NEGATIVE_FLOAT); glm::vec3 direction(0, 0, 1); - // BoxFace thisFace; glm::vec3 thisSurfaceNormal; - // float distance; unsigned int bestStackOrder = 0; OverlayID bestOverlayID = UNKNOWN_OVERLAY_ID; while (i.hasNext()) { i.next(); OverlayID thisID = i.key(); - if (i.value()->is3D()) { - // auto thisOverlay = std::dynamic_pointer_cast(i.value()); - // if (thisOverlay && !thisOverlay->getIgnoreRayIntersection()) { - // if (thisOverlay->findRayIntersection(origin, direction, distance, thisFace, thisSurfaceNormal)) { - // return thisID; - // } - // } - } else { + if (!i.value()->is3D()) { auto thisOverlay = std::dynamic_pointer_cast(i.value()); if (thisOverlay && thisOverlay->getVisible() && thisOverlay->isLoaded() && thisOverlay->getBoundingRect().contains(pointCopy.x, pointCopy.y, false)) {