Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-02 19:09:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Speed up acceleration and blends slightly per Joshua, add kicks to turn anim.

Browse source
This commit is contained in:
DouglasWilcox 2019-11-15 17:04:51 -08:00
parent d9065affad
commit ddbb8d70ed
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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.

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

@ -824,7 +824,7 @@
"children": [ "children": [
], ],
"data": { "data": {
"endFrame": 400, "endFrame": 200,
"loopFlag": true, "loopFlag": true,
"startFrame": 1, "startFrame": 1,
"timeScale": 1, "timeScale": 1,
@ -837,7 +837,7 @@
"children": [ "children": [
], ],
"data": { "data": {
"endFrame": 400, "endFrame": 200,
"loopFlag": true, "loopFlag": true,
"startFrame": 1, "startFrame": 1,
"timeScale": 1, "timeScale": 1,
@ -896,8 +896,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedTurnLeft", "id": "seatedTurnLeft",
"interpDuration": 25, "interpDuration": 22,
"interpTarget": 25, "interpTarget": 22,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
@ -913,8 +913,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedTurnRight", "id": "seatedTurnRight",
"interpDuration": 25, "interpDuration": 22,
"interpTarget": 25, "interpTarget": 22,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
@ -930,8 +930,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedTurnRight_to_Idle", "id": "seatedTurnRight_to_Idle",
"interpDuration": 25, "interpDuration": 22,
"interpTarget": 25, "interpTarget": 22,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {
@ -951,8 +951,8 @@
{ {
"easingType": "easeInOutQuad", "easingType": "easeInOutQuad",
"id": "seatedTurnLeft_to_Idle", "id": "seatedTurnLeft_to_Idle",
"interpDuration": 25, "interpDuration": 22,
"interpTarget": 25, "interpTarget": 22,
"interpType": "evaluateBoth", "interpType": "evaluateBoth",
"transitions": [ "transitions": [
{ {

2
interface/src/avatar/MyAvatar.cpp
View file

@ -3516,7 +3516,7 @@ void MyAvatar::updateOrientation(float deltaTime) {
float direction = -getDriveKey(TRANSLATE_X); float direction = -getDriveKey(TRANSLATE_X);
float seatedTargetSpeed = direction * _yawSpeed * deltaTime; //deg/renderframe float seatedTargetSpeed = direction * _yawSpeed * deltaTime; //deg/renderframe
const float SEATED_ROTATION_ACCEL_SCALE = 3.0; const float SEATED_ROTATION_ACCEL_SCALE = 3.5;
float blend = deltaTime * SEATED_ROTATION_ACCEL_SCALE; float blend = deltaTime * SEATED_ROTATION_ACCEL_SCALE;
if (blend > 1.0f) { if (blend > 1.0f) {