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

Updated avatar.json with talking idle animation.

Browse source
This commit is contained in:
Anthony J. Thibault 2015-09-18 18:31:53 -07:00
parent 44eb448cbe
commit eadf212418
3 changed files with 51 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/avatar/MyAvatar.cpp
View file

@ -1299,10 +1299,13 @@ void MyAvatar::initAnimGraph() {
// ik-avatar-hands.json // ik-avatar-hands.json
// https://gist.githubusercontent.com/hyperlogic/04a02c47eb56d8bfaebb // https://gist.githubusercontent.com/hyperlogic/04a02c47eb56d8bfaebb
// //
// ik-avatar-hands-idle.json
// https://gist.githubusercontent.com/hyperlogic/d951c78532e7a20557ad
//
// or run a local web-server // or run a local web-server
// python -m SimpleHTTPServer& // python -m SimpleHTTPServer&
//auto graphUrl = QUrl("http://localhost:8000/avatar.json"); //auto graphUrl = QUrl("http://localhost:8000/avatar.json");
auto graphUrl = QUrl("https://gist.githubusercontent.com/hyperlogic/04a02c47eb56d8bfaebb/raw/72517b231f606b724c5169e02642e401f9af5a54/ik-avatar-hands.json"); auto graphUrl = QUrl("https://gist.githubusercontent.com/hyperlogic/d951c78532e7a20557ad/raw/8275a99a859bbb9b42530c1c7ebfd024e63ba250/ik-avatar-hands-idle.json");
_rig->initAnimGraph(graphUrl, _skeletonModel.getGeometry()->getFBXGeometry()); _rig->initAnimGraph(graphUrl, _skeletonModel.getGeometry()->getFBXGeometry());
} }

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

@ -955,6 +955,7 @@ void Rig::updateFromHeadParameters(const HeadParameters& params, float dt) {
if (_enableAnimGraph) { if (_enableAnimGraph) {
_animVars.set("isTalking", params.isTalking); _animVars.set("isTalking", params.isTalking);
_animVars.set("notIsTalking", !params.isTalking);
} }
} }

53
tests/animation/src/data/avatar.json
View file

@ -451,15 +451,54 @@
"children": [ "children": [
{ {
"id": "idle", "id": "idle",
"type": "clip", "type": "stateMachine",
"data": { "data": {
"url": "https://hifi-public.s3.amazonaws.com/ozan/anim/standard_anims/idle.fbx", "currentState": "idleStand",
"startFrame": 0.0, "states": [
"endFrame": 90.0, {
"timeScale": 1.0, "id": "idleStand",
"loopFlag": true "interpTarget": 6,
"interpDuration": 6,
"transitions": [
{ "var": "isTalking", "state": "idleTalk" }
]
},
{
"id": "idleTalk",
"interpTarget": 6,
"interpDuration": 6,
"transitions": [
{ "var": "notIsTalking", "state": "idleStand" }
]
}
]
}, },
"children": [] "children": [
{
"id": "idleStand",
"type": "clip",
"data": {
"url": "https://hifi-public.s3.amazonaws.com/ozan/anim/standard_anims/idle.fbx",
"startFrame": 0.0,
"endFrame": 90.0,
"timeScale": 1.0,
"loopFlag": true
},
"children": []
},
{
"id": "idleTalk",
"type": "clip",
"data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/talk/talk.fbx",
"startFrame": 0.0,
"endFrame": 801.0,
"timeScale": 1.0,
"loopFlag": true
},
"children": []
}
]
}, },
{ {
"id": "walkFwd", "id": "walkFwd",