Browse Source

Merge pull request #12761 from cnspaha/patch-3

GLTFLoader: Callback for when asset was read
Mr.doob 7 years ago
parent
commit
eab000e2b3
1 changed files with 5 additions and 3 deletions
  1. 5 3
      examples/js/loaders/GLTFLoader.js

+ 5 - 3
examples/js/loaders/GLTFLoader.js

@@ -143,7 +143,7 @@ THREE.GLTFLoader = ( function () {
 
 
 			} );
 			} );
 
 
-			parser.parse( function ( scene, scenes, cameras, animations ) {
+			parser.parse( function ( scene, scenes, cameras, animations, asset ) {
 
 
 				console.timeEnd( 'GLTFLoader' );
 				console.timeEnd( 'GLTFLoader' );
 
 
@@ -151,7 +151,8 @@ THREE.GLTFLoader = ( function () {
 					scene: scene,
 					scene: scene,
 					scenes: scenes,
 					scenes: scenes,
 					cameras: cameras,
 					cameras: cameras,
-					animations: animations
+					animations: animations,
+					asset: asset
 				};
 				};
 
 
 				onLoad( glTF );
 				onLoad( glTF );
@@ -1218,9 +1219,10 @@ THREE.GLTFLoader = ( function () {
 			var scenes = dependencies.scenes || [];
 			var scenes = dependencies.scenes || [];
 			var scene = scenes[ json.scene || 0 ];
 			var scene = scenes[ json.scene || 0 ];
 			var animations = dependencies.animations || [];
 			var animations = dependencies.animations || [];
+			var asset = json.asset;
 			var cameras = dependencies.cameras || [];
 			var cameras = dependencies.cameras || [];
 
 
-			onLoad( scene, scenes, cameras, animations );
+			onLoad( scene, scenes, cameras, animations, asset );
 
 
 		} ).catch( onError );
 		} ).catch( onError );