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

re-remove the _nextPosition stuff

Browse source
This commit is contained in:
Seth Alves 2015-11-03 16:52:46 -08:00
parent 60824a1fb0
commit fbaa86426c
3 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/avatar/AvatarUpdate.cpp
View file

@ -62,7 +62,6 @@ bool AvatarUpdate::process() {
manager->updateMyAvatar(deltaSeconds); manager->updateMyAvatar(deltaSeconds);
myAvatar->endUpdate(); myAvatar->endUpdate();
if (!isThreaded()) { if (!isThreaded()) {
return true; return true;
} }

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

@ -128,10 +128,6 @@ void AvatarData::nextAttitude(glm::vec3 position, glm::quat orientation) {
} }
void AvatarData::startCapture() { void AvatarData::startCapture() {
avatarLock.lock(); avatarLock.lock();
assert(_nextAllowed);
_nextAllowed = false;
_nextPosition = getPosition();
_nextOrientation = getOrientation();
} }
void AvatarData::endCapture() { void AvatarData::endCapture() {
avatarLock.unlock(); avatarLock.unlock();
@ -151,19 +147,10 @@ void AvatarData::endRenderRun() {
avatarLock.unlock(); avatarLock.unlock();
} }
void AvatarData::startRender() { void AvatarData::startRender() {
glm::vec3 pos = getPosition();
glm::quat rot = getOrientation();
setPosition(_nextPosition);
setOrientation(_nextOrientation);
updateAttitude(); updateAttitude();
_nextPosition = pos;
_nextOrientation = rot;
} }
void AvatarData::endRender() { void AvatarData::endRender() {
setPosition(_nextPosition);
setOrientation(_nextOrientation);
updateAttitude(); updateAttitude();
_nextAllowed = true;
} }
float AvatarData::getTargetScale() const { float AvatarData::getTargetScale() const {

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

@ -363,10 +363,6 @@ public slots:
protected: protected:
glm::vec3 _handPosition; glm::vec3 _handPosition;
glm::vec3 _nextPosition {};
glm::quat _nextOrientation {};
bool _nextAllowed {true};
// Body scale // Body scale
float _targetScale; float _targetScale;