TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1575 from Areloch/ManualAssetLoadMethodTweak

Browse source 
Shifts the console method for manually invoking load() from being ShapeAsset specific to being generalized to AssetBase
This commit is contained in:
Brian Roberts 2025-10-13 10:37:02 -05:00 committed by GitHub
parent 1277b1a347 6b3fcd8e74
commit c9c775afb4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/assets/ShapeAsset.cpp
View file

@ -755,12 +755,6 @@ DefineEngineMethod(ShapeAsset, getStatusString, String, (), , "get status string
return ShapeAsset::getAssetErrstrn(object->getStatus());
}
DefineEngineMethod(ShapeAsset, load, String, (), , "get status string")\
{
U32 code = object->load();
return ShapeAsset::getAssetErrstrn(code);
}
#ifdef TORQUE_TOOLS
DefineEngineMethod(ShapeAsset, generateCachedPreviewImage, const char*, (S32 resolution, const char* overrideMaterialName), (256, ""),
"Generates a baked preview image of the given shapeAsset. Only really used for generating Asset Browser icons.\n"

8
Engine/source/assets/assetBase_ScriptBinding.h
View file

@ -92,3 +92,11 @@ DefineEngineMethod(AssetBase, getStatusString, const char*, (), ,
{
return object->getAssetErrstrn(object->getStatus());
}
DefineEngineMethod(AssetBase, load, String, (), ,
"Manually initates a loading of the asset and it's contents.\n"
"@return The status code of the loading results.\n")\
{
U32 code = object->load();
return object->getAssetErrstrn(code);
}