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

Merge pull request #5818 from hyperlogic/tony/left-hand-point-and-grab

Browse source 
Updated left hand point and grab State Machine and animations
This commit is contained in:
Howard Stearns 2015-09-15 19:35:41 -07:00
commit 9fa20207ab
2 changed files with 98 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1302,7 +1302,7 @@ void MyAvatar::initAnimGraph() {
// 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/883c7ce8e75ad3f72a0d513c317fe4b74a41c3b8/ik-avatar-hands.json"); auto graphUrl = QUrl("https://gist.githubusercontent.com/hyperlogic/04a02c47eb56d8bfaebb/raw/5f2a4e268d35147c83d44881e268f83a6296e89b/ik-avatar-hands.json");
_rig->initAnimGraph(graphUrl, _skeletonModel.getGeometry()->getFBXGeometry()); _rig->initAnimGraph(graphUrl, _skeletonModel.getGeometry()->getFBXGeometry());
} }

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

@ -120,7 +120,7 @@
"id": "rightHandIdle", "id": "rightHandIdle",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/right_hand_point.fbx", "url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_right_hand.fbx",
"startFrame": 0.0, "startFrame": 0.0,
"endFrame": 0.0, "endFrame": 0.0,
"timeScale": 1.0, "timeScale": 1.0,
@ -132,7 +132,7 @@
"id": "rightHandPointHold", "id": "rightHandPointHold",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/right_hand_point.fbx", "url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_right_hand.fbx",
"startFrame": 12.0, "startFrame": 12.0,
"endFrame": 12.0, "endFrame": 12.0,
"timeScale": 1.0, "timeScale": 1.0,
@ -144,7 +144,7 @@
"id": "rightHandPointIntro", "id": "rightHandPointIntro",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/right_hand_point.fbx", "url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_right_hand.fbx",
"startFrame": 0.0, "startFrame": 0.0,
"endFrame": 12.0, "endFrame": 12.0,
"timeScale": 1.0, "timeScale": 1.0,
@ -156,7 +156,7 @@
"id": "rightHandPointOutro", "id": "rightHandPointOutro",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/right_hand_point.fbx", "url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_right_hand.fbx",
"startFrame": 0.0, "startFrame": 0.0,
"endFrame": 65.0, "endFrame": 65.0,
"timeScale": 1.0, "timeScale": 1.0,
@ -176,7 +176,7 @@
"id": "rightHandOpen", "id": "rightHandOpen",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/right_hand_point.fbx", "url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_right_hand.fbx",
"startFrame": 0.0, "startFrame": 0.0,
"endFrame": 0.0, "endFrame": 0.0,
"timeScale": 1.0, "timeScale": 1.0,
@ -217,29 +217,49 @@
"states": [ "states": [
{ {
"id": "leftHandIdle", "id": "leftHandIdle",
"interpTarget": 6, "interpTarget": 3,
"interpDuration": 6, "interpDuration": 3,
"transitions": [ "transitions": [
{ "var": "isLeftHandPoint", "state": "leftHandPoint" }, { "var": "isLeftHandPoint", "state": "leftHandPointIntro" },
{ "var": "isLeftHandGrab", "state": "leftHandGrab" } { "var": "isLeftHandGrab", "state": "leftHandGrab" }
] ]
}, },
{ {
"id": "leftHandPoint", "id": "leftHandPointIntro",
"interpTarget": 6, "interpTarget": 3,
"interpDuration": 6, "interpDuration": 3,
"transitions": [ "transitions": [
{ "var": "isLeftHandIdle", "state": "leftHandIdle" }, { "var": "isLeftHandIdle", "state": "leftHandIdle" },
{ "var": "isLeftHandPointIntroOnDone", "state": "leftHandPointHold" },
{ "var": "isLeftHandGrab", "state": "leftHandGrab" } { "var": "isLeftHandGrab", "state": "leftHandGrab" }
] ]
}, },
{
"id": "leftHandPointHold",
"interpTarget": 3,
"interpDuration": 3,
"transitions": [
{ "var": "isLeftHandIdle", "state": "leftHandPointOutro" },
{ "var": "isLeftHandGrab", "state": "leftHandGrab" }
]
},
{
"id": "leftHandPointOutro",
"interpTarget": 3,
"interpDuration": 3,
"transitions": [
{ "var": "isLeftHandPointOutroOnDone", "state": "leftHandIdle" },
{ "var": "isLeftHandGrab", "state": "leftHandGrab" },
{ "var": "isLeftHandPoint", "state": "leftHandPointHold" }
]
},
{ {
"id": "leftHandGrab", "id": "leftHandGrab",
"interpTarget": 6, "interpTarget": 3,
"interpDuration": 6, "interpDuration": 3,
"transitions": [ "transitions": [
{ "var": "isLeftHandIdle", "state": "leftHandIdle" }, { "var": "isLeftHandIdle", "state": "leftHandIdle" },
{ "var": "isLeftHandPoint", "state": "leftHandPoint" } { "var": "isLeftHandPoint_DISABLED", "state": "leftHandPointHold" }
] ]
} }
] ]
@ -249,19 +269,7 @@
"id": "leftHandIdle", "id": "leftHandIdle",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/squeeze_hands/left_hand_anim.fbx", "url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_left_hand.fbx",
"startFrame": 30.0,
"endFrame": 30.0,
"timeScale": 1.0,
"loopFlag": true
},
"children": []
},
{
"id": "leftHandPoint",
"type": "clip",
"data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/squeeze_hands/left_hand_anim.fbx",
"startFrame": 0.0, "startFrame": 0.0,
"endFrame": 0.0, "endFrame": 0.0,
"timeScale": 1.0, "timeScale": 1.0,
@ -270,16 +278,74 @@
"children": [] "children": []
}, },
{ {
"id": "leftHandGrab", "id": "leftHandPointHold",
"type": "clip", "type": "clip",
"data": { "data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/squeeze_hands/left_hand_anim.fbx", "url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_left_hand.fbx",
"startFrame": 15.0, "startFrame": 12.0,
"endFrame": 15.0, "endFrame": 12.0,
"timeScale": 1.0, "timeScale": 1.0,
"loopFlag": true "loopFlag": true
}, },
"children": [] "children": []
},
{
"id": "leftHandPointIntro",
"type": "clip",
"data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_left_hand.fbx",
"startFrame": 0.0,
"endFrame": 12.0,
"timeScale": 1.0,
"loopFlag": false
},
"children": []
},
{
"id": "leftHandPointOutro",
"type": "clip",
"data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_left_hand.fbx",
"startFrame": 0.0,
"endFrame": 65.0,
"timeScale": 1.0,
"loopFlag": false
},
"children": []
},
{
"id": "leftHandGrab",
"type": "blendLinear",
"data": {
"alpha": 0.0,
"alphaVar": "leftHandGrabBlend"
},
"children": [
{
"id": "leftHandOpen",
"type": "clip",
"data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_left_hand.fbx",
"startFrame": 0.0,
"endFrame": 0.0,
"timeScale": 1.0,
"loopFlag": true
},
"children": []
},
{
"id": "leftHandClose",
"type": "clip",
"data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/squeeze_hands/left_hand_anim.fbx",
"startFrame": 15.0,
"endFrame": 15.0,
"timeScale": 1.0,
"loopFlag": true
},
"children": []
}
]
} }
] ]
}, },