JSONLoader: More robust metadata.type check. Fixes #7266.

c58ef52e · Mr.doob · 80c4bbab · c58ef52e
隐藏空白更改
内联并排

Showing with 13 addition and 7 deletion

src/loaders/JSONLoader.js src/loaders/JSONLoader.js +13 -7

未找到文件。
--- a/src/loaders/JSONLoader.js
+++ b/src/loaders/JSONLoader.js
@@ -53,17 +53,23 @@ THREE.JSONLoader.prototype = {

 			if ( metadata !== undefined ) {

-				if ( metadata.type === 'object' ) {
+				var type = metadata.type;

-					console.error( 'THREE.JSONLoader: ' + url + ' should be loaded with THREE.ObjectLoader instead.' );
-					return;
+				if ( type !== undefined ) {

-				}
+					if ( type.toLowerCase() === 'object' ) {
+
+						console.error( 'THREE.JSONLoader: ' + url + ' should be loaded with THREE.ObjectLoader instead.' );
+						return;
+
+					}
+
+					if ( type.toLowerCase() === 'scene' ) {

-				if ( metadata.type === 'scene' ) {
+						console.error( 'THREE.JSONLoader: ' + url + ' should be loaded with THREE.SceneLoader instead.' );
+						return;

-					console.error( 'THREE.JSONLoader: ' + url + ' should be loaded with THREE.SceneLoader instead.' );
-					return;
+					}

 				}