Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-07 02:22:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix domain baker not finishing (threading, material key)

Browse source 
This addresses 2 cases where the domain baker would not finish

1. For material baking, we were storing a value in
_entitiesNeedingRewrite with a different key than what
we use when we later remove it from _entitiesNeedingRewrite

2. The domain baker runs on a worker thread. When starting a
baker for an item in the domain, we do an invokeMethod,
which will happen synchronously if the baker ends up on the
same thread as the thread that the domain baker is on.
This can cause issues if the baker finishes immediately.
The case I saw was a local model url that immediately failed,
and finished before return from the invokeMethod in the domain baker .
This commit is contained in:
Ryan Huffman 2019-04-19 09:32:42 -07:00
parent 71ca653498
commit 15e4df2b61
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/oven/src/DomainBaker.cpp
View file

@ -171,7 +171,7 @@ void DomainBaker::addModelBaker(const QString& property, const QString& url, con
// move the baker to the baker thread
// and kickoff the bake
baker->moveToThread(Oven::instance().getNextWorkerThread());
QMetaObject::invokeMethod(baker.data(), "bake");
QMetaObject::invokeMethod(baker.data(), "bake", Qt::QueuedConnection);
// keep track of the total number of baking entities
++_totalNumberOfSubBakes;
@ -212,7 +212,7 @@ void DomainBaker::addTextureBaker(const QString& property, const QString& url, i
// move the baker to a worker thread and kickoff the bake
textureBaker->moveToThread(Oven::instance().getNextWorkerThread());
QMetaObject::invokeMethod(textureBaker.data(), "bake");
QMetaObject::invokeMethod(textureBaker.data(), "bake", Qt::QueuedConnection);
// keep track of the total number of baking entities
++_totalNumberOfSubBakes;
@ -247,7 +247,7 @@ void DomainBaker::addScriptBaker(const QString& property, const QString& url, co
// move the baker to a worker thread and kickoff the bake
scriptBaker->moveToThread(Oven::instance().getNextWorkerThread());
QMetaObject::invokeMethod(scriptBaker.data(), "bake");
QMetaObject::invokeMethod(scriptBaker.data(), "bake", Qt::QueuedConnection);
// keep track of the total number of baking entities
++_totalNumberOfSubBakes;
@ -272,7 +272,7 @@ void DomainBaker::addMaterialBaker(const QString& property, const QString& data,
// setup a baker for this material
QSharedPointer<MaterialBaker> materialBaker {
new MaterialBaker(data, isURL, _contentOutputPath, destinationPath),
new MaterialBaker(materialData, isURL, _contentOutputPath, destinationPath),
&MaterialBaker::deleteLater
};
@ -284,7 +284,7 @@ void DomainBaker::addMaterialBaker(const QString& property, const QString& data,
// move the baker to a worker thread and kickoff the bake
materialBaker->moveToThread(Oven::instance().getNextWorkerThread());
QMetaObject::invokeMethod(materialBaker.data(), "bake");
QMetaObject::invokeMethod(materialBaker.data(), "bake", Qt::QueuedConnection);
// keep track of the total number of baking entities
++_totalNumberOfSubBakes;