From 01d3977bf148e39d969c2be1969e07e88552acca Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 19 Feb 2016 10:04:58 -0800 Subject: [PATCH 1/3] make avatars shrink faster --- interface/src/avatar/AvatarManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp index 6da4481840..8e48237b8e 100644 --- a/interface/src/avatar/AvatarManager.cpp +++ b/interface/src/avatar/AvatarManager.cpp @@ -162,7 +162,7 @@ void AvatarManager::updateOtherAvatars(float deltaTime) { void AvatarManager::simulateAvatarFades(float deltaTime) { QVector::iterator fadingIterator = _avatarFades.begin(); - const float SHRINK_RATE = 0.9f; + const float SHRINK_RATE = 0.15f; const float MIN_FADE_SCALE = MIN_AVATAR_SCALE; render::ScenePointer scene = qApp->getMain3DScene(); From ee5a82f9b80af83fd3e454cd43892958d6e21b8f Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 19 Feb 2016 10:05:22 -0800 Subject: [PATCH 2/3] call simulate from setScaleInternal rather than just initJointTransforms so the scale change is visible --- libraries/render-utils/src/Model.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 91c9ec623d..1f6e25f386 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -92,7 +92,7 @@ void Model::setScale(const glm::vec3& scale) { _scaledToFit = false; } -const float METERS_PER_MILLIMETER = 0.01f; +const float METERS_PER_MILLIMETER = 0.01f; void Model::setScaleInternal(const glm::vec3& scale) { if (glm::distance(_scale, scale) > METERS_PER_MILLIMETER) { @@ -100,7 +100,7 @@ void Model::setScaleInternal(const glm::vec3& scale) { if (_scale.x == 0.0f || _scale.y == 0.0f || _scale.z == 0.0f) { assert(false); } - initJointTransforms(); + simulate(0.0f, true); } } From fea60499d44008df457fb44cf30fcc6787ad7f8b Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 19 Feb 2016 11:32:59 -0800 Subject: [PATCH 3/3] rename poorly named variable --- libraries/render-utils/src/Model.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 1f6e25f386..3b741ac734 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -92,10 +92,10 @@ void Model::setScale(const glm::vec3& scale) { _scaledToFit = false; } -const float METERS_PER_MILLIMETER = 0.01f; +const float SCALE_CHANGE_EPSILON = 0.01f; void Model::setScaleInternal(const glm::vec3& scale) { - if (glm::distance(_scale, scale) > METERS_PER_MILLIMETER) { + if (glm::distance(_scale, scale) > SCALE_CHANGE_EPSILON) { _scale = scale; if (_scale.x == 0.0f || _scale.y == 0.0f || _scale.z == 0.0f) { assert(false);