mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
Merge pull request #16275 from dooglifeSF/sit_variants_and_fidgets
Sit variants and fidgets
This commit is contained in:
Shannon Romano
GitHub
commit
3db915c432
12 changed files with 405 additions and 75 deletions
Binary file not shown.
BIN
interface/resources/avatar/animations/sitting_idle04.fbx
Normal file
BIN
interface/resources/avatar/animations/sitting_idle04.fbx
Normal file
Binary file not shown.
BIN
interface/resources/avatar/animations/sitting_idle05.fbx
Normal file
BIN
interface/resources/avatar/animations/sitting_idle05.fbx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -640,8 +640,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedTalk02",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 30,
|
||||
"interpTarget": 30,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
|
|
@ -651,8 +651,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedTalk03",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 30,
|
||||
"interpTarget": 30,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
|
|
@ -662,8 +662,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedTalk04",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 30,
|
||||
"interpTarget": 30,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
|
|
@ -680,84 +680,414 @@
|
|||
"children": [
|
||||
{
|
||||
"children": [
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 800,
|
||||
"loopFlag": true,
|
||||
"startFrame": 0,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle.fbx"
|
||||
},
|
||||
"id": "seatedIdle01",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 800,
|
||||
"loopFlag": true,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle02.fbx"
|
||||
},
|
||||
"id": "seatedIdle02",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 800,
|
||||
"loopFlag": true,
|
||||
"startFrame": 0,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle03.fbx"
|
||||
},
|
||||
"id": "seatedIdle03",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 800,
|
||||
"loopFlag": true,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle04.fbx"
|
||||
},
|
||||
"id": "seatedIdle04",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 332,
|
||||
"loopFlag": true,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle05.fbx"
|
||||
},
|
||||
"id": "seatedIdle05",
|
||||
"type": "clip"
|
||||
}
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 800,
|
||||
"loopFlag": true,
|
||||
"startFrame": 0,
|
||||
"currentState": "seatedIdle01",
|
||||
"endFrame": 30,
|
||||
"randomSwitchTimeMax": 40,
|
||||
"randomSwitchTimeMin": 10,
|
||||
"startFrame": 10,
|
||||
"states": [
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedIdle01",
|
||||
"interpDuration": 30,
|
||||
"interpTarget": 30,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedIdle02",
|
||||
"interpDuration": 30,
|
||||
"interpTarget": 30,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedIdle03",
|
||||
"interpDuration": 30,
|
||||
"interpTarget": 30,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedIdle04",
|
||||
"interpDuration": 30,
|
||||
"interpTarget": 30,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedIdle05",
|
||||
"interpDuration": 30,
|
||||
"interpTarget": 30,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
"transitions": [
|
||||
]
|
||||
}
|
||||
],
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle.fbx"
|
||||
"triggerRandomSwitch": "seatedIdleSwitch",
|
||||
"triggerTimeMax": 10
|
||||
},
|
||||
"id": "seatedIdle01",
|
||||
"type": "clip"
|
||||
"id": "masterSeatedIdle",
|
||||
"type": "randomSwitchStateMachine"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 744,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle_once_shifting.fbx"
|
||||
},
|
||||
"id": "seatedFidgetShifting",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 420,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle_once_lookfidget.fbx"
|
||||
},
|
||||
"id": "seatedFidgetLookFidget",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 282,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle_once_shiftweight.fbx"
|
||||
},
|
||||
"id": "seatedFidgetShiftWeight",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 428,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle_once_fidget.fbx"
|
||||
},
|
||||
"id": "seatedFidgeting",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 324,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle_once_lookaround.fbx"
|
||||
},
|
||||
"id": "seatedFidgetLookAround",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 120,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle_once_lookleftright.fbx"
|
||||
},
|
||||
"id": "seatedFidgetLookLeftRight",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 178,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle_once_leanforward.fbx"
|
||||
},
|
||||
"id": "seatedFidgetLeanForward",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 140,
|
||||
"loopFlag": false,
|
||||
"startFrame": 1,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle_once_shakelegs.fbx"
|
||||
},
|
||||
"id": "seatedFidgetShakeLegs",
|
||||
"type": "clip"
|
||||
}
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 800,
|
||||
"loopFlag": true,
|
||||
"startFrame": 0,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle02.fbx"
|
||||
"currentState": "seatedFidgetShifting",
|
||||
"states": [
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedFidgetShifting",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedFidgetLookFidget",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedFidgetShiftWeight",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedFidgeting",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedFidgetLookAround",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedFidgetLookLeftRight",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedFidgetLeanForward",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedFidgetShakeLegs",
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"id": "seatedIdle02",
|
||||
"type": "clip"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
],
|
||||
"data": {
|
||||
"endFrame": 800,
|
||||
"loopFlag": true,
|
||||
"startFrame": 0,
|
||||
"timeScale": 1,
|
||||
"url": "qrc:///avatar/animations/sitting_idle03.fbx"
|
||||
},
|
||||
"id": "seatedIdle03",
|
||||
"type": "clip"
|
||||
"id": "seatedFidget",
|
||||
"type": "randomSwitchStateMachine"
|
||||
}
|
||||
],
|
||||
"data": {
|
||||
"currentState": "seatedIdle01",
|
||||
"currentState": "masterSeatedIdle",
|
||||
"randomSwitchTimeMax": 20,
|
||||
"randomSwitchTimeMin": 10,
|
||||
"states": [
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedIdle01",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"id": "masterSeatedIdle",
|
||||
"interpDuration": 20,
|
||||
"interpTarget": 20,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
{
|
||||
"randomSwitchState": "seatedFidget",
|
||||
"var": "timeToSeatedFidget"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedIdle02",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"id": "seatedFidget",
|
||||
"interpDuration": 30,
|
||||
"interpTarget": 30,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
"transitions": [
|
||||
]
|
||||
},
|
||||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "seatedIdle03",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 1,
|
||||
"resume": true,
|
||||
"priority": -1,
|
||||
"resume": false,
|
||||
"transitions": [
|
||||
{
|
||||
"randomSwitchState": "masterSeatedIdle",
|
||||
"var": "seatedFidgetShiftingOnDone"
|
||||
},
|
||||
{
|
||||
"randomSwitchState": "masterSeatedIdle",
|
||||
"var": "seatedFidgetLookFidgetOnDone"
|
||||
},
|
||||
{
|
||||
"randomSwitchState": "masterSeatedIdle",
|
||||
"var": "seatedFidgetShiftWeightOnDone"
|
||||
},
|
||||
{
|
||||
"randomSwitchState": "masterSeatedIdle",
|
||||
"var": "seatedFidgetingOnDone"
|
||||
},
|
||||
{
|
||||
"randomSwitchState": "masterSeatedIdle",
|
||||
"var": "seatedFidgetLookAroundOnDone"
|
||||
},
|
||||
{
|
||||
"randomSwitchState": "masterSeatedIdle",
|
||||
"var": "seatedFidgetLookLeftRightOnDone"
|
||||
},
|
||||
{
|
||||
"randomSwitchState": "masterSeatedIdle",
|
||||
"var": "seatedFidgetLeanForwardOnDone"
|
||||
},
|
||||
{
|
||||
"randomSwitchState": "masterSeatedIdle",
|
||||
"var": "seatedFidgetShakeLegsOnDone"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"triggerRandomSwitch": "seatedIdleSwitch"
|
||||
"transitionVar": "timeToSeatedFidget",
|
||||
"triggerRandomSwitch": "",
|
||||
"triggerTimeMax": 45,
|
||||
"triggerTimeMin": 10
|
||||
},
|
||||
"id": "seatedIdle",
|
||||
"type": "randomSwitchStateMachine"
|
||||
|
|
@ -1544,9 +1874,9 @@
|
|||
"type": "randomSwitchStateMachine"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
"children": [
|
||||
{
|
||||
"children": [
|
||||
"children": [
|
||||
{
|
||||
"children": [
|
||||
{
|
||||
|
|
@ -1653,7 +1983,7 @@
|
|||
"blendType": "addAbsolute"
|
||||
},
|
||||
"id": "seatedReactionPointBase",
|
||||
"type": "blendLinear"
|
||||
"type": "blendLinear"
|
||||
},
|
||||
{
|
||||
"children": [
|
||||
|
|
@ -2148,8 +2478,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "talk",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 0.33,
|
||||
"resume": true,
|
||||
|
|
@ -2159,8 +2489,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "talk02",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 0.33,
|
||||
"resume": true,
|
||||
|
|
@ -2170,8 +2500,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "talk03",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 0.33,
|
||||
"resume": true,
|
||||
|
|
@ -2181,8 +2511,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "talk04",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 0.33,
|
||||
"resume": true,
|
||||
|
|
@ -2192,8 +2522,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "talk_armsdown",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 0.33,
|
||||
"resume": true,
|
||||
|
|
@ -2203,8 +2533,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "talk_lefthand",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 0.33,
|
||||
"resume": true,
|
||||
|
|
@ -2214,8 +2544,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "talk_righthand",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 1,
|
||||
"interpTarget": 1,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": 0.33,
|
||||
"resume": true,
|
||||
|
|
@ -2773,8 +3103,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "fidget",
|
||||
"interpDuration": 15,
|
||||
"interpTarget": 15,
|
||||
"interpDuration": 20,
|
||||
"interpTarget": 20,
|
||||
"interpType": "evaluateBoth",
|
||||
"priority": -1,
|
||||
"resume": false,
|
||||
|
|
@ -3997,8 +4327,8 @@
|
|||
{
|
||||
"easingType": "easeInOutQuad",
|
||||
"id": "idleTalkOverlay",
|
||||
"interpDuration": 20,
|
||||
"interpTarget": 20,
|
||||
"interpDuration": 25,
|
||||
"interpTarget": 25,
|
||||
"interpType": "evaluateBoth",
|
||||
"transitions": [
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue