Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 11:45:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added option to playback from current location

Browse source
This commit is contained in:
Atlante45 2014-08-26 17:23:50 -07:00
parent dda02b5dcf
commit 41461cd322
5 changed files with 43 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/Recorder.js
View file

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

9
libraries/avatars/src/AvatarData.cpp
View file

@ -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));
}
_player->startPlaying();
qDebug() << "AvatarData::startPlaying():" << fromCurrentPosition;
_player->startPlaying(fromCurrentPosition);
}
void AvatarData::play() {

2
libraries/avatars/src/AvatarData.h
View file

@ -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();

46
libraries/avatars/src/Recorder.cpp
View file

@ -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) {
_avatar->setPosition(_recording->getFrame(_currentFrame).getTranslation());
_avatar->setOrientation(_recording->getFrame(_currentFrame).getRotation());
_avatar->setTargetScale(_recording->getFrame(_currentFrame).getScale());
_avatar->setJointRotations(_recording->getFrame(_currentFrame).getJointRotations());
} else {
_avatar->setPosition(_recording->getFrame(0).getTranslation() +
_recording->getFrame(_currentFrame).getTranslation());
_avatar->setOrientation(_recording->getFrame(0).getRotation() *
_recording->getFrame(_currentFrame).getRotation());
_avatar->setTargetScale(_recording->getFrame(0).getScale() *
_recording->getFrame(_currentFrame).getScale());
_avatar->setJointRotations(_recording->getFrame(_currentFrame).getJointRotations());
glm::vec3 positionOffset;
glm::quat rotationOffset;
float scaleOffset = 1.0f;
if (_currentFrame > 0) {
positionOffset = _startingPosition;
rotationOffset = _startingRotation;
scaleOffset = _startingScale;
}
_avatar->setPosition(positionOffset +
glm::inverse(_recording->getFrame(0).getRotation()) * rotationOffset *
_recording->getFrame(_currentFrame).getTranslation());
_avatar->setOrientation(rotationOffset *
_recording->getFrame(_currentFrame).getRotation());
_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());

6
libraries/avatars/src/Recorder.h
View file

@ -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);