Doni/ModelHandle
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename callback.

Browse Source
This commit is contained in:
kovacsv 2022-07-02 22:14:10 +02:00
parent 784715e89c
commit 235149c325
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/engine/import/importer.js
View File

@ -119,7 +119,7 @@ export class Importer
}); });
}); });
}, },
onFileProgress : callbacks.onFileProgress, onFileListProgress : callbacks.onFileListProgress,
onFileLoadProgress : callbacks.onFileLoadProgress onFileLoadProgress : callbacks.onFileLoadProgress
}); });
} }
@ -152,7 +152,7 @@ export class Importer
} }
this.fileList.GetContent ({ this.fileList.GetContent ({
onReady : callbacks.onReady, onReady : callbacks.onReady,
onFileProgress : callbacks.onFileProgress, onFileListProgress : callbacks.onFileListProgress,
onFileLoadProgress : callbacks.onFileLoadProgress onFileLoadProgress : callbacks.onFileLoadProgress
}); });
} }

2
source/engine/import/importerfiles.js
View File

@ -84,7 +84,7 @@ export class ImporterFileList
{ {
RunTasks (this.files.length, { RunTasks (this.files.length, {
runTask : (index, onTaskComplete) => { runTask : (index, onTaskComplete) => {
callbacks.onFileProgress (index, this.files.length); callbacks.onFileListProgress (index, this.files.length);
this.GetFileContent (this.files[index], { this.GetFileContent (this.files[index], {
onReady : onTaskComplete, onReady : onTaskComplete,
onProgress : callbacks.onFileLoadProgress onProgress : callbacks.onFileLoadProgress

4
source/engine/threejs/threemodelloader.js
View File

@ -34,8 +34,8 @@ export class ThreeModelLoader
onLoadStart : () => { onLoadStart : () => {
callbacks.onLoadStart (); callbacks.onLoadStart ();
}, },
onFileProgress : (current, total) => { onFileListProgress : (current, total) => {
callbacks.onFileProgress (current, total); callbacks.onFileListProgress (current, total);
}, },
onFileLoadProgress : (current, total) => { onFileLoadProgress : (current, total) => {
callbacks.onFileLoadProgress (current, total); callbacks.onFileLoadProgress (current, total);

2
source/engine/viewer/embeddedviewer.js
View File

@ -87,7 +87,7 @@ export class EmbeddedViewer
progressDiv.innerHTML = 'Loading model...'; progressDiv.innerHTML = 'Loading model...';
this.parentElement.appendChild (progressDiv); this.parentElement.appendChild (progressDiv);
}, },
onFileProgress : (current, total) => { onFileListProgress : (current, total) => {
}, },
onFileLoadProgress : (current, total) => { onFileLoadProgress : (current, total) => {
}, },

2
source/website/threemodelloaderui.js
View File

@ -28,7 +28,7 @@ export class ThreeModelLoaderUI
progressDialog.Init ('Loading Model'); progressDialog.Init ('Loading Model');
progressDialog.Open (); progressDialog.Open ();
}, },
onFileProgress : (current, total) => { onFileListProgress : (current, total) => {
progressDialog.SetProgress (null); progressDialog.SetProgress (null);
progressDialog.SetText ('Loading File ' + (current + 1).toString () + '/' + total.toString ()); progressDialog.SetText ('Loading File ' + (current + 1).toString () + '/' + total.toString ());
}, },

2
test/tests/exportimport_test.js
View File

@ -121,7 +121,7 @@ function ExportImport (model, format, extension, onReady)
onLoadStart : function () { onLoadStart : function () {
}, },
onFileProgress : (current, total) => { onFileListProgress : (current, total) => {
}, },
onFileLoadProgress : (current, total) => { onFileLoadProgress : (current, total) => {
}, },

4
test/tests/importer_test.js
View File

@ -12,7 +12,7 @@ function ImportFilesWithImporter (importer, files, callbacks)
onLoadStart : function () { onLoadStart : function () {
}, },
onFileProgress : (current, total) => { onFileListProgress : (current, total) => {
}, },
onFileLoadProgress : (current, total) => { onFileLoadProgress : (current, total) => {
}, },
@ -272,7 +272,7 @@ describe ('Importer Test', function () {
onLoadStart : function () { onLoadStart : function () {
}, },
onFileProgress : (current, total) => { onFileListProgress : (current, total) => {
}, },
onFileLoadProgress : (current, total) => { onFileLoadProgress : (current, total) => {
}, },