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

named target functionality

Browse source
This commit is contained in:
marauder2k7 2025-03-25 18:22:26 +00:00
parent 6640cae0d7
commit 987ff90467
3 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -332,6 +332,9 @@ void ImageAsset::initializeAsset(void)
Parent::initializeAsset();
// Ensure the image-file is expanded.
if (isNamedTarget())
return;
mImageFile = expandAssetFilePath(mImageFile);
}
@ -378,6 +381,13 @@ void ImageAsset::setImageFile(StringTableEntry pImageFile)
if (mLoadedState == Ok)
Torque::FS::RemoveChangeNotification(mImageFile, this, &ImageAsset::_onFileChanged);
if (String(pImageFile).startsWith("#"))
{
mImageFile = StringTable->insert(pImageFile);
refreshAsset();
return;
}
mImageFile = getOwned() ? expandAssetFilePath(pImageFile) : StringTable->insert(pImageFile);
refreshAsset();
@ -411,6 +421,12 @@ U32 ImageAsset::load()
if (!Torque::FS::IsFile(mImageFile))
{
if (isNamedTarget())
{
mLoadedState = Ok;
return mLoadedState;
}
Con::errorf("ImageAsset::initializeAsset: Attempted to load file %s but it was not valid!", mImageFile);
mLoadedState = BadFileReference;
return mLoadedState;
@ -428,6 +444,9 @@ GFXTexHandle ImageAsset::getTexture(GFXTextureProfile* requestedProfile)
{
load();
if (isNamedTarget())
return getNamedTarget()->getTexture();
if (mLoadedState == Ok)
{
if (mResourceMap.contains(requestedProfile))
@ -554,6 +573,9 @@ void ImageAsset::onTamlPreWrite(void)
// Call parent.
Parent::onTamlPreWrite();
if (isNamedTarget())
return;
// Ensure the image-file is collapsed.
mImageFile = getOwned() ? collapseAssetFilePath(mImageFile) : mImageFile;
}
@ -563,6 +585,9 @@ void ImageAsset::onTamlPostWrite(void)
// Call parent.
Parent::onTamlPostWrite();
if (isNamedTarget())
return;
// Ensure the image-file is expanded.
mImageFile = getOwned() ? expandAssetFilePath(mImageFile) : mImageFile;
}