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

transition to InAir state when not thrusting up

Browse source
This commit is contained in:
Andrew Meadows 2016-05-12 10:15:23 -07:00
parent 9b7bf97891
commit 1749bfbc58
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -173,17 +173,18 @@ void CharacterController::preStep(btCollisionWorld* collisionWorld) {
_hasSupport = checkForSupport(collisionWorld); _hasSupport = checkForSupport(collisionWorld);
} }
const btScalar MIN_TARGET_SPEED = 0.001f;
const btScalar MIN_TARGET_SPEED_SQUARED = MIN_TARGET_SPEED * MIN_TARGET_SPEED;
void CharacterController::playerStep(btCollisionWorld* dynaWorld, btScalar dt) { void CharacterController::playerStep(btCollisionWorld* dynaWorld, btScalar dt) {
const btScalar MIN_SPEED = 0.001f;
btVector3 actualVelocity = _rigidBody->getLinearVelocity() - _parentVelocity; btVector3 actualVelocity = _rigidBody->getLinearVelocity() - _parentVelocity;
if (actualVelocity.length() < MIN_SPEED) { if (actualVelocity.length2() < MIN_TARGET_SPEED_SQUARED) {
actualVelocity = btVector3(0.0f, 0.0f, 0.0f); actualVelocity = btVector3(0.0f, 0.0f, 0.0f);
} }
btVector3 desiredVelocity = _targetVelocity; btVector3 desiredVelocity = _targetVelocity;
if (desiredVelocity.length() < MIN_SPEED) { if (desiredVelocity.length2() < MIN_TARGET_SPEED_SQUARED) {
desiredVelocity = btVector3(0.0f, 0.0f, 0.0f); desiredVelocity = btVector3(0.0f, 0.0f, 0.0f);
} }
@ -210,10 +211,11 @@ void CharacterController::playerStep(btCollisionWorld* dynaWorld, btScalar dt) {
finalVelocity = tau * desiredHorizVelocity + (1.0f - tau) * actualHorizVelocity; finalVelocity = tau * desiredHorizVelocity + (1.0f - tau) * actualHorizVelocity;
// only blend vertical part if the target velocity has non-zero vertical component // only blend vertical part if the target velocity has non-zero vertical component
const btScalar MIN_VERT_TARGET_SPEED_SQUARED = 1.0e-6; // 1mm/sec if (desiredVertVelocity.length2() > MIN_TARGET_SPEED_SQUARED) {
if (desiredVertVelocity.length2() > MIN_VERT_TARGET_SPEED_SQUARED) {
tau = dt / FLY_ACCELERATION_TIMESCALE; tau = dt / FLY_ACCELERATION_TIMESCALE;
finalVelocity += tau * desiredVertVelocity + (1.0f - tau) * actualVertVelocity; finalVelocity += tau * desiredVertVelocity + (1.0f - tau) * actualVertVelocity;
} else {
finalVelocity += actualVertVelocity;
} }
} }
@ -507,11 +509,18 @@ void CharacterController::preSimulation() {
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 < JUMP_PROXIMITY_THRESHOLD) || _hasSupport)) {
SET_STATE(State::Ground, "hit ground"); SET_STATE(State::Ground, "hit ground");
} else if (jumpButtonHeld && (_takeoffJumpButtonID != _jumpButtonDownCount)) { } else {
btVector3 desiredVelocity = _targetVelocity;
if (desiredVelocity.length2() < MIN_TARGET_SPEED_SQUARED) {
desiredVelocity = btVector3(0.0f, 0.0f, 0.0f);
}
bool vertTargetSpeedIsNonZero = desiredVelocity.dot(_currentUp) > MIN_TARGET_SPEED;
if ((jumpButtonHeld || vertTargetSpeedIsNonZero) && (_takeoffJumpButtonID != _jumpButtonDownCount)) {
SET_STATE(State::Hover, "double jump button"); SET_STATE(State::Hover, "double jump button");
} else if (jumpButtonHeld && (now - _jumpButtonDownStartTime) > JUMP_TO_HOVER_PERIOD) { } else if ((jumpButtonHeld || vertTargetSpeedIsNonZero) && (now - _jumpButtonDownStartTime) > JUMP_TO_HOVER_PERIOD) {
SET_STATE(State::Hover, "jump button held"); SET_STATE(State::Hover, "jump button held");
} }
}
break; break;
} }
case State::Hover: case State::Hover: