瀏覽代碼

ObjectLoader: Add check for old file format. See #9944.

Mr.doob 8 年之前
父節點
當前提交
8daaf72700
共有 1 個文件被更改,包括 11 次插入1 次删除
  1. 11 1
      src/loaders/ObjectLoader.js

+ 11 - 1
src/loaders/ObjectLoader.js

@@ -56,7 +56,17 @@ Object.assign( ObjectLoader.prototype, {
 		var loader = new XHRLoader( scope.manager );
 		var loader = new XHRLoader( scope.manager );
 		loader.load( url, function ( text ) {
 		loader.load( url, function ( text ) {
 
 
-			scope.parse( JSON.parse( text ), onLoad );
+			var json = JSON.parse( text );
+			var metadata = json.metadata;
+
+			if ( metadata === undefined || metadata.type === undefined || metadata.type.toLowerCase() === 'geometry' ) {
+
+				console.error( 'THREE.ObjectLoader: Can\'t load ' + url + '. Use THREE.JSONLoader instead.' );
+				return;
+
+			}
+
+			scope.parse( json, onLoad );
 
 
 		}, onProgress, onError );
 		}, onProgress, onError );