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

unmangle merge

Browse source
This commit is contained in:
Seth Alves 2015-12-16 16:09:52 -08:00
parent 9e5116bf4f
commit 0500c21e00
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,10 +90,13 @@ const QUrl& AvatarData::defaultFullAvatarModelUrl() {
// There are a number of possible strategies for this set of tools through endRender, below. // There are a number of possible strategies for this set of tools through endRender, below.
void AvatarData::nextAttitude(glm::vec3 position, glm::quat orientation) { void AvatarData::nextAttitude(glm::vec3 position, glm::quat orientation) {
avatarLock.lock(); avatarLock.lock();
Transform trans = getTransform(); bool success;
Transform trans = getTransform(success);
if (!success) {
return;
}
trans.setTranslation(position); trans.setTranslation(position);
trans.setRotation(orientation); trans.setRotation(orientation);
bool success;
SpatiallyNestable::setTransform(trans, success); SpatiallyNestable::setTransform(trans, success);
if (!success) { if (!success) {
qDebug() << "Warning -- AvatarData::nextAttitude failed"; qDebug() << "Warning -- AvatarData::nextAttitude failed";