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

Move constant to central location

Browse source
This commit is contained in:
Atlante45 2017-08-31 13:01:56 -07:00
parent da2bede6fe
commit 764e5d2e4c
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,8 +53,6 @@ static QStringList BAKEABLE_TEXTURE_EXTENSIONS;
static const QString BAKED_MODEL_SIMPLE_NAME = "asset.fbx"; static const QString BAKED_MODEL_SIMPLE_NAME = "asset.fbx";
static const QString BAKED_TEXTURE_SIMPLE_NAME = "texture.ktx"; 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) BakeAssetTask::BakeAssetTask(const AssetHash& assetHash, const AssetPath& assetPath, const QString& filePath)
: _assetHash(assetHash), _assetPath(assetPath), _filePath(filePath) { : _assetHash(assetHash), _assetPath(assetPath), _filePath(filePath) {
} }

1
interface/src/scripting/AssetMappingsScriptingInterface.cpp
View file

@ -203,7 +203,6 @@ void AssetMappingModel::refresh() {
for (auto& mapping : mappings) { for (auto& mapping : mappings) {
auto& path = mapping.first; auto& path = mapping.first;
const QString HIDDEN_BAKED_CONTENT_FOLDER = "/.baked/";
if (path.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) { if (path.startsWith(HIDDEN_BAKED_CONTENT_FOLDER)) {
// Hide baked mappings // Hide baked mappings
continue; continue;

2
libraries/networking/src/AssetUtils.h
View file

@ -33,6 +33,8 @@ const QString ASSET_FILE_PATH_REGEX_STRING = "^(\\/[^\\/\\0]+)+$";
const QString ASSET_PATH_REGEX_STRING = "^\\/([^\\/\\0]+(\\/)?)+$"; const QString ASSET_PATH_REGEX_STRING = "^\\/([^\\/\\0]+(\\/)?)+$";
const QString ASSET_HASH_REGEX_STRING = QString("^[a-fA-F0-9]{%1}$").arg(SHA256_HASH_HEX_LENGTH); const QString ASSET_HASH_REGEX_STRING = QString("^[a-fA-F0-9]{%1}$").arg(SHA256_HASH_HEX_LENGTH);
const QString HIDDEN_BAKED_CONTENT_FOLDER = "/.baked/";
enum AssetServerError : uint8_t { enum AssetServerError : uint8_t {
NoError = 0, NoError = 0,
AssetNotFound, AssetNotFound,