Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 16:10:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hooked up first-pass reaction animations.

Browse source
This commit is contained in:
Anthony J. Thibault 2019-07-23 09:47:37 -07:00
parent ecae92724e
commit 687588cde7
6 changed files with 641 additions and 493 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/avatar/animations/emote_agree_acknowledge.fbx Normal file
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/emote_clap01_all.fbx Normal file
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/emote_disagree_defeated.fbx Normal file
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/emote_point01_all.fbx Normal file
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/emote_raisehand01_all.fbx Normal file
View file

Binary file not shown.

150
interface/resources/avatar/avatar-animation.json
View file

@ -903,6 +903,93 @@
"children": [
{
"id": "idle",
"type": "stateMachine",
"data": {
"currentState": "idleOverlay",
"states": [
{
"id": "idleOverlay",
"interpTarget": 6,
"interpDuration": 6,
"interpType": "snapshotPrev",
"transitions": [
{ "var": "reactionPositiveTrigger", "state": "reactionPositive" },
{ "var": "reactionNegativeTrigger", "state": "reactionNegative" },
{ "var": "reactionRaiseHandEnabled", "state": "reactionRaiseHand" },
{ "var": "reactionApplaudEnabled", "state": "reactionApplaud" },
{ "var": "reactionPointEnabled", "state": "reactionPoint" }
]
},
{
"id": "reactionPositive",
"interpTarget": 6,
"interpDuration": 6,
"interpType": "snapshotPrev",
"transitions": [
{ "var": "reactionPositiveOnDone", "state": "idleOverlay" },
{ "var": "reactionNegativeTrigger", "state": "reactionNegative" },
{ "var": "reactionRaiseHandEnabled", "state": "reactionRaiseHand" },
{ "var": "reactionApplaudEnabled", "state": "reactionApplaud" },
{ "var": "reactionPointEnabled", "state": "reactionPoint" }
]
},
{
"id": "reactionNegative",
"interpTarget": 6,
"interpDuration": 6,
"interpType": "snapshotPrev",
"transitions": [
{ "var": "reactionPositiveTrigger", "state": "reactionPositive" },
{ "var": "reactionNegativeOnDone", "state": "idleOverlay" },
{ "var": "reactionRaiseHandEnabled", "state": "reactionRaiseHand" },
{ "var": "reactionApplaudEnabled", "state": "reactionApplaud" },
{ "var": "reactionPointEnabled", "state": "reactionPoint" }
]
},
{
"id": "reactionRaiseHand",
"interpTarget": 6,
"interpDuration": 6,
"interpType": "snapshotPrev",
"transitions": [
{ "var": "reactionNegativeTrigger", "state": "reactionNegative" },
{ "var": "reactionPositiveTrigger", "state": "reactionPositive" },
{ "var": "reactionRaiseHandDisabled", "state": "idleOverlay" },
{ "var": "reactionApplaudEnabled", "state": "reactionApplaud" },
{ "var": "reactionPointEnabled", "state": "reactionPoint" }
]
},
{
"id": "reactionApplaud",
"interpTarget": 6,
"interpDuration": 6,
"interpType": "snapshotPrev",
"transitions": [
{ "var": "reactionNegativeTrigger", "state": "reactionNegative" },
{ "var": "reactionPositiveTrigger", "state": "reactionPositive" },
{ "var": "reactionRaiseHandEnabled", "state": "reactionRaiseHand" },
{ "var": "reactionApplaudDisabled", "state": "idleOverlay" },
{ "var": "reactionPointEnabled", "state": "reactionPoint" }
]
},
{
"id": "reactionPoint",
"interpTarget": 6,
"interpDuration": 6,
"interpType": "snapshotPrev",
"transitions": [
{ "var": "reactionNegativeTrigger", "state": "reactionNegative" },
{ "var": "reactionPositiveTrigger", "state": "reactionPositive" },
{ "var": "reactionRaiseHandEnabled", "state": "reactionRaiseHand" },
{ "var": "reactionApplaudEnabled", "state": "reactionApplaud" },
{ "var": "reactionPointDisabled", "state": "idleOverlay" }
]
}
]
},
"children": [
{
"id": "idleOverlay",
"type": "overlay",
"data": {
"alpha": 1.0,
@ -1549,7 +1636,6 @@
}
]
}
]
}
@ -1557,6 +1643,68 @@
}
]
},
{
"id": "reactionPositive",
"type": "clip",
"data": {
"url": "qrc:///avatar/animations/emote_agree_acknowledge.fbx",
"startFrame": 0.0,
"endFrame": 45.0,
"timeScale": 1.0,
"loopFlag": false
},
"children": []
},
{
"id": "reactionNegative",
"type": "clip",
"data": {
"url": "qrc:///avatar/animations/emote_disagree_defeated.fbx",
"startFrame": 0.0,
"endFrame": 110.0,
"timeScale": 1.0,
"loopFlag": false
},
"children": []
},
{
"id": "reactionRaiseHand",
"type": "clip",
"data": {
"url": "qrc:///avatar/animations/emote_raisehand01_all.fbx",
"startFrame": 18.0,
"endFrame": 300.0,
"timeScale": 1.0,
"loopFlag": true
},
"children": []
},
{
"id": "reactionApplaud",
"type": "clip",
"data": {
"url": "qrc:///avatar/animations/emote_clap01_all.fbx",
"startFrame": 20.0,
"endFrame": 84.0,
"timeScale": 1.0,
"loopFlag": true
},
"children": []
},
{
"id": "reactionPoint",
"type": "clip",
"data": {
"url": "qrc:///avatar/animations/emote_point01_all.fbx",
"startFrame": 20.0,
"endFrame": 50.0,
"timeScale": 1.0,
"loopFlag": true
},
"children": []
}
]
},
{
"id": "WALKFWD",
"type": "blendLinearMove",