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

Merge pull request #2327 from Areloch/loadCachedDTS

Browse source 
Adds ability to skip loading of cached dts in enumColladaForImport
This commit is contained in:
Areloch 2019-03-30 16:33:37 -05:00 • committed by GitHub
commit 80c036b9b0
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/ts/collada/colladaImport.cpp
View file

@ -126,13 +126,14 @@ static void processNode(GuiTreeViewCtrl* tree, domNode* node, S32 parentID, Scen
} }
} }
DefineEngineFunction( enumColladaForImport, bool, (const char * shapePath, const char * ctrl), , DefineEngineFunction( enumColladaForImport, bool, (const char * shapePath, const char * ctrl, bool loadCachedDts), ("", "", true),
"(string shapePath, GuiTreeViewCtrl ctrl) Collect scene information from " "(string shapePath, GuiTreeViewCtrl ctrl) Collect scene information from "
"a COLLADA file and store it in a GuiTreeView control. This function is " "a COLLADA file and store it in a GuiTreeView control. This function is "
"used by the COLLADA import gui to show a preview of the scene contents " "used by the COLLADA import gui to show a preview of the scene contents "
"prior to import, and is probably not much use for anything else.\n" "prior to import, and is probably not much use for anything else.\n"
"@param shapePath COLLADA filename\n" "@param shapePath COLLADA filename\n"
"@param ctrl GuiTreeView control to add elements to\n" "@param ctrl GuiTreeView control to add elements to\n"
"@param loadCachedDts dictates if it should try and load the cached dts file if it exists"
"@return true if successful, false otherwise\n" "@return true if successful, false otherwise\n"
"@ingroup Editors\n" "@ingroup Editors\n"
"@internal") "@internal")
@ -147,7 +148,7 @@ DefineEngineFunction( enumColladaForImport, bool, (const char * shapePath, const
// Check if a cached DTS is available => no need to import the collada file // Check if a cached DTS is available => no need to import the collada file
// if we can load the DTS instead // if we can load the DTS instead
Torque::Path path(shapePath); Torque::Path path(shapePath);
if (ColladaShapeLoader::canLoadCachedDTS(path)) if (loadCachedDts && ColladaShapeLoader::canLoadCachedDTS(path))
return false; return false;
// Check if this is a Sketchup file (.kmz) and if so, mount the zip filesystem // Check if this is a Sketchup file (.kmz) and if so, mount the zip filesystem