From fa67e1b269fa2c569e478fc68b42b0c8f7377dc6 Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Tue, 23 Oct 2018 11:47:50 -0700
Subject: [PATCH] Remove logs and magic numbers

---
 interface/src/avatar/AvatarManager.cpp | 4 ----
 libraries/animation/src/Rig.cpp        | 5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index e12ea67230..dad4c44f4b 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -127,19 +127,15 @@ void AvatarManager::setSpace(workload::SpacePointer& space ) {
 void AvatarManager::handleTransitAnimations(AvatarTransit::Status status) {
     switch (status) {
         case AvatarTransit::Status::STARTED:
-            qDebug() << "START_FRAME";
             _myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("preTransitAnim");
             break;
         case AvatarTransit::Status::START_TRANSIT:
-            qDebug() << "START_TRANSIT";
             _myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("transitAnim");
             break;
         case AvatarTransit::Status::END_TRANSIT:
-            qDebug() << "END_TRANSIT";
             _myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("postTransitAnim");
             break;
         case AvatarTransit::Status::ENDED:
-            qDebug() << "END_FRAME";
             _myAvatar->getSkeletonModel()->getRig().triggerNetworkAnimation("idleAnim");
             break;
         case AvatarTransit::Status::PRE_TRANSIT:
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index d198550d9a..83d375b55a 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -1124,17 +1124,18 @@ void Rig::updateAnimations(float deltaTime, const glm::mat4& rootTransform, cons
         _internalPoseSet._relativePoses = _animNode->evaluate(_animVars, context, deltaTime, triggersOut);
         if (_networkNode) {
             _networkPoseSet._relativePoses = _networkNode->evaluate(_networkVars, context, deltaTime, networkTriggersOut);
+            const float NETWORK_ANIMATION_BLEND_FRAMES = 6.0f;
             float alpha = 1.0f;
             std::shared_ptr<AnimClip> clip;
             if (_networkAnimState.clipNodeEnum == NetworkAnimState::PreTransit) {
                 clip = std::dynamic_pointer_cast<AnimClip>(_networkNode->findByName("preTransitAnim"));
                 if (clip) {
-                    alpha = (clip->getFrame() - clip->getStartFrame()) / 6.0f;
+                    alpha = (clip->getFrame() - clip->getStartFrame()) / NETWORK_ANIMATION_BLEND_FRAMES;
                 }
             } else if (_networkAnimState.clipNodeEnum == NetworkAnimState::PostTransit) {
                 clip = std::dynamic_pointer_cast<AnimClip>(_networkNode->findByName("postTransitAnim"));
                 if (clip) {
-                    alpha = (clip->getEndFrame() - clip->getFrame()) / 6.0f;
+                    alpha = (clip->getEndFrame() - clip->getFrame()) / NETWORK_ANIMATION_BLEND_FRAMES;
                 }
             }
             if (_sendNetworkNode) {