提交 36cb827d 编写于 作者: M Mr.doob 提交者: GitHub

Merge pull request #10487 from takahirox/GLTFLoaderScenes

GLTFLoader scenes support
......@@ -54,12 +54,13 @@ THREE.GLTFLoader = ( function () {
} );
parser.parse( function ( scene, cameras, animations ) {
parser.parse( function ( scene, scenes, cameras, animations ) {
console.timeEnd( 'GLTFLoader' );
var glTF = {
"scene": scene,
"scenes": scenes,
"cameras": cameras,
"animations": animations
};
......@@ -632,6 +633,14 @@ THREE.GLTFLoader = ( function () {
var scene = dependencies.scenes[ json.scene ];
var scenes = [];
for ( var name in dependencies.scenes ) {
scenes.push( dependencies.scenes[ name ] );
}
var cameras = [];
for ( var name in dependencies.cameras ) {
......@@ -649,7 +658,7 @@ THREE.GLTFLoader = ( function () {
}
callback( scene, cameras, animations );
callback( scene, scenes, cameras, animations );
} );
......
......@@ -250,7 +250,7 @@
gltf = data;
var object = gltf.scene;
var object = gltf.scene !== undefined ? gltf.scene : gltf.scenes[ 0 ];
var loadEndTime = Date.now();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册