Added option to playback from current location

examples/Recorder.js

@@ -153,7 +153,7 @@ function mousePressEvent(event) {
   		if (MyAvatar.isPlaying()) {
   			MyAvatar.stopPlaying();
   		} else {
-		  	MyAvatar.startPlaying();
+		  	MyAvatar.startPlaying(true);
 		  }
   	}
   } else if (saveIcon === toolBar.clicked(clickedOverlay)) {

libraries/avatars/src/AvatarData.cpp

@@ -638,16 +638,17 @@ void AvatarData::loadRecording(QString filename) {
     _player->loadFromFile(filename);
 }
 
-void AvatarData::startPlaying() {
+void AvatarData::startPlaying(bool fromCurrentPosition) {
     if (QThread::currentThread() != thread()) {
-        QMetaObject::invokeMethod(this, "startPlaying", Qt::BlockingQueuedConnection);
+        QMetaObject::invokeMethod(this, "startPlaying", Qt::BlockingQueuedConnection,
+                                  Q_ARG(bool, fromCurrentPosition));
         return;
     }
     if (!_player) {
         _player = PlayerPointer(new Player(this));
     }
-    
+    qDebug() << "AvatarData::startPlaying():" << fromCurrentPosition;
-    _player->startPlaying();
+    _player->startPlaying(fromCurrentPosition);
 }
 
 void AvatarData::play() {

libraries/avatars/src/AvatarData.h

@@ -303,7 +303,7 @@ public slots:
     qint64 playerElapsed();
     qint64 playerLength();
     void loadRecording(QString filename);
-    void startPlaying();
+    void startPlaying(bool fromCurrentPosition = false);
     void play();
     void stopPlaying();
     

libraries/avatars/src/Recorder.cpp

@@ -165,7 +165,8 @@ void Recorder::record(char* samples, int size) {
 Player::Player(AvatarData* avatar) :
     _recording(new Recording()),
     _avatar(avatar),
-    _audioThread(NULL)
+    _audioThread(NULL),
+    _startingScale(1.0f)
 {
     _timer.invalidate();
     _options.setLoop(false);
@@ -215,7 +216,7 @@ float Player::getLeanForward() {
     return _recording->getFrame(_currentFrame).getLeanForward();
 }
 
-void Player::startPlaying() {
+void Player::startPlaying(bool fromCurrentPosition) {
     if (_recording && _recording->getFrameNumber() > 0) {
         qDebug() << "Recorder::startPlaying()";
         _currentFrame = 0;
@@ -232,6 +233,16 @@ void Player::startPlaying() {
         // Fake faceshift connection
         _avatar->setForceFaceshiftConnected(true);
         
+        if (fromCurrentPosition) {
+            _startingPosition = _avatar->getPosition();
+            _startingRotation = _avatar->getOrientation();
+            _startingScale = _avatar->getTargetScale();
+        } else {
+            _startingPosition = _recording->getFrame(0).getTranslation();
+            _startingRotation = _recording->getFrame(0).getRotation();
+            _startingScale = _recording->getFrame(0).getScale();
+        }
+        
         _timer.start();
     }
 }
@@ -283,20 +294,25 @@ void Player::play() {
         return;
     }
     
-    if (_currentFrame == 0) {
+    glm::vec3 positionOffset;
-        _avatar->setPosition(_recording->getFrame(_currentFrame).getTranslation());
+    glm::quat rotationOffset;
-        _avatar->setOrientation(_recording->getFrame(_currentFrame).getRotation());
+    float scaleOffset = 1.0f;
-        _avatar->setTargetScale(_recording->getFrame(_currentFrame).getScale());
+    
-        _avatar->setJointRotations(_recording->getFrame(_currentFrame).getJointRotations());
+    if (_currentFrame > 0) {
-    } else {
+        positionOffset = _startingPosition;
-        _avatar->setPosition(_recording->getFrame(0).getTranslation() +
+        rotationOffset = _startingRotation;
+        scaleOffset = _startingScale;
+    }
+    
+    _avatar->setPosition(positionOffset +
+                         glm::inverse(_recording->getFrame(0).getRotation()) * rotationOffset *
                          _recording->getFrame(_currentFrame).getTranslation());
-        _avatar->setOrientation(_recording->getFrame(0).getRotation() *
+    _avatar->setOrientation(rotationOffset *
                             _recording->getFrame(_currentFrame).getRotation());
-        _avatar->setTargetScale(_recording->getFrame(0).getScale() *
+    _avatar->setTargetScale(scaleOffset *
                             _recording->getFrame(_currentFrame).getScale());
     _avatar->setJointRotations(_recording->getFrame(_currentFrame).getJointRotations());
-    }
+    
     HeadData* head = const_cast<HeadData*>(_avatar->getHeadData());
     if (head) {
         head->setBlendshapeCoefficients(_recording->getFrame(_currentFrame).getBlendshapeCoefficients());

libraries/avatars/src/Recorder.h

@@ -146,7 +146,7 @@ public:
     
     
 public slots:
-    void startPlaying();
+    void startPlaying(bool fromCurrentPosition = false);
     void stopPlaying();
     void loadFromFile(QString file);
     void loadRecording(RecordingPointer recording);
@@ -164,6 +164,10 @@ private:
     
     AvatarData* _avatar;
     QThread* _audioThread;
+    
+    glm::vec3 _startingPosition;
+    glm::quat _startingRotation;
+    float _startingScale;
 };
 
 void writeRecordingToFile(RecordingPointer recording, QString file);