From 533aa3d91896c4f4d16e65d90c2b9d9f125b94b8 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 22 Dec 2017 09:07:16 -0800 Subject: [PATCH] code review --- libraries/entities/src/EntityItem.cpp | 8 ++------ libraries/entities/src/ShapeEntityItem.cpp | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index fcf7519bbd..d0dca2d43e 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1674,16 +1674,12 @@ void EntityItem::setParentID(const QUuid& value) { glm::vec3 EntityItem::getScaledDimensions() const { glm::vec3 scale = getSNScale(); - return glm::vec3(_unscaledDimensions.x * scale.x, - _unscaledDimensions.y * scale.y, - _unscaledDimensions.z * scale.z); + return _unscaledDimensions * scale; } void EntityItem::setScaledDimensions(const glm::vec3& value) { glm::vec3 parentScale = getSNScale(); - setUnscaledDimensions(glm::vec3(value.x / parentScale.x, - value.y / parentScale.y, - value.z / parentScale.z)); + setUnscaledDimensions(value * parentScale); } void EntityItem::setUnscaledDimensions(const glm::vec3& value) { diff --git a/libraries/entities/src/ShapeEntityItem.cpp b/libraries/entities/src/ShapeEntityItem.cpp index f564c89d21..3750bc3b57 100644 --- a/libraries/entities/src/ShapeEntityItem.cpp +++ b/libraries/entities/src/ShapeEntityItem.cpp @@ -206,12 +206,12 @@ void ShapeEntityItem::setColor(const QColor& value) { void ShapeEntityItem::setUnscaledDimensions(const glm::vec3& value) { const float MAX_FLAT_DIMENSION = 0.0001f; - if ((_shape == entity::Shape::Circle || _shape == entity::Shape::Quad) && value.y > MAX_FLAT_DIMENSION) { + if ((_shape == entity::Shape::Circle || _shape == entity::Shape::Quad) && value.y > MAX_FLAT_DIMENSION) { // enforce flatness in Y glm::vec3 newDimensions = value; newDimensions.y = MAX_FLAT_DIMENSION; EntityItem::setUnscaledDimensions(newDimensions); - } else { + } else { EntityItem::setUnscaledDimensions(value); } }