mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-19 20:24:49 +00:00
Merge pull request #1556 from Azaezel/alpha41/addMeshAug
allow the addmesh command to take shapeassets as an entry
This commit is contained in:
commit
a8d370038a
|
|
@ -1535,9 +1535,27 @@ DefineTSShapeConstructorMethod(addMesh, bool, (const char* meshName, const char*
|
|||
"%this.addMesh( \"SimpleShape10\", \"./testShape.dae\", \"MyMesh2\", "" );\n"
|
||||
"@endtsexample\n")
|
||||
{
|
||||
const char* targShape = StringTable->EmptyString();
|
||||
|
||||
bool found = false;
|
||||
|
||||
if (AssetDatabase.isDeclaredAsset(srcShape))
|
||||
{
|
||||
ShapeAsset* assetShape = AssetDatabase.acquireAsset<ShapeAsset>(srcShape);
|
||||
if (assetShape)
|
||||
{
|
||||
targShape = assetShape->getShapeFile();
|
||||
//Con::printf("Found assetID %s for assetName %s; shape file path %s", assetShape->getAssetId(), srcShape, targShape);
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!found)
|
||||
targShape = srcShape;
|
||||
|
||||
// Load the shape source file
|
||||
char filenameBuf[1024];
|
||||
Con::expandScriptFilename(filenameBuf, sizeof(filenameBuf), srcShape);
|
||||
Con::expandScriptFilename(filenameBuf, sizeof(filenameBuf), targShape);
|
||||
|
||||
Resource<TSShape> hSrcShape = ResourceManager::get().load(filenameBuf);
|
||||
if (!bool(hSrcShape))
|
||||
|
|
|
|||
Loading…
Reference in a new issue