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

try again on putting result of Avatar::getJointNames in index order

Browse source
This commit is contained in:
Seth Alves 2017-07-12 20:36:37 -07:00
parent 44de1dd2be
commit 85d0b68284
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
View file

@ -1048,17 +1048,38 @@ int Avatar::getJointIndex(const QString& name) const {
}
QStringList Avatar::getJointNames() const {
QVector<QString> result;
QStringList result;
withValidJointIndicesCache([&]() {
// find out how large the vector needs to be
int maxJointIndex = -1;
QHashIterator<QString, int> k(_modelJointIndicesCache);
while (k.hasNext()) {
k.next();
int index = k.value();
if (index > maxJointIndex) {
maxJointIndex = index;
}
}
// iterate through the hash and put joint names
// into the vector at their indices
QVector<QString> resultVector(maxJointIndex+1);
QHashIterator<QString, int> i(_modelJointIndicesCache);
while (i.hasNext()) {
i.next();
int index = _modelJointIndicesCache[i.key()];
result.resize(index);
result[index] = i.value();
int index = i.value();
resultVector[index] = i.key();
}
// convert to QList and drop out blanks
result = resultVector.toList();
QMutableListIterator<QString> j(result);
while (j.hasNext()) {
QString jointName = j.next();
if (jointName.isEmpty()) {
j.remove();
}
}
});
return result.toList();
return result;
}
glm::vec3 Avatar::getJointPosition(int index) const {