|
@@ -215,9 +215,10 @@ var Loader = function ( editor ) {
|
|
|
loader.setDRACOLoader( new THREE.DRACOLoader() );
|
|
|
loader.parse( contents, '', function ( result ) {
|
|
|
|
|
|
- result.scene.name = filename;
|
|
|
- editor.addAnimation( result );
|
|
|
- editor.execute( new AddObjectCommand( result.scene ) );
|
|
|
+ var scene = result.scene;
|
|
|
+ scene.name = filename;
|
|
|
+ editor.addAnimation( scene, result.animations );
|
|
|
+ editor.execute( new AddObjectCommand( scene ) );
|
|
|
|
|
|
} );
|
|
|
|
|
@@ -246,9 +247,10 @@ var Loader = function ( editor ) {
|
|
|
|
|
|
loader.parse( contents, '', function ( result ) {
|
|
|
|
|
|
- result.scene.name = filename;
|
|
|
- editor.addAnimation( result );
|
|
|
- editor.execute( new AddObjectCommand( result.scene ) );
|
|
|
+ var scene = result.scene;
|
|
|
+ scene.name = filename;
|
|
|
+ editor.addAnimation( scene, result.animations );
|
|
|
+ editor.execute( new AddObjectCommand( scene ) );
|
|
|
|
|
|
} );
|
|
|
|
|
@@ -680,8 +682,9 @@ var Loader = function ( editor ) {
|
|
|
var loader = new THREE.GLTFLoader();
|
|
|
loader.parse( file.asArrayBuffer(), '', function ( result ) {
|
|
|
|
|
|
- editor.addAnimation( result );
|
|
|
- editor.execute( new AddObjectCommand( result.scene ) );
|
|
|
+ var scene = result.scene;
|
|
|
+ editor.addAnimation( scene, result.animations );
|
|
|
+ editor.execute( new AddObjectCommand( scene ) );
|
|
|
|
|
|
} );
|
|
|
|
|
@@ -692,8 +695,9 @@ var Loader = function ( editor ) {
|
|
|
var loader = new THREE.GLTFLoader( manager );
|
|
|
loader.parse( file.asText(), '', function ( result ) {
|
|
|
|
|
|
- editor.addAnimation( result );
|
|
|
- editor.execute( new AddObjectCommand( result.scene ) );
|
|
|
+ var scene = result.scene;
|
|
|
+ editor.addAnimation( scene, result.animations );
|
|
|
+ editor.execute( new AddObjectCommand( scene ) );
|
|
|
|
|
|
} );
|
|
|
|