Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 16:55:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11257 from birarda/feat/delete-baked-with-original

Browse source 
add deletion of baked content when original removed
This commit is contained in:
Ryan Huffman 2017-08-29 13:18:58 -07:00 committed by GitHub
commit f89459525e
2 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
assignment-client/src/assets/AssetServer.cpp
View file

@ -53,6 +53,8 @@ static QStringList BAKEABLE_TEXTURE_EXTENSIONS;
static const QString BAKED_MODEL_SIMPLE_NAME = "asset.fbx";
static const QString BAKED_TEXTURE_SIMPLE_NAME = "texture.ktx";
static const QString HIDDEN_BAKED_CONTENT_FOLDER = "/.baked/";
BakeAssetTask::BakeAssetTask(const AssetHash& assetHash, const AssetPath& assetPath, const QString& filePath)
: _assetHash(assetHash), _assetPath(assetPath), _filePath(filePath) {
}
@ -116,7 +118,7 @@ BakingStatus AssetServer::getAssetStatus(const AssetPath& path, const AssetHash&
return (*it)->isBaking() ? Baking : Pending;
}
if (path.startsWith("/.baked/")) {
if (path.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) {
return Baked;
}
@ -137,7 +139,7 @@ BakingStatus AssetServer::getAssetStatus(const AssetPath& path, const AssetHash&
return Unrelevant;
}
auto bakedPath = "/.baked/" + hash + "/" + bakedFilename;
auto bakedPath = HIDDEN_BAKED_CONTENT_FOLDER + hash + "/" + bakedFilename;
auto jt = _fileMappings.find(bakedPath);
if (jt != _fileMappings.end()) {
if (jt->toString() == hash) {
@ -180,14 +182,14 @@ void AssetServer::createEmptyMetaFile(const AssetHash& hash) {
}
bool AssetServer::hasMetaFile(const AssetHash& hash) {
QString metaFilePath = "/.baked/" + hash + "/meta.json";
QString metaFilePath = HIDDEN_BAKED_CONTENT_FOLDER + hash + "/meta.json";
qDebug() << "in mappings?" << metaFilePath;
return _fileMappings.contains(metaFilePath);
}
bool AssetServer::needsToBeBaked(const AssetPath& path, const AssetHash& assetHash) {
if (path.startsWith("/.baked/")) {
if (path.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) {
return false;
}
@ -208,7 +210,7 @@ bool AssetServer::needsToBeBaked(const AssetPath& path, const AssetHash& assetHa
return false;
}
auto bakedPath = "/.baked/" + assetHash + "/" + bakedFilename;
auto bakedPath = HIDDEN_BAKED_CONTENT_FOLDER + assetHash + "/" + bakedFilename;
return !_fileMappings.contains(bakedPath);
}
@ -395,6 +397,8 @@ void AssetServer::cleanupUnmappedFiles() {
if (removeableFile.remove()) {
qCDebug(asset_server) << "\tDeleted" << fileInfo.fileName() << "from asset files directory since it is unmapped.";
removeBakedPathsForDeletedAsset(fileInfo.fileName());
} else {
qCDebug(asset_server) << "\tAttempt to delete unmapped file" << fileInfo.fileName() << "failed";
}
@ -467,7 +471,7 @@ void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNode
if (!bakedRootFile.isEmpty()) {
// we ran into an asset for which we could have a baked version, let's check if it's ready
bakedAssetPath = "/.baked/" + originalAssetHash + "/" + bakedRootFile;
bakedAssetPath = HIDDEN_BAKED_CONTENT_FOLDER + originalAssetHash + "/" + bakedRootFile;
auto bakedIt = _fileMappings.find(bakedAssetPath);
if (bakedIt != _fileMappings.end()) {
@ -861,6 +865,18 @@ bool pathIsFolder(const AssetPath& path) {
return path.endsWith('/');
}
void AssetServer::removeBakedPathsForDeletedAsset(AssetHash hash) {
// we deleted the file with this hash
// check if we had baked content for that file that should also now be removed
// by calling deleteMappings for the hidden baked content folder for this hash
AssetPathList hiddenBakedFolder { HIDDEN_BAKED_CONTENT_FOLDER + hash + "/" };
qCDebug(asset_server) << "Deleting baked content below" << hiddenBakedFolder << "since" << hash << "was deleted";
deleteMappings(hiddenBakedFolder);
}
bool AssetServer::deleteMappings(AssetPathList& paths) {
// take a copy of the current mappings in case persistence of these deletes fails
auto oldMappings = _fileMappings;
@ -931,6 +947,8 @@ bool AssetServer::deleteMappings(AssetPathList& paths) {
if (removeableFile.remove()) {
qCDebug(asset_server) << "\tDeleted" << hash << "from asset files directory since it is now unmapped.";
removeBakedPathsForDeletedAsset(hash);
} else {
qCDebug(asset_server) << "\tAttempt to delete unmapped file" << hash << "failed";
}
@ -1044,7 +1062,6 @@ bool AssetServer::renameMapping(AssetPath oldPath, AssetPath newPath) {
}
}
static const QString HIDDEN_BAKED_CONTENT_FOLDER = "/.baked/";
static const QString BAKED_ASSET_SIMPLE_FBX_NAME = "asset.fbx";
static const QString BAKED_ASSET_SIMPLE_TEXTURE_NAME = "texture.ktx";

3
assignment-client/src/assets/AssetServer.h
View file

@ -104,6 +104,9 @@ private:
/// Create meta file to describe baked content for original asset
bool createMetaFile(AssetHash originalAssetHash);
/// Remove baked paths when the original asset is deleteds
void removeBakedPathsForDeletedAsset(AssetHash originalAssetHash);
Mappings _fileMappings;
QDir _resourcesDirectory;