From 74186b0162f7d0415099ac004fc9ca9fce9321e1 Mon Sep 17 00:00:00 2001 From: amantley Date: Fri, 10 Aug 2018 09:56:24 -0700 Subject: [PATCH] changed back speed to 2.2 m/s and the end frame for strafe left and right to 33, and the end frame for wlk_bkwd to 27 --- interface/resources/avatar/avatar-animation.json | 12 ++++++------ libraries/shared/src/AvatarConstants.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/interface/resources/avatar/avatar-animation.json b/interface/resources/avatar/avatar-animation.json index 1388e71e5c..6ebbbf3000 100644 --- a/interface/resources/avatar/avatar-animation.json +++ b/interface/resources/avatar/avatar-animation.json @@ -1058,7 +1058,7 @@ "data": { "alpha": 0.0, "desiredSpeed": 1.4, - "characteristicSpeeds": [0.6, 2.0], + "characteristicSpeeds": [0.6, 1.7], "alphaVar": "moveBackwardAlpha", "desiredSpeedVar": "moveBackwardSpeed" }, @@ -1081,7 +1081,7 @@ "data": { "url": "qrc:///avatar/animations/walk_bwd_fast.fbx", "startFrame": 0.0, - "endFrame": 28.0, + "endFrame": 27.0, "timeScale": 1.0, "loopFlag": true }, @@ -1120,7 +1120,7 @@ "data": { "alpha": 0.0, "desiredSpeed": 1.4, - "characteristicSpeeds": [0, 0.5, 1.3, 2.6, 3.0], + "characteristicSpeeds": [0, 0.5, 1.5, 2.6, 3.0], "alphaVar": "moveLateralAlpha", "desiredSpeedVar": "moveLateralSpeed" }, @@ -1155,7 +1155,7 @@ "data": { "url": "qrc:///avatar/animations/walk_left.fbx", "startFrame": 0.0, - "endFrame": 35.0, + "endFrame": 33.0, "timeScale": 1.0, "loopFlag": true }, @@ -1193,7 +1193,7 @@ "data": { "alpha": 0.0, "desiredSpeed": 1.4, - "characteristicSpeeds": [0, 0.5, 1.3, 2.6, 3.0], + "characteristicSpeeds": [0, 0.5, 1.5, 2.6, 3.0], "alphaVar": "moveLateralAlpha", "desiredSpeedVar": "moveLateralSpeed" }, @@ -1229,7 +1229,7 @@ "data": { "url": "qrc:///avatar/animations/walk_left.fbx", "startFrame": 0.0, - "endFrame": 35.0, + "endFrame": 33.0, "timeScale": 1.0, "loopFlag": true, "mirrorFlag": true diff --git a/libraries/shared/src/AvatarConstants.h b/libraries/shared/src/AvatarConstants.h index 2fd7b974a1..39117de7ef 100644 --- a/libraries/shared/src/AvatarConstants.h +++ b/libraries/shared/src/AvatarConstants.h @@ -66,7 +66,7 @@ const glm::vec3 DEFAULT_AVATAR_RIGHTFOOT_POS { 0.08f, -0.96f, 0.029f }; const glm::quat DEFAULT_AVATAR_RIGHTFOOT_ROT { -0.4016716778278351f, 0.9154615998268127f, 0.0053307069465518f, 0.023696165531873703f }; const float DEFAULT_AVATAR_MAX_WALKING_SPEED = 2.6f; // meters / second -const float DEFAULT_AVATAR_MAX_WALKING_BACKWARD_SPEED = 1.6f; // meters / second +const float DEFAULT_AVATAR_MAX_WALKING_BACKWARD_SPEED = 2.2f; // meters / second const float DEFAULT_AVATAR_MAX_FLYING_SPEED = 30.0f; // meters / second const float DEFAULT_AVATAR_GRAVITY = -5.0f; // meters / second^2