Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:48:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle

Browse source 
Transition between walk/emote should be faster
This commit is contained in:
Shannon Romano 2019-09-24 15:49:31 -07:00 committed by GitHub
commit 73c558bc51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

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

@ -3799,8 +3799,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "reactionPoint", "id": "reactionPoint",
"interpDuration": 18, "interpDuration": 10,
"interpTarget": 18, "interpTarget": 10,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
@ -4610,9 +4610,9 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "idle", "id": "idle",
"interpDuration": 30, "interpDuration": 10,
"interpTarget": 30, "interpTarget": 10,
"interpType": "evaluateBoth", "interpType": "snapshotPrev",
"transitions": [ "transitions": [
{ {
"state": "WALKFWD", "state": "WALKFWD",
@ -4742,14 +4742,34 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "idleSettle", "id": "idleSettle",
"interpDuration": 12, "interpDuration": 15,
"interpTarget": 12, "interpTarget": 15,
"interpType": "evaluateBoth", "interpType": "snapshotPrev",
"transitions": [ "transitions": [
{ {
"state": "idle", "state": "idle",
"var": "idleSettleOnDone" "var": "idleSettleOnDone"
}, },
{
"state": "idle",
"var": "reactionPositiveTrigger"
},
{
"state": "idle",
"var": "reactionNegativeTrigger"
},
{
"state": "idle",
"var": "reactionRaiseHandEnabled"
},
{
"state": "idle",
"var": "reactionApplaudEnabled"
},
{
"state": "idle",
"var": "reactionPointEnabled"
},
{ {
"state": "WALKFWD", "state": "WALKFWD",
"var": "isMovingForward" "var": "isMovingForward"
@ -4810,7 +4830,7 @@
}, },
{ {
"id": "WALKFWD", "id": "WALKFWD",
"interpDuration": 10, "interpDuration": 15,
"interpTarget": 35, "interpTarget": 35,
"interpType": "snapshotPrev", "interpType": "snapshotPrev",
"transitions": [ "transitions": [
@ -4874,7 +4894,7 @@
}, },
{ {
"id": "WALKBWD", "id": "WALKBWD",
"interpDuration": 10, "interpDuration": 15,
"interpTarget": 35, "interpTarget": 35,
"interpType": "snapshotPrev", "interpType": "snapshotPrev",
"transitions": [ "transitions": [
@ -4938,7 +4958,7 @@
}, },
{ {
"id": "STRAFERIGHT", "id": "STRAFERIGHT",
"interpDuration": 8, "interpDuration": 15,
"interpTarget": 25, "interpTarget": 25,
"interpType": "snapshotPrev", "interpType": "snapshotPrev",
"transitions": [ "transitions": [
@ -5002,7 +5022,7 @@
}, },
{ {
"id": "STRAFELEFT", "id": "STRAFELEFT",
"interpDuration": 8, "interpDuration": 15,
"interpTarget": 25, "interpTarget": 25,
"interpType": "snapshotPrev", "interpType": "snapshotPrev",
"transitions": [ "transitions": [
@ -5873,7 +5893,6 @@
}, },
"id": "userAnimStateMachine", "id": "userAnimStateMachine",
"type": "stateMachine" "type": "stateMachine"
}, },
"version": "1.1" "version": "1.1"
} }