From 8d4ea143ce34df18cd7f29cd2a855a659f71642a Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 25 Feb 2015 14:48:06 -0800 Subject: [PATCH] easy conversions of: InDomainUnits --> InMeters --- interface/src/avatar/ModelReferential.cpp | 4 ++-- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 6 +++--- libraries/entities-renderer/src/RenderableBoxEntityItem.cpp | 4 ++-- .../entities-renderer/src/RenderableLightEntityItem.cpp | 2 +- .../entities-renderer/src/RenderableModelEntityItem.cpp | 4 ++-- .../entities-renderer/src/RenderableSphereEntityItem.cpp | 2 +- .../entities-renderer/src/RenderableTextEntityItem.cpp | 2 +- libraries/entities/src/ModelEntityItem.cpp | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/interface/src/avatar/ModelReferential.cpp b/interface/src/avatar/ModelReferential.cpp index 9136e53fa5..952d6475dc 100644 --- a/interface/src/avatar/ModelReferential.cpp +++ b/interface/src/avatar/ModelReferential.cpp @@ -34,7 +34,7 @@ ModelReferential::ModelReferential(Referential* referential, EntityTree* tree, A if (item != NULL) { _refScale = item->getLargestDimensionInDomainUnits(); _refRotation = item->getRotation(); - _refPosition = item->getPositionInDomainUnits() * (float)TREE_SCALE; + _refPosition = item->getPositionInMeters(); update(); } } @@ -53,7 +53,7 @@ ModelReferential::ModelReferential(const QUuid& entityID, EntityTree* tree, Avat _refScale = item->getLargestDimensionInDomainUnits(); _refRotation = item->getRotation(); - _refPosition = item->getPositionInDomainUnits() * (float)TREE_SCALE; + _refPosition = item->getPositionInMeters(); glm::quat refInvRot = glm::inverse(_refRotation); _scale = _avatar->getTargetScale() / _refScale; diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index ca69c2255a..d784950267 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -501,9 +501,9 @@ void EntityTreeRenderer::renderProxies(const EntityItem* entity, RenderArgs* arg glPopMatrix(); - glm::vec3 position = entity->getPositionInDomainUnits() * (float) TREE_SCALE; - glm::vec3 center = entity->getCenterInDomainUnits() * (float) TREE_SCALE; - glm::vec3 dimensions = entity->getDimensionsInDomainUnits() * (float) TREE_SCALE; + glm::vec3 position = entity->getPositionInMeters(); + glm::vec3 center = entity->getCenterInMeters(); + glm::vec3 dimensions = entity->getDimensionsInMeters(); glm::quat rotation = entity->getRotation(); glPushMatrix(); diff --git a/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp b/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp index fe3375c274..a80fc91995 100644 --- a/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableBoxEntityItem.cpp @@ -26,8 +26,8 @@ void RenderableBoxEntityItem::render(RenderArgs* args) { PerformanceTimer perfTimer("RenderableBoxEntityItem::render"); assert(getType() == EntityTypes::Box); glm::vec3 position = getPositionInMeters(); - glm::vec3 center = getCenterInDomainUnits() * (float)TREE_SCALE; - glm::vec3 dimensions = getDimensionsInDomainUnits() * (float)TREE_SCALE; + glm::vec3 center = getCenterInMeters(); + glm::vec3 dimensions = getDimensionsInMeters(); glm::quat rotation = getRotation(); const float MAX_COLOR = 255.0f; diff --git a/libraries/entities-renderer/src/RenderableLightEntityItem.cpp b/libraries/entities-renderer/src/RenderableLightEntityItem.cpp index 5b1486a6e4..5a20633044 100644 --- a/libraries/entities-renderer/src/RenderableLightEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableLightEntityItem.cpp @@ -27,7 +27,7 @@ void RenderableLightEntityItem::render(RenderArgs* args) { PerformanceTimer perfTimer("RenderableLightEntityItem::render"); assert(getType() == EntityTypes::Light); glm::vec3 position = getPositionInMeters(); - glm::vec3 dimensions = getDimensionsInDomainUnits() * (float)TREE_SCALE; + glm::vec3 dimensions = getDimensionsInMeters(); glm::quat rotation = getRotation(); float largestDiameter = glm::max(dimensions.x, dimensions.y, dimensions.z); diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index cf09d84895..b7ea64ebef 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -114,9 +114,9 @@ void RenderableModelEntityItem::render(RenderArgs* args) { bool drawAsModel = hasModel(); - glm::vec3 position = getPositionInDomainUnits() * (float)TREE_SCALE; + glm::vec3 position = getPositionInMeters(); float size = getSize() * (float)TREE_SCALE; - glm::vec3 dimensions = getDimensionsInDomainUnits() * (float)TREE_SCALE; + glm::vec3 dimensions = getDimensionsInMeters(); if (drawAsModel) { remapTextures(); diff --git a/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp b/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp index fd0137812d..4688e7cc29 100644 --- a/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableSphereEntityItem.cpp @@ -28,7 +28,7 @@ void RenderableSphereEntityItem::render(RenderArgs* args) { assert(getType() == EntityTypes::Sphere); glm::vec3 position = getPositionInMeters(); glm::vec3 center = getCenterInMeters(); - glm::vec3 dimensions = getDimensionsInDomainUnits() * (float)TREE_SCALE; + glm::vec3 dimensions = getDimensionsInMeters(); glm::quat rotation = getRotation(); const float MAX_COLOR = 255.0f; diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp index c45096358b..097aef3b38 100644 --- a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp @@ -31,7 +31,7 @@ void RenderableTextEntityItem::render(RenderArgs* args) { PerformanceTimer perfTimer("RenderableTextEntityItem::render"); assert(getType() == EntityTypes::Text); glm::vec3 position = getPositionInMeters(); - glm::vec3 dimensions = getDimensionsInDomainUnits() * (float)TREE_SCALE; + glm::vec3 dimensions = getDimensionsInMeters(); glm::vec3 halfDimensions = dimensions / 2.0f; glm::quat rotation = getRotation(); float leftMargin = 0.1f; diff --git a/libraries/entities/src/ModelEntityItem.cpp b/libraries/entities/src/ModelEntityItem.cpp index 61613a2ec8..5a95fe4e33 100644 --- a/libraries/entities/src/ModelEntityItem.cpp +++ b/libraries/entities/src/ModelEntityItem.cpp @@ -255,8 +255,8 @@ void ModelEntityItem::update(const quint64& now) { void ModelEntityItem::debugDump() const { qDebug() << "ModelEntityItem id:" << getEntityItemID(); qDebug() << " edited ago:" << getEditedAgo(); - qDebug() << " position:" << getPositionInDomainUnits() * (float)TREE_SCALE; - qDebug() << " dimensions:" << getDimensionsInDomainUnits() * (float)TREE_SCALE; + qDebug() << " position:" << getPositionInMeters(); + qDebug() << " dimensions:" << getDimensionsInMeters(); qDebug() << " model URL:" << getModelURL(); }