Explorar el Código

Merge pull request #10487 from takahirox/GLTFLoaderScenes

GLTFLoader scenes support
Mr.doob hace 8 años
padre
commit
36cb827dae
Se han modificado 2 ficheros con 12 adiciones y 3 borrados
  1. 11 2
      examples/js/loaders/GLTFLoader.js
  2. 1 1
      examples/webgl_loader_gltf.html

+ 11 - 2
examples/js/loaders/GLTFLoader.js

@@ -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 );
 
 		} );
 

+ 1 - 1
examples/webgl_loader_gltf.html

@@ -250,7 +250,7 @@
 
 					gltf = data;
 
-					var object = gltf.scene;
+					var object = gltf.scene !== undefined ? gltf.scene : gltf.scenes[ 0 ];
 
 					var loadEndTime = Date.now();