浏览代码

GLTF(2)Loader: Return scenes[0] as scene if default scene is not specified

Takahiro 8 年之前
父节点
当前提交
266080214f
共有 3 个文件被更改,包括 5 次插入5 次删除
  1. 2 2
      examples/js/loaders/GLTF2Loader.js
  2. 2 2
      examples/js/loaders/GLTFLoader.js
  3. 1 1
      examples/webgl_loader_gltf.html

+ 2 - 2
examples/js/loaders/GLTF2Loader.js

@@ -858,8 +858,6 @@ THREE.GLTF2Loader = ( function () {
 
 		] ).then( function ( dependencies ) {
 
-			var scene = dependencies.scenes[ json.scene ];
-
 			var scenes = [];
 
 			for ( var name in dependencies.scenes ) {
@@ -868,6 +866,8 @@ THREE.GLTF2Loader = ( function () {
 
 			}
 
+			var scene = json.scene !== undefined ? dependencies.scenes[ json.scene ] : scenes[ 0 ];
+
 			var cameras = [];
 
 			for ( var name in dependencies.cameras ) {

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

@@ -882,8 +882,6 @@ THREE.GLTFLoader = ( function () {
 
 		] ).then( function ( dependencies ) {
 
-			var scene = dependencies.scenes[ json.scene ];
-
 			var scenes = [];
 
 			for ( var name in dependencies.scenes ) {
@@ -892,6 +890,8 @@ THREE.GLTFLoader = ( function () {
 
 			}
 
+			var scene = json.scene !== undefined ? dependencies.scenes[ json.scene ] : scenes[ 0 ];
+
 			var cameras = [];
 
 			for ( var name in dependencies.cameras ) {

+ 1 - 1
examples/webgl_loader_gltf.html

@@ -228,7 +228,7 @@
 
 					gltf = data;
 
-					var object = gltf.scene !== undefined ? gltf.scene : gltf.scenes[ 0 ];
+					var object = gltf.scene;
 
 					status.innerHTML = "Load time: " + ( performance.now() - loadStartTime ).toFixed( 2 ) + " ms.";