TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

is named target

Browse source 
clear out texHandles on teardown of imageAssets.
This commit is contained in:
marauder2k7 2025-05-12 22:17:01 +01:00
parent 18b1b6d1d0
commit f86497434e
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -163,6 +163,13 @@ ImageAsset::ImageAsset() :
ImageAsset::~ImageAsset() ImageAsset::~ImageAsset()
{ {
ImageTextureMap::iterator resIter = mResourceMap.begin();
for (; resIter != mResourceMap.end(); ++resIter)
{
resIter->value.free();
}
mResourceMap.clear();
} }

3
Engine/source/T3D/assets/ImageAsset.h
View file

@ -62,6 +62,7 @@ class ImageAsset : public AssetBase
typedef AssetPtr<ImageAsset> ConcreteAssetPtr; typedef AssetPtr<ImageAsset> ConcreteAssetPtr;
public: public:
typedef HashMap<GFXTextureProfile*, GFXTexHandle> ImageTextureMap;
/// The different types of image use cases /// The different types of image use cases
enum ImageTypes enum ImageTypes
{ {
@ -137,7 +138,7 @@ private:
bool mIsHDRImage; bool mIsHDRImage;
GFXTexHandle mTextureHandle; GFXTexHandle mTextureHandle;
ImageTypes mImageType; ImageTypes mImageType;
HashMap<GFXTextureProfile*, GFXTexHandle> mResourceMap; ImageTextureMap mResourceMap;
bool mIsNamedTarget; bool mIsNamedTarget;
S32 mImageWidth; S32 mImageWidth;
S32 mImageHeight; S32 mImageHeight;

4
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/image.tscript
View file

@ -4,8 +4,8 @@ function ImageAsset::buildBrowserElement(%this, %previewData)
{ {
//%module = %this.dirHandler.getModuleFromAddress(makeRelativePath(filePath(%assetDef.getImagePath()))); //%module = %this.dirHandler.getModuleFromAddress(makeRelativePath(filePath(%assetDef.getImagePath())));
%previewData.previewImage = "ToolsModule:genericAssetIcon_image"; %previewData.previewImage = %this.isNamedTarget() ? "Core_Rendering:namedTarget_image" : "ToolsModule:genericAssetIcon_image";
%previewData.previewLoaded = false; //this marks it for loading progressively later %previewData.previewLoaded = %this.isNamedTarget() ? true : false;//this marks it for loading progressively later
%previewData.assetName = %this.assetName; %previewData.assetName = %this.assetName;
%previewData.assetPath = %this.scriptFile; %previewData.assetPath = %this.scriptFile;