From 8297bbd5e7622d59b87425aed3542eea834f174a Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 3 Feb 2015 15:52:20 -0800 Subject: [PATCH] Fix orientation of non-solid rectangle3d overlays, too --- .../src/ui/overlays/Rectangle3DOverlay.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/interface/src/ui/overlays/Rectangle3DOverlay.cpp b/interface/src/ui/overlays/Rectangle3DOverlay.cpp index 1fa5d1ce1c..6ee90b11cc 100644 --- a/interface/src/ui/overlays/Rectangle3DOverlay.cpp +++ b/interface/src/ui/overlays/Rectangle3DOverlay.cpp @@ -76,10 +76,10 @@ void Rectangle3DOverlay::render(RenderArgs* args) { } else { if (getIsDashedLine()) { - glm::vec3 point1(-halfDimensions.x, 0.0f, -halfDimensions.y); - glm::vec3 point2(halfDimensions.x, 0.0f, -halfDimensions.y); - glm::vec3 point3(halfDimensions.x, 0.0f, halfDimensions.y); - glm::vec3 point4(-halfDimensions.x, 0.0f, halfDimensions.y); + glm::vec3 point1(-halfDimensions.x, -halfDimensions.y, 0.0f); + glm::vec3 point2(halfDimensions.x, -halfDimensions.y, 0.0f); + glm::vec3 point3(halfDimensions.x, halfDimensions.y, 0.0f); + glm::vec3 point4(-halfDimensions.x, halfDimensions.y, 0.0f); geometryCache->renderDashedLine(point1, point2, rectangleColor); geometryCache->renderDashedLine(point2, point3, rectangleColor); @@ -90,11 +90,11 @@ void Rectangle3DOverlay::render(RenderArgs* args) { if (halfDimensions != _previousHalfDimensions) { QVector border; - border << glm::vec3(-halfDimensions.x, 0.0f, -halfDimensions.y); - border << glm::vec3(halfDimensions.x, 0.0f, -halfDimensions.y); - border << glm::vec3(halfDimensions.x, 0.0f, halfDimensions.y); - border << glm::vec3(-halfDimensions.x, 0.0f, halfDimensions.y); - border << glm::vec3(-halfDimensions.x, 0.0f, -halfDimensions.y); + border << glm::vec3(-halfDimensions.x, -halfDimensions.y, 0.0f); + border << glm::vec3(halfDimensions.x, -halfDimensions.y, 0.0f); + border << glm::vec3(halfDimensions.x, halfDimensions.y, 0.0f); + border << glm::vec3(-halfDimensions.x, halfDimensions.y, 0.0f); + border << glm::vec3(-halfDimensions.x, -halfDimensions.y, 0.0f); geometryCache->updateVertices(_geometryCacheID, border, rectangleColor); _previousHalfDimensions = halfDimensions;