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

Remove FST joint members from AvatarData

Browse source
This commit is contained in:
Simon Walton 2018-12-04 10:45:32 -08:00
parent eb097af796
commit f3236e0843
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1776,16 +1776,11 @@ int AvatarData::getFauxJointIndex(const QString& name) const {
int AvatarData::getJointIndex(const QString& name) const { int AvatarData::getJointIndex(const QString& name) const {
int result = getFauxJointIndex(name); int result = getFauxJointIndex(name);
if (result != -1) { return result;
return result;
}
QReadLocker readLock(&_jointDataLock);
return _fstJointIndices.value(name) - 1;
} }
QStringList AvatarData::getJointNames() const { QStringList AvatarData::getJointNames() const {
QReadLocker readLock(&_jointDataLock); return QStringList();
return _fstJointNames;
} }
glm::quat AvatarData::getOrientationOutbound() const { glm::quat AvatarData::getOrientationOutbound() const {

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

@ -1377,9 +1377,6 @@ protected:
QString _sessionDisplayName { }; QString _sessionDisplayName { };
bool _lookAtSnappingEnabled { true }; bool _lookAtSnappingEnabled { true };
QHash<QString, int> _fstJointIndices; ///< 1-based, since zero is returned for missing keys
QStringList _fstJointNames; ///< in order of depth-first traversal
quint64 _errorLogExpiry; ///< time in future when to log an error quint64 _errorLogExpiry; ///< time in future when to log an error
QWeakPointer<Node> _owningAvatarMixer; QWeakPointer<Node> _owningAvatarMixer;
@ -1487,11 +1484,8 @@ protected:
T readLockWithNamedJointIndex(const QString& name, const T& defaultValue, F f) const { T readLockWithNamedJointIndex(const QString& name, const T& defaultValue, F f) const {
int index = getFauxJointIndex(name); int index = getFauxJointIndex(name);
QReadLocker readLock(&_jointDataLock); QReadLocker readLock(&_jointDataLock);
if (index == -1) {
index = _fstJointIndices.value(name) - 1;
}
// The first conditional is superfluous, but illsutrative // The first conditional is superfluous, but illustrative
if (index == -1 || index < _jointData.size()) { if (index == -1 || index < _jointData.size()) {
return defaultValue; return defaultValue;
} }
@ -1508,9 +1502,6 @@ protected:
void writeLockWithNamedJointIndex(const QString& name, F f) { void writeLockWithNamedJointIndex(const QString& name, F f) {
int index = getFauxJointIndex(name); int index = getFauxJointIndex(name);
QWriteLocker writeLock(&_jointDataLock); QWriteLocker writeLock(&_jointDataLock);
if (index == -1) {
index = _fstJointIndices.value(name) - 1;
}
if (index == -1) { if (index == -1) {
return; return;
} }