Lazy dependencies loading

Removal of an additional parameter replace const js loaders change markDefs setLazyLoad()
mrdoob · Jan 17, 2020 · cc24b56 · cc24b56
1 parent 4541808
commit cc24b56
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/examples/js/loaders/GLTFLoader.js b/examples/js/loaders/GLTFLoader.js
@@ -14,6 +14,7 @@ THREE.GLTFLoader = ( function () {
 
 		this.dracoLoader = null;
 		this.ddsLoader = null;
+		this.lazy = false;
 
 	}
 
@@ -96,6 +97,12 @@ THREE.GLTFLoader = ( function () {
 
 		},
 
+		setLazyLoad: function ( lazy ) {
+
+			this.lazy = lazy;
+
+		},
+
 		setDRACOLoader: function ( dracoLoader ) {
 
 			this.dracoLoader = dracoLoader;
@@ -214,7 +221,17 @@ THREE.GLTFLoader = ( function () {
 
 			} );
 
-			parser.parse( onLoad, onError );
+			if ( this.lazy ) {
+
+				parser.markDefs();
+
+				onLoad( { parser: parser } );
+
+			} else {
+
+				parser.parse( onLoad, onError );
+
+			}
 
 		}
 

diff --git a/examples/jsm/loaders/GLTFLoader.d.ts b/examples/jsm/loaders/GLTFLoader.d.ts
@@ -31,12 +31,13 @@ export class GLTFLoader extends Loader {
 	constructor( manager?: LoadingManager );
 	dracoLoader: DRACOLoader | null;
 	ddsLoader: DDSLoader | null;
+	lazy: boolean | false;
 
 	load( url: string, onLoad: ( gltf: GLTF ) => void, onProgress?: ( event: ProgressEvent ) => void, onError?: ( event: ErrorEvent ) => void ) : void;
 	setDRACOLoader( dracoLoader: DRACOLoader ): GLTFLoader;
 	setDDSLoader( ddsLoader: DDSLoader ): GLTFLoader;
 	parse( data: ArrayBuffer | string, path: string, onLoad: ( gltf: GLTF ) => void, onError?: ( event: ErrorEvent ) => void ) : void;
-
+	setLazyLoad( lazy: boolean ) : void;
 }
 
 export class GLTFParser {

diff --git a/examples/jsm/loaders/GLTFLoader.js b/examples/jsm/loaders/GLTFLoader.js
@@ -81,6 +81,7 @@ var GLTFLoader = ( function () {
 
 		this.dracoLoader = null;
 		this.ddsLoader = null;
+		this.lazy = false;
 
 	}
 
@@ -163,6 +164,12 @@ var GLTFLoader = ( function () {
 
 		},
 
+		setLazyLoad: function ( lazy ) {
+
+			this.lazy = lazy;
+
+		},
+
 		setDRACOLoader: function ( dracoLoader ) {
 
 			this.dracoLoader = dracoLoader;
@@ -281,7 +288,17 @@ var GLTFLoader = ( function () {
 
 			} );
 
-			parser.parse( onLoad, onError );
+			if ( this.lazy ) {
+
+				parser.markDefs();
+
+				onLoad( { parser: parser } );
+
+			} else {
+
+				parser.parse( onLoad, onError );
+
+			}
 
 		}