Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 18:56:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed debug + ignore frame 0

Browse source
This commit is contained in:
Atlante45 2014-08-26 18:19:26 -07:00
parent 056cd0a4d1
commit 465b076998
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -646,7 +646,6 @@ void AvatarData::startPlaying(bool fromCurrentPosition) {
if (!_player) { if (!_player) {
_player = PlayerPointer(new Player(this)); _player = PlayerPointer(new Player(this));
} }
qDebug() << "AvatarData::startPlaying():" << fromCurrentPosition;
_player->startPlaying(fromCurrentPosition); _player->startPlaying(fromCurrentPosition);
} }

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

@ -294,22 +294,18 @@ void Player::play() {
return; return;
} }
glm::vec3 positionOffset; if (_currentFrame == 0) {
glm::quat rotationOffset; // Don't play frame 0
float scaleOffset = 1.0f; // only meant to store absolute values
return;
if (_currentFrame > 0) {
positionOffset = _startingPosition;
rotationOffset = _startingRotation;
scaleOffset = _startingScale;
} }
_avatar->setPosition(positionOffset + _avatar->setPosition(_startingPosition +
glm::inverse(_recording->getFrame(0).getRotation()) * rotationOffset * glm::inverse(_recording->getFrame(0).getRotation()) * _startingRotation *
_recording->getFrame(_currentFrame).getTranslation()); _recording->getFrame(_currentFrame).getTranslation());
_avatar->setOrientation(rotationOffset * _avatar->setOrientation(_startingRotation *
_recording->getFrame(_currentFrame).getRotation()); _recording->getFrame(_currentFrame).getRotation());
_avatar->setTargetScale(scaleOffset * _avatar->setTargetScale(_startingScale *
_recording->getFrame(_currentFrame).getScale()); _recording->getFrame(_currentFrame).getScale());
_avatar->setJointRotations(_recording->getFrame(_currentFrame).getJointRotations()); _avatar->setJointRotations(_recording->getFrame(_currentFrame).getJointRotations());