From 14eb87aefd094c95fcde6c1fdf0d2e83f8df4b08 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Fri, 14 Nov 2014 12:23:47 -0800
Subject: [PATCH] Eliminate wacky scales in favor of newfangled "meters."

---
 interface/src/MetavoxelSystem.cpp      | 3 +--
 interface/src/ModelUploader.cpp        | 2 +-
 interface/src/avatar/FaceModel.cpp     | 3 +--
 interface/src/avatar/SkeletonModel.cpp | 6 ++----
 libraries/fbx/src/FBXReader.cpp        | 2 +-
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/interface/src/MetavoxelSystem.cpp b/interface/src/MetavoxelSystem.cpp
index 4c0acc553a..5d8f77eedc 100644
--- a/interface/src/MetavoxelSystem.cpp
+++ b/interface/src/MetavoxelSystem.cpp
@@ -3164,8 +3164,7 @@ void StaticModelRenderer::applyRotation(const glm::quat& rotation) {
 }
 
 void StaticModelRenderer::applyScale(float scale) {
-    const float SCALE_MULTIPLIER = 0.0006f;
-    _model->setScale(glm::vec3(scale, scale, scale) * SCALE_MULTIPLIER);
+    _model->setScale(glm::vec3(scale, scale, scale));
 }
 
 void StaticModelRenderer::applyURL(const QUrl& url) {
diff --git a/interface/src/ModelUploader.cpp b/interface/src/ModelUploader.cpp
index b117197f48..2599f39e83 100644
--- a/interface/src/ModelUploader.cpp
+++ b/interface/src/ModelUploader.cpp
@@ -157,7 +157,7 @@ bool ModelUploader::zip() {
     
     // mixamo/autodesk defaults
     if (!mapping.contains(SCALE_FIELD)) {
-        mapping.insert(SCALE_FIELD, 15.0);
+        mapping.insert(SCALE_FIELD, 1.0);
     }
     QVariantHash joints = mapping.value(JOINT_FIELD).toHash();
     if (!joints.contains("jointEyeLeft")) {
diff --git a/interface/src/avatar/FaceModel.cpp b/interface/src/avatar/FaceModel.cpp
index 70f59f0661..5a30e8634d 100644
--- a/interface/src/avatar/FaceModel.cpp
+++ b/interface/src/avatar/FaceModel.cpp
@@ -34,8 +34,7 @@ void FaceModel::simulate(float deltaTime, bool fullUpdate) {
         neckParentRotation = owningAvatar->getOrientation();
     }
     setRotation(neckParentRotation);
-    const float MODEL_SCALE = 0.0006f;
-    setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningHead->getScale() * MODEL_SCALE);
+    setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningHead->getScale());
     
     setPupilDilation(_owningHead->getPupilDilation());
     setBlendshapeCoefficients(_owningHead->getBlendshapeCoefficients());
diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp
index e760813fe5..7ca105f483 100644
--- a/interface/src/avatar/SkeletonModel.cpp
+++ b/interface/src/avatar/SkeletonModel.cpp
@@ -36,8 +36,6 @@ SkeletonModel::~SkeletonModel() {
     _ragdoll = NULL;
 }
 
-const float MODEL_SCALE = 0.0006f;
-
 void SkeletonModel::setJointStates(QVector<JointState> states) {
     Model::setJointStates(states);
 
@@ -57,7 +55,7 @@ void SkeletonModel::setJointStates(QVector<JointState> states) {
         _defaultEyeModelPosition.z = -_defaultEyeModelPosition.z;
 
         // Skeleton may have already been scaled so unscale it
-        _defaultEyeModelPosition = MODEL_SCALE * _defaultEyeModelPosition / _scale;
+        _defaultEyeModelPosition = _defaultEyeModelPosition / _scale;
     }
 
     // the SkeletonModel override of updateJointState() will clear the translation part
@@ -80,7 +78,7 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {
     setTranslation(_owningAvatar->getSkeletonPosition());
     static const glm::quat refOrientation = glm::angleAxis(PI, glm::vec3(0.0f, 1.0f, 0.0f));
     setRotation(_owningAvatar->getOrientation() * refOrientation);
-    setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale() * MODEL_SCALE);
+    setScale(glm::vec3(1.0f, 1.0f, 1.0f) * _owningAvatar->getScale());
     setBlendshapeCoefficients(_owningAvatar->getHead()->getBlendshapeCoefficients());
     
     Model::simulate(deltaTime, fullUpdate);
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 7ba5e7bc24..4ffd3f6286 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -1456,7 +1456,7 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
     }
 
     // get offset transform from mapping
-    float offsetScale = mapping.value("scale", 1.0f).toFloat() * unitScaleFactor;
+    float offsetScale = mapping.value("scale", 1.0f).toFloat() * unitScaleFactor * METERS_PER_CENTIMETER;
     glm::quat offsetRotation = glm::quat(glm::radians(glm::vec3(mapping.value("rx").toFloat(),
             mapping.value("ry").toFloat(), mapping.value("rz").toFloat())));
     geometry.offset = glm::translate(glm::vec3(mapping.value("tx").toFloat(), mapping.value("ty").toFloat(),