TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 06:34:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'MiscQOLFixes20210828' of https://github.com/Areloch/Torque3D into Preview4_0

Browse source
This commit is contained in:
Areloch 2021-09-01 17:44:43 -05:00
commit 25a32cba2a
26 changed files with 330 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -438,15 +438,15 @@ ImageAsset::ImageTypes ImageAsset::getImageTypeFromName(const char* name)
}
DefineEngineMethod(ImageAsset, getImagePath, const char*, (), ,
"Creates an instance of the given GameObject given the asset definition.\n"
"@return The GameObject entity created from the asset.")
"Gets the image filepath of this asset.\n"
"@return File path of the image file.")
{
return object->getImagePath();
}
DefineEngineMethod(ImageAsset, getImageInfo, const char*, (), ,
"Creates an instance of the given GameObject given the asset definition.\n"
"@return The GameObject entity created from the asset.")
"Gets the info and properties of the image.\n"
"@return The info/properties of the image.")
{
return object->getImageInfo();
}

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

@ -429,6 +429,13 @@ void TerrainAsset::copyTo(SimObject* object)
Parent::copyTo(object);
}
DefineEngineMethod(TerrainAsset, getTerrainFilePath, const char*, (), ,
"Gets the terrain filepath of this asset.\n"
"@return File path of the terrain file.")
{
return object->getTerrainFilePath();
}
//-----------------------------------------------------------------------------
// GuiInspectorTypeAssetId
//-----------------------------------------------------------------------------