From 465b076998961cb22f949c59c3dba4ee60559a99 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 26 Aug 2014 18:19:26 -0700
Subject: [PATCH] Removed debug + ignore frame 0

---
 libraries/avatars/src/AvatarData.cpp |  1 -
 libraries/avatars/src/Recorder.cpp   | 20 ++++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index ea1be03c55..67da20cf70 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -646,7 +646,6 @@ void AvatarData::startPlaying(bool fromCurrentPosition) {
     if (!_player) {
         _player = PlayerPointer(new Player(this));
     }
-    qDebug() << "AvatarData::startPlaying():" << fromCurrentPosition;
     _player->startPlaying(fromCurrentPosition);
 }
 
diff --git a/libraries/avatars/src/Recorder.cpp b/libraries/avatars/src/Recorder.cpp
index 56ea39358e..68fff737c5 100644
--- a/libraries/avatars/src/Recorder.cpp
+++ b/libraries/avatars/src/Recorder.cpp
@@ -294,22 +294,18 @@ void Player::play() {
         return;
     }
     
-    glm::vec3 positionOffset;
-    glm::quat rotationOffset;
-    float scaleOffset = 1.0f;
-    
-    if (_currentFrame > 0) {
-        positionOffset = _startingPosition;
-        rotationOffset = _startingRotation;
-        scaleOffset = _startingScale;
+    if (_currentFrame == 0) {
+        // Don't play frame 0
+        // only meant to store absolute values
+        return;
     }
     
-    _avatar->setPosition(positionOffset +
-                         glm::inverse(_recording->getFrame(0).getRotation()) * rotationOffset *
+    _avatar->setPosition(_startingPosition +
+                         glm::inverse(_recording->getFrame(0).getRotation()) * _startingRotation *
                          _recording->getFrame(_currentFrame).getTranslation());
-    _avatar->setOrientation(rotationOffset *
+    _avatar->setOrientation(_startingRotation *
                             _recording->getFrame(_currentFrame).getRotation());
-    _avatar->setTargetScale(scaleOffset *
+    _avatar->setTargetScale(_startingScale *
                             _recording->getFrame(_currentFrame).getScale());
     _avatar->setJointRotations(_recording->getFrame(_currentFrame).getJointRotations());