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

Merge pull request #12764 from SimonWalton-HiFi/bakedassettype-enum

Browse source 
Make BakedAssetType a scoped enum
This commit is contained in:
Stephen Birarda 2018-04-17 11:50:14 -07:00 committed by GitHub
commit a0e1d2e54e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,13 +61,13 @@ static const ScriptBakeVersion CURRENT_SCRIPT_BAKE_VERSION = (ScriptBakeVersion)
BakedAssetType assetTypeForExtension(const QString& extension) { BakedAssetType assetTypeForExtension(const QString& extension) {
auto extensionLower = extension.toLower(); auto extensionLower = extension.toLower();
if (BAKEABLE_MODEL_EXTENSIONS.contains(extensionLower)) { if (BAKEABLE_MODEL_EXTENSIONS.contains(extensionLower)) {
return Model; return BakedAssetType::Model;
} else if (BAKEABLE_TEXTURE_EXTENSIONS.contains(extensionLower.toLocal8Bit())) { } else if (BAKEABLE_TEXTURE_EXTENSIONS.contains(extensionLower.toLocal8Bit())) {
return Texture; return BakedAssetType::Texture;
} else if (BAKEABLE_SCRIPT_EXTENSIONS.contains(extensionLower)) { } else if (BAKEABLE_SCRIPT_EXTENSIONS.contains(extensionLower)) {
return Script; return BakedAssetType::Script;
} }
return Undefined; return BakedAssetType::Undefined;
} }
BakedAssetType assetTypeForFilename(const QString& filename) { BakedAssetType assetTypeForFilename(const QString& filename) {
@ -82,11 +82,11 @@ BakedAssetType assetTypeForFilename(const QString& filename) {
QString bakedFilenameForAssetType(BakedAssetType type) { QString bakedFilenameForAssetType(BakedAssetType type) {
switch (type) { switch (type) {
case Model: case BakedAssetType::Model:
return BAKED_MODEL_SIMPLE_NAME; return BAKED_MODEL_SIMPLE_NAME;
case Texture: case BakedAssetType::Texture:
return BAKED_TEXTURE_SIMPLE_NAME; return BAKED_TEXTURE_SIMPLE_NAME;
case Script: case BakedAssetType::Script:
return BAKED_SCRIPT_SIMPLE_NAME; return BAKED_SCRIPT_SIMPLE_NAME;
default: default:
return ""; return "";
@ -95,11 +95,11 @@ QString bakedFilenameForAssetType(BakedAssetType type) {
BakeVersion currentBakeVersionForAssetType(BakedAssetType type) { BakeVersion currentBakeVersionForAssetType(BakedAssetType type) {
switch (type) { switch (type) {
case Model: case BakedAssetType::Model:
return (BakeVersion)CURRENT_MODEL_BAKE_VERSION; return (BakeVersion)CURRENT_MODEL_BAKE_VERSION;
case Texture: case BakedAssetType::Texture:
return (BakeVersion)CURRENT_TEXTURE_BAKE_VERSION; return (BakeVersion)CURRENT_TEXTURE_BAKE_VERSION;
case Script: case BakedAssetType::Script:
return (BakeVersion)CURRENT_SCRIPT_BAKE_VERSION; return (BakeVersion)CURRENT_SCRIPT_BAKE_VERSION;
default: default:
return 0; return 0;
@ -222,7 +222,7 @@ bool AssetServer::needsToBeBaked(const AssetUtils::AssetPath& path, const AssetU
BakedAssetType type = assetTypeForFilename(path); BakedAssetType type = assetTypeForFilename(path);
if (type == Undefined) { if (type == BakedAssetType::Undefined) {
return false; return false;
} }
@ -241,7 +241,7 @@ bool AssetServer::needsToBeBaked(const AssetUtils::AssetPath& path, const AssetU
AssetMeta meta; AssetMeta meta;
std::tie(loaded, meta) = readMetaFile(assetHash); std::tie(loaded, meta) = readMetaFile(assetHash);
if (type == Texture && !loaded) { if (type == BakedAssetType::Texture && !loaded) {
return false; return false;
} }
@ -1546,7 +1546,7 @@ bool AssetServer::setBakingEnabled(const AssetUtils::AssetPathList& paths, bool
auto it = _fileMappings.find(path); auto it = _fileMappings.find(path);
if (it != _fileMappings.end()) { if (it != _fileMappings.end()) {
auto type = assetTypeForFilename(path); auto type = assetTypeForFilename(path);
if (type == Undefined) { if (type == BakedAssetType::Undefined) {
continue; continue;
} }
QString bakedFilename = bakedFilenameForAssetType(type); QString bakedFilename = bakedFilenameForAssetType(type);

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

@ -27,7 +27,7 @@ using BakeVersion = int;
static const BakeVersion INITIAL_BAKE_VERSION = 0; static const BakeVersion INITIAL_BAKE_VERSION = 0;
static const BakeVersion NEEDS_BAKING_BAKE_VERSION = -1; static const BakeVersion NEEDS_BAKING_BAKE_VERSION = -1;
enum BakedAssetType : int { enum class BakedAssetType : int {
Model = 0, Model = 0,
Texture, Texture,
Script, Script,