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

Do not consolidate source images by file for now, since they may have the same filename but different paths

Browse source
This commit is contained in:
sabrina-shanman 2019-03-18 09:42:45 -07:00
parent 0990b56952
commit bc3b35aad3
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,18 +48,24 @@ TextureBaker::TextureBaker(const QUrl& textureURL, image::TextureUsage::Type tex
_baseFilename = originalFilename.left(originalFilename.lastIndexOf('.'));
}
_originalCopyFilePath = _outputDirectory.absoluteFilePath(_textureURL.fileName());
auto textureFilename = _textureURL.fileName();
QString originalExtension;
int extensionStart = textureFilename.indexOf(".");
if (extensionStart != -1) {
originalExtension = textureFilename.mid(extensionStart);
}
_originalCopyFilePath = _outputDirectory.absoluteFilePath(_baseFilename + originalExtension);
}
void TextureBaker::bake() {
// once our texture is loaded, kick off a the processing
connect(this, &TextureBaker::originalTextureLoaded, this, &TextureBaker::processTexture);
if (_originalTexture.isEmpty() && !QFile(_originalCopyFilePath.toString()).exists()) {
if (_originalTexture.isEmpty()) {
// first load the texture (either locally or remotely)
loadTexture();
} else {
// we already have a texture passed to us, or the texture is already saved, so use that
// we already have a texture passed to us, use that
emit originalTextureLoaded();
}
}
@ -135,7 +141,7 @@ void TextureBaker::processTexture() {
// Copy the original file into the baked output directory if it doesn't exist yet
{
QFile file { originalCopyFilePath };
if (!file.exists() && (!file.open(QIODevice::WriteOnly) || file.write(_originalTexture) == -1)) {
if (!file.open(QIODevice::WriteOnly) || file.write(_originalTexture) == -1) {
handleError("Could not write original texture for " + _textureURL.toString());
return;
}