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

BUGZ-87 - loading/physics stuck when entering domain

Browse source 
A race condition was occurring when multiple entities using
the same models were handed over to physics around the same time.
The first model is passed to a worker thread to turn it into a shape
and subsequent models note they are the same and don't create a shape
or worker thread.

The physics system was ignoring these, never marking them as ready
for physics.
This commit is contained in:
Roxanne Skelly 2019-05-14 16:14:44 -07:00
parent 7440ef3cf3
commit 0ac597d76e
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/ShapeManager.cpp
View file

@ -49,11 +49,15 @@ const btCollisionShape* ShapeManager::getShape(const ShapeInfo& info) {
const btCollisionShape* shape = nullptr; const btCollisionShape* shape = nullptr;
if (info.getType() == SHAPE_TYPE_STATIC_MESH) { if (info.getType() == SHAPE_TYPE_STATIC_MESH) {
uint64_t hash = info.getHash(); uint64_t hash = info.getHash();
// bump the request count to the caller knows we're
// starting or waiting on a thread.
++_workRequestCount;
const auto itr = std::find(_pendingMeshShapes.begin(), _pendingMeshShapes.end(), hash); const auto itr = std::find(_pendingMeshShapes.begin(), _pendingMeshShapes.end(), hash);
if (itr == _pendingMeshShapes.end()) { if (itr == _pendingMeshShapes.end()) {
// start a worker // start a worker
_pendingMeshShapes.push_back(hash); _pendingMeshShapes.push_back(hash);
++_workRequestCount;
// try to recycle old deadWorker // try to recycle old deadWorker
ShapeFactory::Worker* worker = _deadWorker; ShapeFactory::Worker* worker = _deadWorker;
if (!worker) { if (!worker) {