Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 06:23:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx

Browse source 
Avoid deadlock on 10k mesh fbx
This commit is contained in:
Seth Alves 2017-03-24 12:34:37 -08:00 committed by GitHub
commit 0d2e0eb9c3
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -812,6 +812,13 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
auto& meshes = _model->getGeometry()->getMeshes(); auto& meshes = _model->getGeometry()->getMeshes();
int32_t numMeshes = (int32_t)(meshes.size()); int32_t numMeshes = (int32_t)(meshes.size());
const int MAX_ALLOWED_MESH_COUNT = 500;
if (numMeshes > MAX_ALLOWED_MESH_COUNT) {
// too many will cause the deadlock timer to throw...
shapeInfo.setParams(SHAPE_TYPE_BOX, 0.5f * dimensions);
return;
}
ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection(); ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
pointCollection.clear(); pointCollection.clear();
if (type == SHAPE_TYPE_SIMPLE_COMPOUND) { if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {

1
libraries/physics/src/PhysicalEntitySimulation.cpp
View file

@ -208,6 +208,7 @@ void PhysicalEntitySimulation::getObjectsToAddToPhysics(VectorOfMotionStates& re
assert(!entity->getPhysicsInfo()); assert(!entity->getPhysicsInfo());
if (entity->isDead()) { if (entity->isDead()) {
prepareEntityForDelete(entity); prepareEntityForDelete(entity);
entityItr = _entitiesToAddToPhysics.erase(entityItr);
} else if (!entity->shouldBePhysical()) { } else if (!entity->shouldBePhysical()) {
// this entity should no longer be on the internal _entitiesToAddToPhysics // this entity should no longer be on the internal _entitiesToAddToPhysics
entityItr = _entitiesToAddToPhysics.erase(entityItr); entityItr = _entitiesToAddToPhysics.erase(entityItr);