From 64c28fe925061a924da6d3258e4c4088e67fa15d Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 26 Feb 2015 15:36:59 -0800 Subject: [PATCH] remove EntityItem::getSize() --- .../entities-renderer/src/RenderableModelEntityItem.cpp | 2 +- libraries/entities/src/EntityItem.cpp | 5 ----- libraries/entities/src/EntityItem.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index b7ea64ebef..5f2c0baa5f 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -115,8 +115,8 @@ void RenderableModelEntityItem::render(RenderArgs* args) { bool drawAsModel = hasModel(); glm::vec3 position = getPositionInMeters(); - float size = getSize() * (float)TREE_SCALE; glm::vec3 dimensions = getDimensionsInMeters(); + float size = glm::length(dimensions); if (drawAsModel) { remapTextures(); diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index b24925dd6c..ee314d514f 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -888,11 +888,6 @@ void EntityItem::recordCreationTime() { } -// TODO: is this really correct? how do we use size, does it need to handle rotation? -float EntityItem::getSize() const { - return glm::length(_dimensions); -} - // TODO: doesn't this need to handle rotation? glm::vec3 EntityItem::getCenterInDomainUnits() const { return _position + (_dimensions * (glm::vec3(0.5f,0.5f,0.5f) - _registrationPoint)); diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index 1aad9c27e0..09a2c7bc6b 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -212,7 +212,6 @@ public: quint64 getExpiry() const; // position, size, and bounds related helpers - float getSize() const; /// get maximum dimension in domain scale units (0.0 - 1.0) AACube getMaximumAACube() const; AACube getMinimumAACube() const; AABox getAABoxInMeters() const; /// axis aligned bounding box in world-frame (meters)