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

Merge pull request #11256 from birarda/feat/auto-bake

Browse source 
fail bake of partially baked FBX that references KTX
This commit is contained in:
Ryan Huffman 2017-08-29 13:17:05 -07:00 committed by GitHub
commit e8a57e3b35
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/baking/src/FBXBaker.cpp
View file

@ -105,11 +105,8 @@ void FBXBaker::bakeSourceCopy() {
void FBXBaker::setupOutputFolder() { void FBXBaker::setupOutputFolder() {
// make sure there isn't already an output directory using the same name // make sure there isn't already an output directory using the same name
int iteration = 0;
if (QDir(_bakedOutputDir).exists()) { if (QDir(_bakedOutputDir).exists()) {
qWarning() << "Output path" << _bakedOutputDir << "already exists. Continuing."; qWarning() << "Output path" << _bakedOutputDir << "already exists. Continuing.";
//_bakedOutputDir = _baseOutputPath + "/" + _fbxName + "-" + QString::number(++iteration) + "/";
} else { } else {
qCDebug(model_baking) << "Creating FBX output folder" << _bakedOutputDir; qCDebug(model_baking) << "Creating FBX output folder" << _bakedOutputDir;
@ -377,8 +374,15 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
QFileInfo textureFileInfo { fbxTextureFileName.replace("\\", "/") }; QFileInfo textureFileInfo { fbxTextureFileName.replace("\\", "/") };
// make sure this texture points to something and isn't one we've already re-mapped // make sure this texture points to something and isn't one we've already re-mapped
if (!textureFileInfo.filePath().isEmpty() if (!textureFileInfo.filePath().isEmpty()) {
&& textureFileInfo.suffix() != BAKED_TEXTURE_EXT.mid(1)) {
if (textureFileInfo.suffix() == BAKED_TEXTURE_EXT.mid(1)) {
// re-baking an FBX that already references baked textures is a fail
// so we add an error and return from here
handleError("Cannot re-bake a partially baked FBX file that references baked KTX textures");
return;
}
// construct the new baked texture file name and file path // construct the new baked texture file name and file path
// ensuring that the baked texture will have a unique name // ensuring that the baked texture will have a unique name