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

Merge pull request #8360 from sethalves/no-accidental-fly

Browse source 
don't accidently fly
This commit is contained in:
Brad Hefta-Gaub 2016-08-05 16:45:48 -07:00 committed by GitHub
commit 3f3dda6356
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -534,13 +534,14 @@ void CharacterController::preSimulation() {
// scan for distant floor // scan for distant floor
// rayStart is at center of bottom sphere // rayStart is at center of bottom sphere
btVector3 rayStart = _characterBodyTransform.getOrigin() - _halfHeight * _currentUp; btVector3 rayStart = _characterBodyTransform.getOrigin();
// rayEnd is straight down MAX_FALL_HEIGHT // rayEnd is straight down MAX_FALL_HEIGHT
btScalar rayLength = _radius + MAX_FALL_HEIGHT; btScalar rayLength = _radius + MAX_FALL_HEIGHT;
btVector3 rayEnd = rayStart - rayLength * _currentUp; btVector3 rayEnd = rayStart - rayLength * _currentUp;
const btScalar JUMP_PROXIMITY_THRESHOLD = 0.1f * _radius; const btScalar FLY_TO_GROUND_THRESHOLD = 0.1f * _radius;
const btScalar GROUND_TO_FLY_THRESHOLD = 0.8f * _radius + _halfHeight;
const quint64 TAKE_OFF_TO_IN_AIR_PERIOD = 250 * MSECS_PER_SECOND; const quint64 TAKE_OFF_TO_IN_AIR_PERIOD = 250 * MSECS_PER_SECOND;
const btScalar MIN_HOVER_HEIGHT = 2.5f; const btScalar MIN_HOVER_HEIGHT = 2.5f;
const quint64 JUMP_TO_HOVER_PERIOD = 1100 * MSECS_PER_SECOND; const quint64 JUMP_TO_HOVER_PERIOD = 1100 * MSECS_PER_SECOND;
@ -553,7 +554,7 @@ void CharacterController::preSimulation() {
bool rayHasHit = rayCallback.hasHit(); bool rayHasHit = rayCallback.hasHit();
if (rayHasHit) { if (rayHasHit) {
_rayHitStartTime = now; _rayHitStartTime = now;
_floorDistance = rayLength * rayCallback.m_closestHitFraction - _radius; _floorDistance = rayLength * rayCallback.m_closestHitFraction - (_radius + _halfHeight);
} else if ((now - _rayHitStartTime) < RAY_HIT_START_PERIOD) { } else if ((now - _rayHitStartTime) < RAY_HIT_START_PERIOD) {
rayHasHit = true; rayHasHit = true;
} else { } else {
@ -581,7 +582,7 @@ void CharacterController::preSimulation() {
_takeoffJumpButtonID = _jumpButtonDownCount; _takeoffJumpButtonID = _jumpButtonDownCount;
_takeoffToInAirStartTime = now; _takeoffToInAirStartTime = now;
SET_STATE(State::Takeoff, "jump pressed"); SET_STATE(State::Takeoff, "jump pressed");
} else if (rayHasHit && !_hasSupport && _floorDistance > JUMP_PROXIMITY_THRESHOLD) { } else if (rayHasHit && !_hasSupport && _floorDistance > GROUND_TO_FLY_THRESHOLD) {
SET_STATE(State::InAir, "falling"); SET_STATE(State::InAir, "falling");
} }
break; break;
@ -595,7 +596,7 @@ void CharacterController::preSimulation() {
} }
break; break;
case State::InAir: { case State::InAir: {
if ((velocity.dot(_currentUp) <= (JUMP_SPEED / 2.0f)) && ((_floorDistance < JUMP_PROXIMITY_THRESHOLD) || _hasSupport)) { if ((velocity.dot(_currentUp) <= (JUMP_SPEED / 2.0f)) && ((_floorDistance < FLY_TO_GROUND_THRESHOLD) || _hasSupport)) {
SET_STATE(State::Ground, "hit ground"); SET_STATE(State::Ground, "hit ground");
} else { } else {
btVector3 desiredVelocity = _targetVelocity; btVector3 desiredVelocity = _targetVelocity;
@ -614,7 +615,7 @@ void CharacterController::preSimulation() {
case State::Hover: case State::Hover:
if ((_floorDistance < MIN_HOVER_HEIGHT) && !jumpButtonHeld && !flyingFast) { if ((_floorDistance < MIN_HOVER_HEIGHT) && !jumpButtonHeld && !flyingFast) {
SET_STATE(State::InAir, "near ground"); SET_STATE(State::InAir, "near ground");
} else if (((_floorDistance < JUMP_PROXIMITY_THRESHOLD) || _hasSupport) && !flyingFast) { } else if (((_floorDistance < FLY_TO_GROUND_THRESHOLD) || _hasSupport) && !flyingFast) {
SET_STATE(State::Ground, "touching ground"); SET_STATE(State::Ground, "touching ground");
} }
break; break;