From be48268be827edecf9702b556353cd5f0928dcbb Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 19 Jul 2017 15:02:40 -0700
Subject: [PATCH] getMeshes handles registration point

---
 libraries/entities/src/EntityScriptingInterface.cpp | 8 ++------
 libraries/render-utils/src/Model.cpp                | 9 +--------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 1dc3cf8f75..9d2cb30c6e 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -1736,9 +1736,7 @@ glm::mat4 EntityScriptingInterface::getEntityTransform(const QUuid& entityID) {
             if (entity) {
                 glm::mat4 translation = glm::translate(entity->getPosition());
                 glm::mat4 rotation = glm::mat4_cast(entity->getRotation());
-                glm::mat4 registration = glm::translate(ENTITY_ITEM_DEFAULT_REGISTRATION_POINT -
-                                                        entity->getRegistrationPoint());
-                result = translation * rotation /* * registration */;
+                result = translation * rotation;
             }
         });
     }
@@ -1753,9 +1751,7 @@ glm::mat4 EntityScriptingInterface::getEntityLocalTransform(const QUuid& entityI
             if (entity) {
                 glm::mat4 translation = glm::translate(entity->getLocalPosition());
                 glm::mat4 rotation = glm::mat4_cast(entity->getLocalOrientation());
-                glm::mat4 registration = glm::translate(ENTITY_ITEM_DEFAULT_REGISTRATION_POINT -
-                                                        entity->getRegistrationPoint());
-                result = translation * rotation * registration;
+                result = translation * rotation;
             }
         });
     }
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 6219e83bf1..e38a556487 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -473,16 +473,9 @@ bool Model::getMeshes(MeshProxyList& result) {
 
     Transform offset;
     offset.setScale(_scale);
-    // offset.postTranslate(_offset);
+    offset.postTranslate(_offset);
     glm::mat4 offsetMat = offset.getMatrix();
 
-    Extents modelExtents = getUnscaledMeshExtents();
-    glm::vec3 dimensions = modelExtents.maximum - modelExtents.minimum;
-
-    const glm::vec3 DEFAULT_ENTITY_REGISTRATION_POINT = glm::vec3(0.5f, 0.5f, 0.5f);
-    glm::vec3 regis = (DEFAULT_ENTITY_REGISTRATION_POINT - _registrationPoint);
-    glm::vec3 regisOffset = dimensions * regis;
-
     for (std::shared_ptr<const model::Mesh> mesh : meshes) {
         if (!mesh) {
             continue;