Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 06:29:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix not mapping identical URLs in DomainBaker

Browse source
This commit is contained in:
sabrina-shanman 2019-03-18 17:21:05 -07:00
parent b0b4307f27
commit fa6a94f16a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -150,7 +150,8 @@ void DomainBaker::addModelBaker(const QString& property, const QString& url, con
QUrl bakeableModelURL = getBakeableModelURL(url); QUrl bakeableModelURL = getBakeableModelURL(url);
if (!bakeableModelURL.isEmpty() && (_shouldRebakeOriginals || !isModelBaked(bakeableModelURL))) { if (!bakeableModelURL.isEmpty() && (_shouldRebakeOriginals || !isModelBaked(bakeableModelURL))) {
// setup a ModelBaker for this URL, as long as we don't already have one // setup a ModelBaker for this URL, as long as we don't already have one
if (!_modelBakers.contains(bakeableModelURL)) { bool haveBaker = _modelBakers.contains(bakeableModelURL);
if (!haveBaker) {
auto getWorkerThreadCallback = []() -> QThread* { auto getWorkerThreadCallback = []() -> QThread* {
return Oven::instance().getNextWorkerThread(); return Oven::instance().getNextWorkerThread();
}; };
@ -168,6 +169,7 @@ void DomainBaker::addModelBaker(const QString& property, const QString& url, con
// insert it into our bakers hash so we hold a strong pointer to it // insert it into our bakers hash so we hold a strong pointer to it
_modelBakers.insert(bakeableModelURL, baker); _modelBakers.insert(bakeableModelURL, baker);
haveBaker = true;
// move the baker to the baker thread // move the baker to the baker thread
// and kickoff the bake // and kickoff the bake
@ -176,12 +178,14 @@ void DomainBaker::addModelBaker(const QString& property, const QString& url, con
// keep track of the total number of baking entities // keep track of the total number of baking entities
++_totalNumberOfSubBakes; ++_totalNumberOfSubBakes;
// add this QJsonValueRef to our multi hash so that we can easily re-write
// the model URL to the baked version once the baker is complete
_entitiesNeedingRewrite.insert(bakeableModelURL, { property, jsonRef });
} }
} }
if (haveBaker) {
// add this QJsonValueRef to our multi hash so that we can easily re-write
// the model URL to the baked version once the baker is complete
_entitiesNeedingRewrite.insert(bakeableModelURL, { property, jsonRef });
}
} }
} }