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

cleanup

Browse source
This commit is contained in:
Howard Stearns 2017-06-03 16:02:58 -07:00
parent 556dcd69ac
commit fd01258c76
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1555,11 +1555,11 @@ void MyAvatar::harvestResultsFromPhysicsSimulation(float deltaTime) {
if (_characterController.isEnabledAndReady()) { if (_characterController.isEnabledAndReady()) {
setVelocity(_characterController.getLinearVelocity() + _characterController.getFollowVelocity()); setVelocity(_characterController.getLinearVelocity() + _characterController.getFollowVelocity());
/*FIXME if (_characterController.isStuck()) { if (_characterController.isStuck()) {
_physicsSafetyPending = true; _physicsSafetyPending = true;
_goToPosition = getPosition(); _goToPosition = getPosition();
qDebug() << "FIXME setting safety test at:" << _goToPosition; qDebug() << "FIXME setting safety test at:" << _goToPosition;
}*/ }
} else { } else {
setVelocity(getVelocity() + _characterController.getFollowVelocity()); setVelocity(getVelocity() + _characterController.getFollowVelocity());
} }
@ -2258,12 +2258,12 @@ bool MyAvatar::safeLanding(const glm::vec3& position) {
} }
qDebug() << "rechecking" << position << " => " << better << " collisions:" << getCollisionsEnabled() << " physics:" << qApp->isPhysicsEnabled(); qDebug() << "rechecking" << position << " => " << better << " collisions:" << getCollisionsEnabled() << " physics:" << qApp->isPhysicsEnabled();
if (!getCollisionsEnabled()) { if (!getCollisionsEnabled()) {
goToLocation(better); // recurses goToLocation(better); // recurses on next update
} else { // If you try to go while stuck, physics will keep you stuck. } else { // If you try to go while stuck, physics will keep you stuck.
setCollisionsEnabled(false); setCollisionsEnabled(false);
// Don't goToLocation just yet. Yield so that physics can act on the above. // Don't goToLocation just yet. Yield so that physics can act on the above.
QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", Qt::QueuedConnection, // The equivalent of javascript nextTick QMetaObject::invokeMethod(this, "goToLocationAndEnableCollisions", Qt::QueuedConnection, // The equivalent of javascript nextTick
Q_ARG(glm::vec3, better)); // I.e., capsuleCenter - offset Q_ARG(glm::vec3, better));
} }
return true; return true;
} }