Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 15:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added missing checks to ground and takeoff state.

Browse source
This commit is contained in:
Saracen 2019-04-11 03:29:58 +01:00
parent bce80130bd
commit eb8e912808
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/physics/src/CharacterController.cpp
View file

@ -754,7 +754,11 @@ void CharacterController::updateState() {
switch (_state) { switch (_state) {
case State::Ground: case State::Ground:
if (!rayHasHit && !_hasSupport) { if (!rayHasHit && !_hasSupport) {
SET_STATE(State::Hover, "no ground detected"); if (_useFallHeightThreshold) {
SET_STATE(State::Hover, "no ground detected");
} else {
SET_STATE(State::InAir, "falling");
}
} else if (_pendingFlags & PENDING_FLAG_JUMP && _jumpButtonDownCount != _takeoffJumpButtonID) { } else if (_pendingFlags & PENDING_FLAG_JUMP && _jumpButtonDownCount != _takeoffJumpButtonID) {
_takeoffJumpButtonID = _jumpButtonDownCount; _takeoffJumpButtonID = _jumpButtonDownCount;
_takeoffToInAirStartTime = now; _takeoffToInAirStartTime = now;
@ -764,7 +768,7 @@ void CharacterController::updateState() {
} }
break; break;
case State::Takeoff: case State::Takeoff:
if (!rayHasHit && !_hasSupport) { if (_useFallHeightThreshold && (!rayHasHit && !_hasSupport)) {
SET_STATE(State::Hover, "no ground"); SET_STATE(State::Hover, "no ground");
} else if ((now - _takeoffToInAirStartTime) > TAKE_OFF_TO_IN_AIR_PERIOD) { } else if ((now - _takeoffToInAirStartTime) > TAKE_OFF_TO_IN_AIR_PERIOD) {
SET_STATE(State::InAir, "takeoff done"); SET_STATE(State::InAir, "takeoff done");