diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 49187c3b2f..1999fedb46 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -650,7 +650,7 @@ void EntityTreeRenderer::renderProxies(const EntityItem* entity, RenderArgs* arg glm::vec3 position = entity->getPosition(); - glm::vec3 center = entity->getCenter(); + glm::vec3 center = entity->getCenterPosition(); glm::vec3 dimensions = entity->getDimensions(); glm::quat rotation = entity->getRotation(); diff --git a/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp b/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp index 13df04e2e7..439d50ef3a 100644 --- a/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp @@ -26,7 +26,7 @@ void RenderableBoxEntityItem::render(RenderArgs* args) { PerformanceTimer perfTimer("RenderableBoxEntityItem::render"); assert(getType() == EntityTypes::Box); glm::vec3 position = getPosition(); - glm::vec3 center = getCenter(); + glm::vec3 center = getCenterPosition(); glm::vec3 dimensions = getDimensions(); glm::quat rotation = getRotation(); diff --git a/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp b/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp index 017cb289f0..6cef09fbbe 100644 --- a/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableDebugableEntityItem.cpp @@ -22,7 +22,7 @@ void RenderableDebugableEntityItem::renderBoundingBox(EntityItem* entity, RenderArgs* args, float puffedOut, glm::vec4& color) { glm::vec3 position = entity->getPosition(); - glm::vec3 center = entity->getCenter(); + glm::vec3 center = entity->getCenterPosition(); glm::vec3 dimensions = entity->getDimensions(); glm::quat rotation = entity->getRotation(); @@ -41,7 +41,7 @@ void RenderableDebugableEntityItem::renderBoundingBox(EntityItem* entity, Render void RenderableDebugableEntityItem::renderHoverDot(EntityItem* entity, RenderArgs* args) { glm::vec3 position = entity->getPosition(); - glm::vec3 center = entity->getCenter(); + glm::vec3 center = entity->getCenterPosition(); glm::vec3 dimensions = entity->getDimensions(); glm::quat rotation = entity->getRotation(); glm::vec4 blueColor(0.0f, 0.0f, 1.0f, 1.0f); diff --git a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp index 009d26481a..8da8211741 100644 --- a/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp @@ -96,7 +96,7 @@ void RenderableParticleEffectEntityItem::renderUntexturedQuads(RenderArgs* args) glPushMatrix(); - glm::vec3 positionToCenter = getCenter() - position; + glm::vec3 positionToCenter = getCenterPosition() - position; glTranslatef(positionToCenter.x, positionToCenter.y, positionToCenter.z); DependencyManager::get()->renderVertices(gpu::QUADS, _cacheID); @@ -172,7 +172,7 @@ void RenderableParticleEffectEntityItem::renderTexturedQuads(RenderArgs* args) { glPushMatrix(); - glm::vec3 positionToCenter = getCenter() - position; + glm::vec3 positionToCenter = getCenterPosition() - position; glTranslatef(positionToCenter.x, positionToCenter.y, positionToCenter.z); DependencyManager::get()->renderVertices(gpu::QUADS, _cacheID); diff --git a/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp b/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp index 083a34c02f..3dccb9ff1e 100644 --- a/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp @@ -27,7 +27,7 @@ void RenderableSphereEntityItem::render(RenderArgs* args) { PerformanceTimer perfTimer("RenderableSphereEntityItem::render"); assert(getType() == EntityTypes::Sphere); glm::vec3 position = getPosition(); - glm::vec3 center = getCenter(); + glm::vec3 center = getCenterPosition(); glm::vec3 dimensions = getDimensions(); glm::quat rotation = getRotation(); diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp index d9bc0f0b4a..4d2b05026b 100644 --- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp @@ -107,7 +107,7 @@ void RenderableZoneEntityItem::render(RenderArgs* args) { case SHAPE_TYPE_SPHERE: { PerformanceTimer perfTimer("zone->renderPrimitive"); glm::vec3 position = getPosition(); - glm::vec3 center = getCenter(); + glm::vec3 center = getCenterPosition(); glm::vec3 dimensions = getDimensions(); glm::quat rotation = getRotation(); diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 0a6a3ae051..773de8f4e4 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -998,10 +998,6 @@ void EntityItem::recordCreationTime() { _lastSimulated = _created; } -glm::vec3 EntityItem::getCenter() const { - return getPosition() + (getDimensions() * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint())); -} - /// 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 09c7985e56..4e8adde307 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -181,7 +181,9 @@ public: // attributes applicable to all entity types EntityTypes::EntityType getType() const { return _type; } - glm::vec3 getCenter() const; + inline glm::vec3 getCenterPosition() const { + return getPosition() + (getDimensions() * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint())); + } /// Position in meters (0.0 - TREE_SCALE) inline const glm::vec3& getPosition() const { return _transform.getTranslation(); }