|
@@ -111,8 +111,6 @@ THREE.GLTFLoader = ( function () {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- this.onAssetRead( json.asset );
|
|
|
|
-
|
|
|
|
if ( json.extensionsUsed ) {
|
|
if ( json.extensionsUsed ) {
|
|
|
|
|
|
if ( json.extensionsUsed.indexOf( EXTENSIONS.KHR_LIGHTS ) >= 0 ) {
|
|
if ( json.extensionsUsed.indexOf( EXTENSIONS.KHR_LIGHTS ) >= 0 ) {
|
|
@@ -145,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' );
|
|
|
|
|
|
@@ -153,16 +151,15 @@ 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 );
|
|
|
|
|
|
}, onError );
|
|
}, onError );
|
|
|
|
|
|
- },
|
|
|
|
-
|
|
|
|
- onAssetRead: function ( assetValue ) { }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
};
|
|
};
|
|
|
|
|
|
@@ -1375,10 +1372,11 @@ 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;
|
|
|
|
|
|
parser.getDependencies( 'camera' ).then( function ( cameras ) {
|
|
parser.getDependencies( 'camera' ).then( function ( cameras ) {
|
|
|
|
|
|
- onLoad( scene, scenes, cameras, animations );
|
|
|
|
|
|
+ onLoad( scene, scenes, cameras, animations, asset );
|
|
|
|
|
|
} ).catch( onError );
|
|
} ).catch( onError );
|
|
|
|
|