diff --git a/source/engine/import/importer.js b/source/engine/import/importer.js index 5e8396d..a73d39a 100644 --- a/source/engine/import/importer.js +++ b/source/engine/import/importer.js @@ -119,7 +119,7 @@ export class Importer }); }); }, - onFileProgress : callbacks.onFileProgress, + onFileListProgress : callbacks.onFileListProgress, onFileLoadProgress : callbacks.onFileLoadProgress }); } @@ -152,7 +152,7 @@ export class Importer } this.fileList.GetContent ({ onReady : callbacks.onReady, - onFileProgress : callbacks.onFileProgress, + onFileListProgress : callbacks.onFileListProgress, onFileLoadProgress : callbacks.onFileLoadProgress }); } diff --git a/source/engine/import/importerfiles.js b/source/engine/import/importerfiles.js index e507db1..0600428 100644 --- a/source/engine/import/importerfiles.js +++ b/source/engine/import/importerfiles.js @@ -84,7 +84,7 @@ export class ImporterFileList { RunTasks (this.files.length, { runTask : (index, onTaskComplete) => { - callbacks.onFileProgress (index, this.files.length); + callbacks.onFileListProgress (index, this.files.length); this.GetFileContent (this.files[index], { onReady : onTaskComplete, onProgress : callbacks.onFileLoadProgress diff --git a/source/engine/threejs/threemodelloader.js b/source/engine/threejs/threemodelloader.js index 02dd1a3..fc8c20b 100644 --- a/source/engine/threejs/threemodelloader.js +++ b/source/engine/threejs/threemodelloader.js @@ -34,8 +34,8 @@ export class ThreeModelLoader onLoadStart : () => { callbacks.onLoadStart (); }, - onFileProgress : (current, total) => { - callbacks.onFileProgress (current, total); + onFileListProgress : (current, total) => { + callbacks.onFileListProgress (current, total); }, onFileLoadProgress : (current, total) => { callbacks.onFileLoadProgress (current, total); diff --git a/source/engine/viewer/embeddedviewer.js b/source/engine/viewer/embeddedviewer.js index 892b31a..def08db 100644 --- a/source/engine/viewer/embeddedviewer.js +++ b/source/engine/viewer/embeddedviewer.js @@ -87,7 +87,7 @@ export class EmbeddedViewer progressDiv.innerHTML = 'Loading model...'; this.parentElement.appendChild (progressDiv); }, - onFileProgress : (current, total) => { + onFileListProgress : (current, total) => { }, onFileLoadProgress : (current, total) => { }, diff --git a/source/website/threemodelloaderui.js b/source/website/threemodelloaderui.js index 2b5679f..3d561b7 100644 --- a/source/website/threemodelloaderui.js +++ b/source/website/threemodelloaderui.js @@ -28,7 +28,7 @@ export class ThreeModelLoaderUI progressDialog.Init ('Loading Model'); progressDialog.Open (); }, - onFileProgress : (current, total) => { + onFileListProgress : (current, total) => { progressDialog.SetProgress (null); progressDialog.SetText ('Loading File ' + (current + 1).toString () + '/' + total.toString ()); }, diff --git a/test/tests/exportimport_test.js b/test/tests/exportimport_test.js index 90a2872..9678390 100644 --- a/test/tests/exportimport_test.js +++ b/test/tests/exportimport_test.js @@ -121,7 +121,7 @@ function ExportImport (model, format, extension, onReady) onLoadStart : function () { }, - onFileProgress : (current, total) => { + onFileListProgress : (current, total) => { }, onFileLoadProgress : (current, total) => { }, diff --git a/test/tests/importer_test.js b/test/tests/importer_test.js index a2176b3..23e7525 100644 --- a/test/tests/importer_test.js +++ b/test/tests/importer_test.js @@ -12,7 +12,7 @@ function ImportFilesWithImporter (importer, files, callbacks) onLoadStart : function () { }, - onFileProgress : (current, total) => { + onFileListProgress : (current, total) => { }, onFileLoadProgress : (current, total) => { }, @@ -272,7 +272,7 @@ describe ('Importer Test', function () { onLoadStart : function () { }, - onFileProgress : (current, total) => { + onFileListProgress : (current, total) => { }, onFileLoadProgress : (current, total) => { },