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

Merge branch 'AssimpWIP' of https://github.com/Areloch/Torque3D into development

Browse source
This commit is contained in:
Areloch 2019-05-04 16:25:16 -05:00
commit 951594259f
909 changed files with 367086 additions and 2721 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Templates/BaseGame/game/tools/gui/colladaImport.ed.gui
View file

@ -1751,3 +1751,21 @@ function convertColladaModels(%pattern)
$collada::forceLoadDAE = false;
}
function showImportDialog(%shapePath, %cmd)
{
%this.path = %shapePath;
%this.cmd = %cmd;
if ( fileExt(%shapePath) $= ".dts" || fileExt(%shapePath) $= ".dsq"
|| fileExt(%shapePath) $= ".dae" || fileExt(%shapePath) $= ".kmz" )
{
// Regular Load
ColladaImportDlg.showDialog(%shapePath, %cmd);
} else if ( isSupportedFormat(stripChars(fileExt(%shapePath), ".")) )
{
// Assimp Load
if ( isObject(AssimpImportDlg) )
AssimpImportDlg.showDialog(%shapePath, %cmd);
}
}