Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix outro start times, and introduce away states (which are not used in C++ code, but are used in script).

Browse source
This commit is contained in:
Howard Stearns 2015-11-02 20:39:31 -08:00
parent 94ae1ef638
commit b74ed36883
1 changed files with 78 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -178,7 +178,7 @@
"type": "clip",
"data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_right_hand.fbx",
"startFrame": 0.0,
"startFrame": 12.0,
"endFrame": 65.0,
"timeScale": 1.0,
"loopFlag": false
@ -327,7 +327,7 @@
"type": "clip",
"data": {
"url": "http://hifi-public.s3.amazonaws.com/ozan/anim/hand_anims/point_left_hand.fbx",
"startFrame": 0.0,
"startFrame": 12.0,
"endFrame": 65.0,
"timeScale": 1.0,
"loopFlag": false
@ -378,15 +378,16 @@
"states": [
{
"id": "idle",
"interpTarget": 6,
"interpDuration": 6,
"interpTarget": 15,
"interpDuration": 15,
"transitions": [
{ "var": "isMovingForward", "state": "walkFwd" },
{ "var": "isMovingBackward", "state": "walkBwd" },
{ "var": "isMovingRight", "state": "strafeRight" },
{ "var": "isMovingLeft", "state": "strafeLeft" },
{ "var": "isTurningRight", "state": "turnRight" },
{ "var": "isTurningLeft", "state": "turnLeft" }
{ "var": "isTurningLeft", "state": "turnLeft" },
{ "var": "isAway", "state": "awayIntro" }
]
},
{
@ -399,7 +400,8 @@
{ "var": "isMovingRight", "state": "strafeRight" },
{ "var": "isMovingLeft", "state": "strafeLeft" },
{ "var": "isTurningRight", "state": "turnRight" },
{ "var": "isTurningLeft", "state": "turnLeft" }
{ "var": "isTurningLeft", "state": "turnLeft" },
{ "var": "isAway", "state": "awayIntro" }
]
},
{
@ -412,7 +414,8 @@
{ "var": "isMovingRight", "state": "strafeRight" },
{ "var": "isMovingLeft", "state": "strafeLeft" },
{ "var": "isTurningRight", "state": "turnRight" },
{ "var": "isTurningLeft", "state": "turnLeft" }
{ "var": "isTurningLeft", "state": "turnLeft" },
{ "var": "isAway", "state": "awayIntro" }
]
},
{
@ -425,7 +428,8 @@
{ "var": "isMovingBackward", "state": "walkBwd" },
{ "var": "isMovingLeft", "state": "strafeLeft" },
{ "var": "isTurningRight", "state": "turnRight" },
{ "var": "isTurningLeft", "state": "turnLeft" }
{ "var": "isTurningLeft", "state": "turnLeft" },
{ "var": "isAway", "state": "awayIntro" }
]
},
{
@ -438,7 +442,8 @@
{ "var": "isMovingBackward", "state": "walkBwd" },
{ "var": "isMovingRight", "state": "strafeRight" },
{ "var": "isTurningRight", "state": "turnRight" },
{ "var": "isTurningLeft", "state": "turnLeft" }
{ "var": "isTurningLeft", "state": "turnLeft" },
{ "var": "isAway", "state": "awayIntro" }
]
},
{
@ -451,7 +456,8 @@
{ "var": "isMovingBackward", "state": "walkBwd" },
{ "var": "isMovingRight", "state": "strafeRight" },
{ "var": "isMovingLeft", "state": "strafeLeft" },
{ "var": "isTurningLeft", "state": "turnLeft" }
{ "var": "isTurningLeft", "state": "turnLeft" },
{ "var": "isAway", "state": "awayIntro" }
]
},
{
@ -464,7 +470,32 @@
{ "var": "isMovingBackward", "state": "walkBwd" },
{ "var": "isMovingRight", "state": "strafeRight" },
{ "var": "isMovingLeft", "state": "strafeLeft" },
{ "var": "isTurningRight", "state": "turnRight" }
{ "var": "isTurningRight", "state": "turnRight" },
{ "var": "isAway", "state": "awayIntro" }
]
},
{
"id": "awayIntro",
"interpTarget": 30,
"interpDuration": 30,
"transitions": [
{ "var": "awayIntroOnDone", "state": "away"}
]
},
{
"id": "away",
"interpTarget": 3,
"interpDuration": 3,
"transitions": [
{ "var": "isNotAway", "state": "awayOutro" }
]
},
{
"id": "awayOutro",
"interpTarget": 3,
"interpDuration": 3,
"transitions": [
{ "var": "awayOutroOnDone", "state": "idle" }
]
}
]
@ -704,6 +735,42 @@
"children": []
}
]
},
{
"id": "awayIntro",
"type": "clip",
"data": {
"url": "https://hifi-public.s3.amazonaws.com/ozan/anim/kneel/kneel.fbx",
"startFrame": 0.0,
"endFrame": 83.0,
"timeScale": 1.0,
"loopFlag": false
},
"children": []
},
{
"id": "away",
"type": "clip",
"data": {
"url": "https://hifi-public.s3.amazonaws.com/ozan/anim/kneel/kneel.fbx",
"startFrame": 83.0,
"endFrame": 84.0,
"timeScale": 1.0,
"loopFlag": true
},
"children": []
},
{
"id": "awayOutro",
"type": "clip",
"data": {
"url": "https://hifi-public.s3.amazonaws.com/ozan/anim/kneel/kneel.fbx",
"startFrame": 84.0,
"endFrame": 167.0,
"timeScale": 1.0,
"loopFlag": false
},
"children": []
}
]
}