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

Merge pull request #1326 from ctrlaltdavid/fix/avatar-crash

Browse source 
Fix avatar crash
This commit is contained in:
Kalila 2021-09-07 13:36:18 -04:00 committed by GitHub
commit 542e070d2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/physics/src/MultiSphereShape.cpp
View file

@ -486,7 +486,7 @@ void MultiSphereShape::calculateDebugLines() {
break;
}
}
}
}
calculateChamferBox(_debugLines, radiuses, axes, _midPoint);
} else if (_spheres.size() == 8) {
std::vector<glm::vec3> axes;
@ -508,6 +508,10 @@ void MultiSphereShape::connectEdges(std::vector<std::pair<glm::vec3, glm::vec3>>
}
void MultiSphereShape::calculateChamferBox(std::vector<std::pair<glm::vec3, glm::vec3>>& outLines, const std::vector<float>& radiuses, const std::vector<glm::vec3>& axes, const glm::vec3& translation) {
if (radiuses.size() == 0) {
return;
}
std::vector<std::pair<glm::vec3, glm::vec3>> sphereLines;
calculateSphereLines(sphereLines, glm::vec3(0.0f), radiuses[0]);