Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:02:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pr feedback

Browse source
This commit is contained in:
howard-stearns 2017-06-07 16:44:13 -07:00
parent fa74daf875
commit 9cf027a68c
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2261,7 +2261,6 @@ bool MyAvatar::safeLanding(const glm::vec3& position) {
if (!requiresSafeLanding(position, better)) { if (!requiresSafeLanding(position, better)) {
return false; return false;
} }
qDebug() << "rechecking" << position << " => " << better << " collisions:" << getCollisionsEnabled() << " physics:" << qApp->isPhysicsEnabled();
if (!getCollisionsEnabled()) { if (!getCollisionsEnabled()) {
goToLocation(better); // recurses on next update 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.
@ -2334,18 +2333,19 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette
} }
// See if we have room between entities above and below, but that we are not contained. // See if we have room between entities above and below, but that we are not contained.
if (isDown(upperNormal) && isUp(lowerNormal)) { // First check if the surface above us is the bottom of something, and the surface below us it the top of something.
// The surface above us is the bottom of something, and the surface below us it the top of something.
// I.e., we are in a clearing between two objects. // I.e., we are in a clearing between two objects.
auto delta = glm::distance(upperIntersection, lowerIntersection); if (isDown(upperNormal) && isUp(lowerNormal)) {
auto spaceBetween = glm::distance(upperIntersection, lowerIntersection);
const float halfHeightFactor = 2.5f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise. const float halfHeightFactor = 2.5f; // Until case 5003 is fixed (and maybe after?), we need a fudge factor. Also account for content modelers not being precise.
if (delta > (halfHeightFactor * halfHeight)) { if (spaceBetween > (halfHeightFactor * halfHeight)) {
// There is room for us to fit in that clearing. If there wasn't, physics would oscilate us between the objects above and below. // There is room for us to fit in that clearing. If there wasn't, physics would oscilate us between the objects above and below.
// We're now going to iterate upwards through successive upperIntersections, testing to see if we're contained within the top surface of some entity. // We're now going to iterate upwards through successive upperIntersections, testing to see if we're contained within the top surface of some entity.
// There will be one of two outcomes: // There will be one of two outcomes:
// a) We're not contained, so we have enough room and our position is good. // a) We're not contained, so we have enough room and our position is good.
// b) We are contained, so we'll bail out of this but try again at a position above the containing entity. // b) We are contained, so we'll bail out of this but try again at a position above the containing entity.
for (;;) { const int iterationLimit = 1000;
for (int counter = 0; counter < iterationLimit; counter++) {
ignore.push_back(upperId); ignore.push_back(upperId);
if (!findIntersection(upperIntersection, up, upperIntersection, upperId, upperNormal)) { if (!findIntersection(upperIntersection, up, upperIntersection, upperId, upperNormal)) {
// We're not inside an entity, and from the nested tests, we have room between what is above and below. So position is good! // We're not inside an entity, and from the nested tests, we have room between what is above and below. So position is good!
@ -2360,6 +2360,7 @@ bool MyAvatar::requiresSafeLanding(const glm::vec3& positionIn, glm::vec3& bette
// We found a new bottom surface, which we're not interested in. // We found a new bottom surface, which we're not interested in.
// But there could still be a top surface above us for an entity we haven't seen, so keep looking upward. // But there could still be a top surface above us for an entity we haven't seen, so keep looking upward.
} }
qCDebug(interfaceapp) << "Loop in requiresSafeLanding. Floor/ceiling do not make sense.";
} }
} }