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

Merge pull request #16489 from hyperlogic/bug-fix/hmd-strafe-transition-bug-rc86

Browse source 
RC86: Handle HMD in input vars and remove/fix json transitions in/out of HMD strafe states
Force merge due to build issues.
This commit is contained in:
Shannon Romano 2019-11-13 12:48:11 -08:00 committed by GitHub
commit f38509dad5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5767,14 +5767,6 @@
"state": "INAIRRUN", "state": "INAIRRUN",
"var": "isInAirRun" "var": "isInAirRun"
}, },
{
"state": "strafeRightHmd",
"var": "isMovingRightHmd"
},
{
"state": "strafeLeftHmd",
"var": "isMovingLeftHmd"
},
{ {
"state": "seated", "state": "seated",
"var": "isSeated" "var": "isSeated"
@ -5831,14 +5823,6 @@
"state": "INAIRRUN", "state": "INAIRRUN",
"var": "isInAirRun" "var": "isInAirRun"
}, },
{
"state": "strafeRightHmd",
"var": "isMovingRightHmd"
},
{
"state": "strafeLeftHmd",
"var": "isMovingLeftHmd"
},
{ {
"state": "seated", "state": "seated",
"var": "isSeated" "var": "isSeated"
@ -5983,7 +5967,7 @@
"transitions": [ "transitions": [
{ {
"state": "idleSettle", "state": "idleSettle",
"var": "isNotInput" "var": "isNotMoving"
}, },
{ {
"state": "WALKFWD", "state": "WALKFWD",
@ -5997,14 +5981,6 @@
"state": "strafeLeftHmd", "state": "strafeLeftHmd",
"var": "isMovingLeftHmd" "var": "isMovingLeftHmd"
}, },
{
"state": "STRAFERIGHT",
"var": "isInputRight"
},
{
"state": "STRAFELEFT",
"var": "isInputLeft"
},
{ {
"state": "turnRight", "state": "turnRight",
"var": "isTurningRight" "var": "isTurningRight"
@ -6047,7 +6023,7 @@
"transitions": [ "transitions": [
{ {
"state": "idleSettle", "state": "idleSettle",
"var": "isNotInput" "var": "isNotMoving"
}, },
{ {
"state": "WALKFWD", "state": "WALKFWD",
@ -6061,14 +6037,6 @@
"state": "strafeRightHmd", "state": "strafeRightHmd",
"var": "isMovingRightHmd" "var": "isMovingRightHmd"
}, },
{
"state": "STRAFERIGHT",
"var": "isInputRight"
},
{
"state": "STRAFELEFT",
"var": "isInputLeft"
},
{ {
"state": "turnRight", "state": "turnRight",
"var": "isTurningRight" "var": "isTurningRight"

16
libraries/animation/src/Rig.cpp
View file

@ -1478,18 +1478,28 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos
} else { } else {
if (_previousControllerParameters.inputX > 0.0f) { if (_previousControllerParameters.inputX > 0.0f) {
// right // right
if (!_headEnabled) {
_animVars.set("isInputRight", true);
} else {
_animVars.set("isInputRight", false);
}
_animVars.set("isInputLeft", false);
_animVars.set("isInputForward", false); _animVars.set("isInputForward", false);
_animVars.set("isInputBackward", false); _animVars.set("isInputBackward", false);
_animVars.set("isInputRight", true);
_animVars.set("isInputLeft", false);
_animVars.set("isNotInput", false); _animVars.set("isNotInput", false);
_animVars.set("isNotInputSlow", false); _animVars.set("isNotInputSlow", false);
} else { } else {
// left // left
if (!_headEnabled) {
_animVars.set("isInputLeft", true);
} else {
_animVars.set("isInputLeft", false);
}
_animVars.set("isInputForward", false); _animVars.set("isInputForward", false);
_animVars.set("isInputBackward", false); _animVars.set("isInputBackward", false);
_animVars.set("isInputRight", false); _animVars.set("isInputRight", false);
_animVars.set("isInputLeft", true);
_animVars.set("isNotInput", false); _animVars.set("isNotInput", false);
_animVars.set("isNotInputSlow", false); _animVars.set("isNotInputSlow", false);
} }