From 3d7a8343567c3cd0037c43b9bb00fd483aa07639 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Sun, 24 May 2015 19:49:45 +0200 Subject: [PATCH] Ignore new entity dimensions if one of them is 0 --- libraries/entities/src/EntityItem.cpp | 7 +++++++ libraries/entities/src/EntityItem.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 6ad2bed291..06c9260891 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -1020,6 +1020,13 @@ void EntityItem::setTranformToCenter(const Transform& transform) { setTransform(copy); } +void EntityItem::setDimensions(const glm::vec3& value) { + if (value.x == 0.0f || value.y == 0.0f || value.z == 0.0f) { + return; + } + _transform.setScale(value); +} + /// The maximum bounding cube for the entity, independent of it's rotation. /// This accounts for the registration point (upon which rotation occurs around). /// diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index 8f88b6de07..0d210e5762 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -195,7 +195,7 @@ public: /// Dimensions in meters (0.0 - TREE_SCALE) inline const glm::vec3& getDimensions() const { return _transform.getScale(); } - inline virtual void setDimensions(const glm::vec3& value) { _transform.setScale(glm::abs(value)); } + virtual void setDimensions(const glm::vec3& value); float getGlowLevel() const { return _glowLevel; }