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

make neck IK target type same as head

Browse source
This commit is contained in:
Andrew Meadows 2015-09-29 17:39:17 -07:00
parent a052f5e125
commit b192d0a9cd
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/meshes/defaultAvatar_full/avatar-animation.json
View file

@ -26,13 +26,14 @@
{ {
"jointName": "Neck", "jointName": "Neck",
"positionVar": "neckPosition", "positionVar": "neckPosition",
"rotationVar": "neckRotation" "rotationVar": "neckRotation",
"typeVar": "headAndNeckType"
}, },
{ {
"jointName": "Head", "jointName": "Head",
"positionVar": "headPosition", "positionVar": "headPosition",
"rotationVar": "headRotation", "rotationVar": "headRotation",
"typeVar": "headType" "typeVar": "headAndNeckType"
} }
] ]
}, },

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

@ -1079,7 +1079,7 @@ void Rig::updateNeckJoint(int index, const HeadParameters& params) {
_animVars.set("headPosition", headPos); _animVars.set("headPosition", headPos);
_animVars.set("headRotation", headRot); _animVars.set("headRotation", headRot);
_animVars.set("headType", QString("RotationAndPosition")); _animVars.set("headAndNeckType", QString("RotationAndPosition"));
_animVars.set("neckPosition", neckPos); _animVars.set("neckPosition", neckPos);
_animVars.set("neckRotation", neckRot); _animVars.set("neckRotation", neckRot);
@ -1092,7 +1092,7 @@ void Rig::updateNeckJoint(int index, const HeadParameters& params) {
_animVars.unset("headPosition"); _animVars.unset("headPosition");
_animVars.set("headRotation", realLocalHeadOrientation); _animVars.set("headRotation", realLocalHeadOrientation);
_animVars.set("headType", QString("RotationOnly")); _animVars.set("headAndNeckType", QString("RotationOnly"));
_animVars.unset("neckPosition"); _animVars.unset("neckPosition");
_animVars.unset("neckRotation"); _animVars.unset("neckRotation");
} }