Răsfoiți Sursa

Merge pull request #1575 from Areloch/ManualAssetLoadMethodTweak

Shifts the console method for manually invoking load() from being ShapeAsset specific to being generalized to AssetBase
Brian Roberts 1 săptămână în urmă
părinte
comite
c9c775afb4

+ 0 - 6
Engine/source/T3D/assets/ShapeAsset.cpp

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

+ 8 - 0
Engine/source/assets/assetBase_ScriptBinding.h

@@ -92,3 +92,11 @@ DefineEngineMethod(AssetBase, getStatusString, const char*, (), ,
 {
 {
    return object->getAssetErrstrn(object->getStatus());
    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);
+}