Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-10 10:34:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add cancellation handling for domain bake widget

Browse source
This commit is contained in:
Stephen Birarda 2017-04-17 17:19:18 -07:00
parent 9d8e493c20
commit 7a5bfb8c19
5 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/model-baking/src/FBXBaker.cpp
View file

@ -374,11 +374,7 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
// figure out the URL to this texture, embedded or external
auto urlToTexture = getTextureURL(textureFileInfo, fileTexture);
if (!_unbakedTextures.contains(urlToTexture)) {
// add the deduced url to the texture, associated with the resulting baked texture file name,
// to our hash of textures needing to be baked
_unbakedTextures.insert(urlToTexture, bakedTextureFileName);
if (!_bakingTextures.contains(urlToTexture)) {
// bake this texture asynchronously
bakeTexture(urlToTexture, textureType, _uniqueOutputPath + BAKED_OUTPUT_SUBFOLDER);
}
@ -404,7 +400,7 @@ void FBXBaker::bakeTexture(const QUrl& textureURL, gpu::TextureType textureType,
connect(bakingTexture.data(), &Baker::finished, this, &FBXBaker::handleBakedTexture);
// keep a shared pointer to the baking texture
_bakingTextures.insert(bakingTexture);
_bakingTextures.insert(textureURL, bakingTexture);
// start baking the texture on one of our available worker threads
bakingTexture->moveToThread(_textureThreadGetter());
@ -456,8 +452,8 @@ void FBXBaker::handleBakedTexture() {
}
// now that this texture has been baked and handled, we can remove that TextureBaker from our list
_unbakedTextures.remove(bakedTexture->getTextureURL());
// now that this texture has been baked and handled, we can remove that TextureBaker from our hash
_bakingTextures.remove(bakedTexture->getTextureURL());
checkIfTexturesFinished();
} else {
@ -468,7 +464,7 @@ void FBXBaker::handleBakedTexture() {
_pendingErrorEmission = true;
// now that this texture has been baked, even though it failed, we can remove that TextureBaker from our list
_unbakedTextures.remove(bakedTexture->getTextureURL());
_bakingTextures.remove(bakedTexture->getTextureURL());
checkIfTexturesFinished();
}
@ -476,7 +472,7 @@ void FBXBaker::handleBakedTexture() {
// we have errors to attend to, so we don't do extra processing for this texture
// but we do need to remove that TextureBaker from our list
// and then check if we're done with all textures
_unbakedTextures.remove(bakedTexture->getTextureURL());
_bakingTextures.remove(bakedTexture->getTextureURL());
checkIfTexturesFinished();
}
@ -525,7 +521,7 @@ void FBXBaker::checkIfTexturesFinished() {
// check if we're done everything we need to do for this FBX
// and emit our finished signal if we're done
if (_unbakedTextures.isEmpty()) {
if (_bakingTextures.isEmpty()) {
// remove the embedded media folder that the FBX SDK produces when reading the original
removeEmbeddedMediaFolder();

5
libraries/model-baking/src/FBXBaker.h
View file

@ -88,12 +88,9 @@ private:
static FBXSDKManagerUniquePointer _sdkManager;
fbxsdk::FbxScene* _scene { nullptr };
QHash<QUrl, QString> _unbakedTextures;
QMultiHash<QUrl, QSharedPointer<TextureBaker>> _bakingTextures;
QHash<QString, int> _textureNameMatchCount;
QSet<QSharedPointer<TextureBaker>> _bakingTextures;
QFutureSynchronizer<void> _textureBakeSynchronizer;
TextureBakerThreadGetter _textureThreadGetter;
bool _copyOriginals { true };

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

@ -239,7 +239,8 @@ void DomainBaker::bakeSkybox(QUrl skyboxURL, QJsonValueRef entity) {
// setup a baker for this skybox
QSharedPointer<TextureBaker> skyboxBaker {
new TextureBaker(skyboxURL, gpu::CUBE_TEXTURE, _contentOutputPath)
new TextureBaker(skyboxURL, gpu::CUBE_TEXTURE, _contentOutputPath),
&TextureBaker::deleteLater
};
// make sure our handler is called when the skybox baker is done

14
tools/oven/src/ui/DomainBakeWidget.cpp
View file

@ -41,6 +41,20 @@ DomainBakeWidget::DomainBakeWidget(QWidget* parent, Qt::WindowFlags flags) :
setupUI();
}
DomainBakeWidget::~DomainBakeWidget() {
// if we're going down, our bakers are about to too
// enumerate them, send a cancelled status to the results table, and remove them
auto it = _bakers.begin();
while (it != _bakers.end()) {
auto resultRow = it->second;
auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
resultsWindow->changeStatusForRow(resultRow, "Cancelled");
it = _bakers.erase(it);
}
}
void DomainBakeWidget::setupUI() {
// setup a grid layout to hold everything
QGridLayout* gridLayout = new QGridLayout;

3
tools/oven/src/ui/DomainBakeWidget.h
View file

@ -25,7 +25,8 @@ class DomainBakeWidget : public QWidget {
public:
DomainBakeWidget(QWidget* parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
~DomainBakeWidget();
private slots:
void chooseFileButtonClicked();
void chooseOutputDirButtonClicked();