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

in Rig joint accessors, if on the Rig's thread use internalPoseSet, else use external

Browse source
This commit is contained in:
Seth Alves 2017-07-06 13:22:14 -07:00
parent e9bdbd7715
commit 24c8267030
1 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libraries/animation/src/Rig.cpp
View file

@ -404,31 +404,41 @@ void Rig::setJointRotation(int index, bool valid, const glm::quat& rotation, flo
} }
bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm::vec3 translation, glm::quat rotation) const { bool Rig::getJointPositionInWorldFrame(int jointIndex, glm::vec3& position, glm::vec3 translation, glm::quat rotation) const {
// if (isIndexValid(jointIndex)) { if (QThread::currentThread() == thread()) {
if (isIndexValid(jointIndex)) {
position = (rotation * _internalPoseSet._absolutePoses[jointIndex].trans()) + translation;
return true;
}
return false;
}
QReadLocker readLock(&_externalPoseSetLock); QReadLocker readLock(&_externalPoseSetLock);
if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) { if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) {
position = (rotation * _externalPoseSet._absolutePoses[jointIndex].trans()) + translation; position = (rotation * _externalPoseSet._absolutePoses[jointIndex].trans()) + translation;
return true; return true;
} else {
return false;
} }
return false;
} }
bool Rig::getJointPosition(int jointIndex, glm::vec3& position) const { bool Rig::getJointPosition(int jointIndex, glm::vec3& position) const {
/* if (QThread::currentThread() == thread()) {
if (isIndexValid(jointIndex)) { if (isIndexValid(jointIndex)) {
position = _internalPoseSet._absolutePoses[jointIndex].trans(); position = _internalPoseSet._absolutePoses[jointIndex].trans();
return true; return true;
} else { }
return false; return false;
}*/ }
return getAbsoluteJointTranslationInRigFrame(jointIndex, position); return getAbsoluteJointTranslationInRigFrame(jointIndex, position);
} }
bool Rig::getJointRotationInWorldFrame(int jointIndex, glm::quat& result, const glm::quat& rotation) const { bool Rig::getJointRotationInWorldFrame(int jointIndex, glm::quat& result, const glm::quat& rotation) const {
// if (isIndexValid(jointIndex)) { if (QThread::currentThread() == thread()) {
// result = rotation * _internalPoseSet._absolutePoses[jointIndex].rot(); if (isIndexValid(jointIndex)) {
// return true; result = rotation * _internalPoseSet._absolutePoses[jointIndex].rot();
return true;
}
return false;
}
QReadLocker readLock(&_externalPoseSetLock); QReadLocker readLock(&_externalPoseSetLock);
if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) { if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._absolutePoses.size()) {
@ -440,6 +450,14 @@ bool Rig::getJointRotationInWorldFrame(int jointIndex, glm::quat& result, const
} }
bool Rig::getJointRotation(int jointIndex, glm::quat& rotation) const { bool Rig::getJointRotation(int jointIndex, glm::quat& rotation) const {
if (QThread::currentThread() == thread()) {
if (isIndexValid(jointIndex)) {
rotation = _internalPoseSet._relativePoses[jointIndex].rot();
return true;
}
return false;
}
QReadLocker readLock(&_externalPoseSetLock); QReadLocker readLock(&_externalPoseSetLock);
if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._relativePoses.size()) { if (jointIndex >= 0 && jointIndex < (int)_externalPoseSet._relativePoses.size()) {
rotation = _externalPoseSet._relativePoses[jointIndex].rot(); rotation = _externalPoseSet._relativePoses[jointIndex].rot();