From 49a4d104a69a316f9ed2cbc5954e61e4c2612f8d Mon Sep 17 00:00:00 2001
From: "Anthony J. Thibault" <tony@highfidelity.io>
Date: Sat, 26 Mar 2016 13:27:05 -0700
Subject: [PATCH] Minimize diff with master

---
 interface/src/avatar/Avatar.cpp               |  2 --
 .../render-utils/src/MeshPartPayload.cpp      | 20 +++++++++----------
 libraries/render-utils/src/MeshPartPayload.h  |  6 ++----
 libraries/render-utils/src/Model.cpp          |  1 -
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 07227d2f68..f722210a8e 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -56,8 +56,6 @@ const float DISPLAYNAME_ALPHA = 1.0f;
 const float DISPLAYNAME_BACKGROUND_ALPHA = 0.4f;
 const glm::vec3 HAND_TO_PALM_OFFSET(0.0f, 0.12f, 0.08f);
 
-const AABox DEFAULT_AVATAR_SKINNED_MESH_BOUND(glm::vec3(-1.0, -1.0, -1.0), glm::vec3(2.0f));
-
 namespace render {
     template <> const ItemKey payloadGetKey(const AvatarSharedPointer& avatar) {
         return ItemKey::Builder::opaqueShape();
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index bfa6c48857..8d738e44d8 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -52,14 +52,6 @@ MeshPartPayload::MeshPartPayload(model::MeshPointer mesh, int partIndex, model::
     updateTransform(transform, offsetTransform);
 }
 
-void MeshPartPayload::updateTransform(const Transform& transform, const Transform& offsetTransform) {
-    _transform = transform;
-    _offsetTransform = offsetTransform;
-    Transform::mult(_drawTransform, _transform, _offsetTransform);
-    _worldBound = _localBound;
-    _worldBound.transform(_drawTransform);
-}
-
 void MeshPartPayload::updateMeshPart(model::MeshPointer drawMesh, int partIndex) {
     _drawMesh = drawMesh;
     if (_drawMesh) {
@@ -70,6 +62,14 @@ void MeshPartPayload::updateMeshPart(model::MeshPointer drawMesh, int partIndex)
     }
 }
 
+void MeshPartPayload::updateTransform(const Transform& transform, const Transform& offsetTransform) {
+    _transform = transform;
+    _offsetTransform = offsetTransform;
+    Transform::mult(_drawTransform, _transform, _offsetTransform);
+    _worldBound = _localBound;
+    _worldBound.transform(_drawTransform);
+}
+
 void MeshPartPayload::updateMaterial(model::MaterialPointer drawMaterial) {
     _drawMaterial = drawMaterial;
 }
@@ -315,12 +315,10 @@ template <> void payloadRender(const ModelMeshPartPayload::Pointer& payload, Ren
 }
 }
 
-ModelMeshPartPayload::ModelMeshPartPayload(Model* model, int _meshIndex, int partIndex, int shapeIndex, const Transform& transform,
-                                           const Transform& offsetTransform) :
+ModelMeshPartPayload::ModelMeshPartPayload(Model* model, int _meshIndex, int partIndex, int shapeIndex, const Transform& transform, const Transform& offsetTransform) :
     _model(model),
     _meshIndex(_meshIndex),
     _shapeID(shapeIndex) {
-
     auto& modelMesh = _model->_geometry->getMeshes().at(_meshIndex)->_mesh;
     updateMeshPart(modelMesh, partIndex);
 
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index 7b059afadd..546c0938fa 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -64,7 +64,6 @@ public:
     bool _hasColorAttrib = false;
 };
 
-
 namespace render {
     template <> const ItemKey payloadGetKey(const MeshPartPayload::Pointer& payload);
     template <> const Item::Bound payloadGetBound(const MeshPartPayload::Pointer& payload);
@@ -74,13 +73,12 @@ namespace render {
 
 class ModelMeshPartPayload : public MeshPartPayload {
 public:
-    ModelMeshPartPayload(Model* model, int meshIndex, int partIndex, int shapeIndex, const Transform& transform,
-                         const Transform& offsetTransform);
+    ModelMeshPartPayload(Model* model, int meshIndex, int partIndex, int shapeIndex, const Transform& transform, const Transform& offsetTransform);
 
     typedef render::Payload<ModelMeshPartPayload> Payload;
     typedef Payload::DataPointer Pointer;
 
-    virtual void notifyLocationChanged() override;
+    void notifyLocationChanged() override;
     void updateTransformForSkinnedMesh(const Transform& transform, const Transform& offsetTransform, const glm::mat4* clusterMatrices, size_t numClusterMatrices);
 
     // Render Item interface
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index b463a80403..38b7aa2e89 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -102,7 +102,6 @@ void Model::setRotation(const glm::quat& rotation) {
 
 void Model::setScale(const glm::vec3& scale) {
     setScaleInternal(scale);
-
     // if anyone sets scale manually, then we are no longer scaled to fit
     _scaleToFit = false;
     _scaledToFit = false;