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

CharacterController don't fight MyaAvatar::safeLanding()

Browse source
This commit is contained in:
Andrew Meadows 2019-07-31 16:07:44 -07:00
parent de476d0569
commit 6d7565a568
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -2733,7 +2733,7 @@ void MyAvatar::nextAttitude(glm::vec3 position, glm::quat orientation) {
void MyAvatar::harvestResultsFromPhysicsSimulation(float deltaTime) { void MyAvatar::harvestResultsFromPhysicsSimulation(float deltaTime) {
glm::vec3 position; glm::vec3 position;
glm::quat orientation; glm::quat orientation;
if (_characterController.isEnabledAndReady()) { if (_characterController.isEnabledAndReady() && !_characterController.isStuck()) {
_characterController.getPositionAndOrientation(position, orientation); _characterController.getPositionAndOrientation(position, orientation);
} else { } else {
position = getWorldPosition(); position = getWorldPosition();
@ -2746,7 +2746,7 @@ void MyAvatar::harvestResultsFromPhysicsSimulation(float deltaTime) {
setWorldVelocity(_characterController.getLinearVelocity() + _characterController.getFollowVelocity()); setWorldVelocity(_characterController.getLinearVelocity() + _characterController.getFollowVelocity());
if (_characterController.isStuck()) { if (_characterController.isStuck()) {
_physicsSafetyPending = true; _physicsSafetyPending = true;
_goToPosition = getWorldPosition(); _goToPosition = position;
} }
} else { } else {
setWorldVelocity(getWorldVelocity() + _characterController.getFollowVelocity()); setWorldVelocity(getWorldVelocity() + _characterController.getFollowVelocity());