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

Merge pull request #1454 from marauder2k9-torque/FixCompile-imageAsset

Browse source 
Fix after merge of image_asset
This commit is contained in:
Brian Roberts 2025-05-12 19:27:30 -05:00 • committed by GitHub
commit c0d87cd3f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 17 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;

12
Engine/source/assets/assetManager.cpp
View file

@ -119,18 +119,6 @@ void AssetManager::onRemove()
mAssetTagsManifest->deleteObject(); mAssetTagsManifest->deleteObject();
} }
purgeAssets();
for (auto itr = mDeclaredAssets.begin(); itr != mDeclaredAssets.end(); ++itr)
{
delete itr->value;
}
mDeclaredAssets.clear();
// Clear dependency graphs
mAssetDependsOn.clear();
mAssetIsDependedOn.clear();
// Call parent. // Call parent.
Parent::onRemove(); Parent::onRemove();
} }

8
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 = %assetDef.isNamedTarget() ? "Core_Rendering:namedTarget_image" : "ToolsModule:genericAssetIcon_image"; %previewData.previewImage = %this.isNamedTarget() ? "Core_Rendering:namedTarget_image" : "ToolsModule:genericAssetIcon_image";
%previewData.previewLoaded = %assetDef.isNamedTarget() ? true : false; //if image target we are loaded, else mark for loading 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;
@ -61,11 +61,11 @@ function ImageAsset::generatePreviewImage(%this, %previewButton, %forceRegenerat
versionId = 1; versionId = 1;
imageFile = makeFullPath(%previewFilePath); imageFile = makeFullPath(%previewFilePath);
}; };
%previewAssetName = "ToolsModule:" @ %previewAssetName; %previewAssetName = "ToolsModule:" @ %previewAssetName;
%previewImgAssetPath = %previewPath @ %previewAsset.assetName @ ".asset.taml"; %previewImgAssetPath = %previewPath @ %previewAsset.assetName @ ".asset.taml";
%assetImportSuccessful = TAMLWrite(%previewAsset, %previewImgAssetPath); %assetImportSuccessful = TAMLWrite(%previewAsset, %previewImgAssetPath);
%toolsModuleDef = ModuleDatabase.findModule("ToolsModule",1); %toolsModuleDef = ModuleDatabase.findModule("ToolsModule",1);
%success = AssetDatabase.addDeclaredAsset(%toolsModuleDef, %previewImgAssetPath); %success = AssetDatabase.addDeclaredAsset(%toolsModuleDef, %previewImgAssetPath);