|
@@ -174,7 +174,7 @@ THREE.GLTFLoader = ( function () {
|
|
|
|
|
|
} );
|
|
} );
|
|
|
|
|
|
- parser.parse( function ( scene, scenes, cameras, animations, asset ) {
|
|
|
|
|
|
+ parser.parse( function ( scene, scenes, cameras, animations, json ) {
|
|
|
|
|
|
console.timeEnd( 'GLTFLoader' );
|
|
console.timeEnd( 'GLTFLoader' );
|
|
|
|
|
|
@@ -183,9 +183,13 @@ THREE.GLTFLoader = ( function () {
|
|
scenes: scenes,
|
|
scenes: scenes,
|
|
cameras: cameras,
|
|
cameras: cameras,
|
|
animations: animations,
|
|
animations: animations,
|
|
- asset: asset
|
|
|
|
|
|
+ asset: json.asset,
|
|
|
|
+ parser: parser,
|
|
|
|
+ userData: {}
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+ addUnknownExtensionsToUserData( extensions, glTF, json );
|
|
|
|
+
|
|
onLoad( glTF );
|
|
onLoad( glTF );
|
|
|
|
|
|
}, onError );
|
|
}, onError );
|
|
@@ -1459,10 +1463,9 @@ 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, asset );
|
|
|
|
|
|
+ onLoad( scene, scenes, cameras, animations, json );
|
|
|
|
|
|
} ).catch( onError );
|
|
} ).catch( onError );
|
|
|
|
|