Showing the changes to libraries/physics/src/ShapeFactory.cpp (1 of 1 file). Show all
Unified · Split
| @@ -43,9 +43,18 @@ btConvexHullShape* ShapeFactory::createConvexHull(const QVector<glm::vec3>& poin · 42 unmodified lines | |||
| 43 | 43 | ||
| 44 | const float MIN_MARGIN = 0.01f; | 44 | const float MIN_MARGIN = 0.01f; |
| 45 | glm::vec3 diagonal = maxCorner - minCorner; | 45 | glm::vec3 diagonal = maxCorner - minCorner; |
| 46 | float minDimension = glm::min(diagonal[0], diagonal[1]); | 46 | float smallestDimension = glm::min(diagonal[0], diagonal[1]); |
| 47 | minDimension = glm::min(minDimension, diagonal[2]); | 47 | smallestDimension = glm::min(smallestDimension, diagonal[2]); |
| 48 | margin = glm::min(glm::max(0.5f * minDimension, MIN_MARGIN), margin); | 48 | const float MIN_DIMENSION = 2.0f * MIN_MARGIN + 0.001f; |
| 49 | if (smallestDimension < MIN_DIMENSION) { | ||
| 50 | for (int i = 0; i < 3; ++i) { | ||
| 51 | if (diagonal[i] < MIN_DIMENSION) { | ||
| 52 | diagonal[i] = MIN_DIMENSION; | ||
| 53 | } | ||
| 54 | } | ||
| 55 | smallestDimension = MIN_DIMENSION; | ||
| 56 | } | ||
| 57 | margin = glm::min(glm::max(0.5f * smallestDimension, MIN_MARGIN), margin); | ||
| 49 | hull->setMargin(margin); | 58 | hull->setMargin(margin); |
| 50 | 59 | ||
| 51 | // add the points, correcting for margin | 60 | // add the points, correcting for margin |