TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prepend symbol for image files

Browse source 
Prepend image filenames in imageassets with "@" symbol so expand and collapse works correctly for files relative to that asset.taml file.
This commit is contained in:
marauder2k7 2025-06-16 08:33:11 +01:00
parent 50f74368b3
commit fc9f221ac0
5 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/assets/assetBase.cpp
View file

@ -226,9 +226,20 @@ StringTableEntry AssetBase::expandAssetFilePath(const char* pAssetFilePath) cons
assetBasePathHint = NULL;
}
// Expand the path with the asset base-path hint.
char assetFilePathBuffer[1024];
Con::expandPath(assetFilePathBuffer, sizeof(assetFilePathBuffer), pAssetFilePath, assetBasePathHint);
if (*pAssetFilePath != '@')
{
// Expand the path with the asset base-path hint.
Con::expandPath(assetFilePathBuffer, sizeof(assetFilePathBuffer), pAssetFilePath, assetBasePathHint);
return StringTable->insert(assetFilePathBuffer);
}
if(!getOwned())
return StringTable->insert(pAssetFilePath);
// Format expanded path taking into account any missing slash.
dSprintf(assetFilePathBuffer, sizeof(assetFilePathBuffer), "%s/%s", mpOwningAssetManager->getAssetPath(getAssetId()), pAssetFilePath + (pAssetFilePath[1] == '/' ? 2 : 1));
return StringTable->insert(assetFilePathBuffer);
}
@ -254,6 +265,11 @@ StringTableEntry AssetBase::collapseAssetFilePath(const char* pAssetFilePath) co
char assetFilePathBuffer[1024];
if (*pAssetFilePath == '@')
{
return StringTable->insert(pAssetFilePath);
}
// Is the asset not owned or private?
if (!getOwned() || getAssetPrivate())
{
@ -272,7 +288,7 @@ StringTableEntry AssetBase::collapseAssetFilePath(const char* pAssetFilePath) co
StringTableEntry relativePath = Platform::makeRelativePathName(pAssetFilePath, assetBasePath);
// Format the collapsed path.
dSprintf(assetFilePathBuffer, sizeof(assetFilePathBuffer), "%s", relativePath);
dSprintf(assetFilePathBuffer, sizeof(assetFilePathBuffer), "@%s", relativePath);
}
else
{