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

Merge pull request #10838 from druiz17/avatar-recording-roomscale

Browse source 
Fix loading of incorrect joint data for the avatar recording
This commit is contained in:
anshuman64 2017-06-29 12:24:37 -07:00 committed by GitHub
commit b22daa9a6f
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1978,7 +1978,7 @@ JointData jointDataFromJsonValue(const QJsonValue& json) {
result.rotation = quatFromJsonValue(array[0]); result.rotation = quatFromJsonValue(array[0]);
result.rotationSet = true; result.rotationSet = true;
result.translation = vec3FromJsonValue(array[1]); result.translation = vec3FromJsonValue(array[1]);
result.translationSet = false; result.translationSet = true;
} }
return result; return result;
} }
@ -2146,12 +2146,9 @@ void AvatarData::fromJson(const QJsonObject& json, bool useFrameSkeleton) {
QVector<JointData> jointArray; QVector<JointData> jointArray;
QJsonArray jointArrayJson = json[JSON_AVATAR_JOINT_ARRAY].toArray(); QJsonArray jointArrayJson = json[JSON_AVATAR_JOINT_ARRAY].toArray();
jointArray.reserve(jointArrayJson.size()); jointArray.reserve(jointArrayJson.size());
int i = 0;
for (const auto& jointJson : jointArrayJson) { for (const auto& jointJson : jointArrayJson) {
auto joint = jointDataFromJsonValue(jointJson); auto joint = jointDataFromJsonValue(jointJson);
jointArray.push_back(joint); jointArray.push_back(joint);
setJointData(i, joint.rotation, joint.translation);
i++;
} }
setRawJointData(jointArray); setRawJointData(jointArray);
} }