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

Fix Asset Server reporting bad status for textures

Browse source
This commit is contained in:
Clement 2019-04-15 19:08:44 -07:00
parent 329a76d4d6
commit 77c5ea5fa8
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -146,7 +146,6 @@ std::pair<AssetUtils::BakingStatus, QString> AssetServer::getAssetStatus(const A
} }
BakedAssetType type = assetTypeForFilename(path); BakedAssetType type = assetTypeForFilename(path);
if (type == BakedAssetType::Undefined) { if (type == BakedAssetType::Undefined) {
return { AssetUtils::Irrelevant, "" }; return { AssetUtils::Irrelevant, "" };
} }
@ -155,6 +154,12 @@ std::pair<AssetUtils::BakingStatus, QString> AssetServer::getAssetStatus(const A
AssetMeta meta; AssetMeta meta;
std::tie(loaded, meta) = readMetaFile(hash); std::tie(loaded, meta) = readMetaFile(hash);
// We create a meta file for Skyboxes at runtime when they get requested
// Otherwise, textures don't get baked by themselves.
if (type == BakedAssetType::Texture && !loaded) {
return { AssetUtils::Irrelevant, "" };
}
QString bakedFilename = bakedFilenameForAssetType(type); QString bakedFilename = bakedFilenameForAssetType(type);
auto bakedPath = getBakeMapping(hash, bakedFilename); auto bakedPath = getBakeMapping(hash, bakedFilename);
if (loaded && !meta.redirectTarget.isEmpty()) { if (loaded && !meta.redirectTarget.isEmpty()) {
@ -240,6 +245,8 @@ bool AssetServer::needsToBeBaked(const AssetUtils::AssetPath& path, const AssetU
return false; return false;
} }
// We create a meta file for Skyboxes at runtime when they get requested
// Otherwise, textures don't get baked by themselves.
if (type == BakedAssetType::Texture && !loaded) { if (type == BakedAssetType::Texture && !loaded) {
return false; return false;
} }