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

Do not have multiple copies of the original texture file in the baked output

Browse source
This commit is contained in:
sabrina-shanman 2019-03-14 14:31:14 -07:00
parent 20d0ca0073
commit c8209aa976
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,17 +47,19 @@ TextureBaker::TextureBaker(const QUrl& textureURL, image::TextureUsage::Type tex
auto originalFilename = textureURL.fileName(); auto originalFilename = textureURL.fileName();
_baseFilename = originalFilename.left(originalFilename.lastIndexOf('.')); _baseFilename = originalFilename.left(originalFilename.lastIndexOf('.'));
} }
_originalCopyFilePath = _outputDirectory.absoluteFilePath(_textureURL.fileName());
} }
void TextureBaker::bake() { void TextureBaker::bake() {
// once our texture is loaded, kick off a the processing // once our texture is loaded, kick off a the processing
connect(this, &TextureBaker::originalTextureLoaded, this, &TextureBaker::processTexture); connect(this, &TextureBaker::originalTextureLoaded, this, &TextureBaker::processTexture);
if (_originalTexture.isEmpty()) { if (_originalTexture.isEmpty() && !QFile(_originalCopyFilePath.toString()).exists()) {
// first load the texture (either locally or remotely) // first load the texture (either locally or remotely)
loadTexture(); loadTexture();
} else { } else {
// we already have a texture passed to us, use that // we already have a texture passed to us, or the texture is already saved, so use that
emit originalTextureLoaded(); emit originalTextureLoaded();
} }
} }
@ -128,23 +130,22 @@ void TextureBaker::processTexture() {
TextureMeta meta; TextureMeta meta;
QString newFilename = _textureURL.fileName(); QString originalCopyFilePath = _originalCopyFilePath.toString();
QString addMapChannel = QString::fromStdString("_" + std::to_string(_textureType));
newFilename.replace(QString("."), addMapChannel + ".");
QString originalCopyFilePath = _outputDirectory.absoluteFilePath(newFilename);
// Copy the original file into the baked output directory if it doesn't exist yet
{ {
QFile file { originalCopyFilePath }; QFile file { originalCopyFilePath };
if (!file.open(QIODevice::WriteOnly) || file.write(_originalTexture) == -1) { if (!file.exists() && (!file.open(QIODevice::WriteOnly) || file.write(_originalTexture) == -1)) {
handleError("Could not write original texture for " + _textureURL.toString()); handleError("Could not write original texture for " + _textureURL.toString());
return; return;
} }
// IMPORTANT: _originalTexture is empty past this point // IMPORTANT: _originalTexture is empty past this point
_originalTexture.clear(); _originalTexture.clear();
_outputFiles.push_back(originalCopyFilePath); _outputFiles.push_back(originalCopyFilePath);
meta.original = _metaTexturePathPrefix + newFilename; meta.original = _metaTexturePathPrefix + _originalCopyFilePath.fileName();
} }
// Load the copy of the original file from the baked output directory. New images will be created using the original as the source data.
auto buffer = std::static_pointer_cast<QIODevice>(std::make_shared<QFile>(originalCopyFilePath)); auto buffer = std::static_pointer_cast<QIODevice>(std::make_shared<QFile>(originalCopyFilePath));
if (!buffer->open(QIODevice::ReadOnly)) { if (!buffer->open(QIODevice::ReadOnly)) {
handleError("Could not open original file at " + originalCopyFilePath); handleError("Could not open original file at " + originalCopyFilePath);

1
libraries/baking/src/TextureBaker.h
View file

@ -73,6 +73,7 @@ private:
QDir _outputDirectory; QDir _outputDirectory;
QString _metaTextureFileName; QString _metaTextureFileName;
QString _metaTexturePathPrefix; QString _metaTexturePathPrefix;
QUrl _originalCopyFilePath;
std::atomic<bool> _abortProcessing { false }; std::atomic<bool> _abortProcessing { false };