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

Merge pull request #15560 from roxanneskelly/bugz87

Browse source 
BUGZ-87 - loading/physics stuck when entering domain
This commit is contained in:
Roxanne Skelly 2019-05-14 17:40:04 -07:00 committed by GitHub
commit 112b92d905
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/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) {