Eliminate wacky scales in favor of newfangled "meters."

Andrzej Kapolka committed 12 years ago

Commit 14eb87a1 parent 1d14f945 files · +6 −10Browse files

Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 5 files). Show all

Unified · Split

     _ragdoll = NULL;
 }
-const float MODEL_SCALE = 0.0006f;
 void SkeletonModel::setJointStates(QVector<JointState> states) {
     Model::setJointStates(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
     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);

Keyboard shortcuts