From 3e2dbe58ec06a6add7b9e767e20ae3f81a4348c6 Mon Sep 17 00:00:00 2001 From: "rick@ghostpunch.com" Date: Thu, 27 Jul 2017 16:39:49 -0400 Subject: [PATCH] Style guide corrections --- libraries/entities/src/PolyLineEntityItem.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libraries/entities/src/PolyLineEntityItem.cpp b/libraries/entities/src/PolyLineEntityItem.cpp index c698e6d5dd..61d5dd22ee 100644 --- a/libraries/entities/src/PolyLineEntityItem.cpp +++ b/libraries/entities/src/PolyLineEntityItem.cpp @@ -158,22 +158,19 @@ void PolyLineEntityItem::calculateScaleAndRegistrationPoint() { if (point.x > high.x){ high.x = point.x; - } - else if (point.x < low.x) { + } else if (point.x < low.x) { low.x = point.x; } if (point.y > high.y){ high.y = point.y; - } - else if (point.y < low.y) { + } else if (point.y < low.y) { low.y = point.y; } if (point.z > high.z){ high.z = point.z; - } - else if (point.z < low.z) { + } else if (point.z < low.z) { low.z = point.z; } } @@ -196,12 +193,10 @@ void PolyLineEntityItem::calculateScaleAndRegistrationPoint() { glm::vec3 startPointInScaleSpace = point - low; glm::vec3 newRegistrationPoint = startPointInScaleSpace / result; EntityItem::setRegistrationPoint(newRegistrationPoint); - } - else { + } else { // if Polyline has only one or fewer points, use default dimension settings SpatiallyNestable::setScale(glm::vec3(1.0f, 1.0f, 1.0f)); EntityItem::setRegistrationPoint(glm::vec3(0.0f, 0.0f, 0.0f)); - return; } }