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

iterate the turns, and make turning accessible from fidgets

Browse source
This commit is contained in:
DouglasWilcox 2019-11-14 16:07:51 -08:00
parent 37010648be
commit fb289704e2
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface/resources/avatar/animations/settle_sitturnright_to_sitidle.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_turn_left.fbx
View file

Binary file not shown.

BIN
interface/resources/avatar/animations/sitting_turn_right.fbx
View file

Binary file not shown.

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

@ -867,7 +867,7 @@
"loopFlag": false, "loopFlag": false,
"startFrame": 1, "startFrame": 1,
"timeScale": 1, "timeScale": 1,
"url": "qrc:///avatar/animations/settle_sitturnright_to_sitidle.fbx" "url": "qrc:///avatar/animations/settle_sitturnleft_to_sitidle.fbx"
}, },
"id": "seatedTurnLeft_to_Idle", "id": "seatedTurnLeft_to_Idle",
"type": "clip" "type": "clip"
@ -930,8 +930,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedTurnRight_to_Idle", "id": "seatedTurnRight_to_Idle",
"interpDuration": 15, "interpDuration": 25,
"interpTarget": 15, "interpTarget": 25,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
@ -947,8 +947,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedTurnLeft_to_Idle", "id": "seatedTurnLeft_to_Idle",
"interpDuration": 15, "interpDuration": 25,
"interpTarget": 15, "interpTarget": 25,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
@ -1230,6 +1230,14 @@
{ {
"randomSwitchState": "masterSeatedIdle", "randomSwitchState": "masterSeatedIdle",
"var": "seatedFidgetShakeLegsOnDone" "var": "seatedFidgetShakeLegsOnDone"
},
{
"randomSwitchState": "masterSeatedIdle",
"var": "isSeatedTurningRight"
},
{
"randomSwitchState": "masterSeatedIdle",
"var": "isSeatedTurningLeft"
} }
] ]
} }