浏览代码

Adjust code style

Garrett Johnson 4 年之前
父节点
当前提交
da06eb3ad0
共有 2 个文件被更改,包括 16 次插入36 次删除
  1. 8 18
      examples/js/loaders/GLTFLoader.js
  2. 8 18
      examples/jsm/loaders/GLTFLoader.js

+ 8 - 18
examples/js/loaders/GLTFLoader.js

@@ -764,16 +764,11 @@ THREE.GLTFLoader = ( function () {
 		var extension = textureDef.extensions[ name ];
 		var extension = textureDef.extensions[ name ];
 		var source = json.images[ extension.source ];
 		var source = json.images[ extension.source ];
 
 
-		var loader;
+		var loader = parser.textureLoader;
 		if ( source.uri ) {
 		if ( source.uri ) {
 
 
-			loader = parser.options.manager.getHandler( source.uri );
-
-		}
-
-		if ( ! loader ) {
-
-			loader = parser.textureLoader;
+			var handler = parser.options.manager.getHandler( source.uri );
+			if ( handler !== null ) loader = handler;
 
 
 		}
 		}
 
 
@@ -2409,19 +2404,14 @@ THREE.GLTFLoader = ( function () {
 
 
 		}
 		}
 
 
-		var loader;
+		var loader = textureExtensions[ EXTENSIONS.MSFT_TEXTURE_DDS ]
+			? parser.extensions[ EXTENSIONS.MSFT_TEXTURE_DDS ].ddsLoader
+			: this.textureLoader;
 
 
 		if ( source.uri ) {
 		if ( source.uri ) {
 
 
-			loader = options.manager.getHandler( source.uri );
-
-		}
-
-		if ( ! loader ) {
-
-			loader = textureExtensions[ EXTENSIONS.MSFT_TEXTURE_DDS ]
-				? parser.extensions[ EXTENSIONS.MSFT_TEXTURE_DDS ].ddsLoader
-				: this.textureLoader;
+			var handler = options.manager.getHandler( source.uri );
+			if ( handler !== null ) loader = handler;
 
 
 		}
 		}
 
 

+ 8 - 18
examples/jsm/loaders/GLTFLoader.js

@@ -829,16 +829,11 @@ var GLTFLoader = ( function () {
 		var extension = textureDef.extensions[ name ];
 		var extension = textureDef.extensions[ name ];
 		var source = json.images[ extension.source ];
 		var source = json.images[ extension.source ];
 
 
-		var loader;
+		var loader = parser.textureLoader;
 		if ( source.uri ) {
 		if ( source.uri ) {
 
 
-			loader = parser.options.manager.getHandler( source.uri );
-
-		}
-
-		if ( ! loader ) {
-
-			loader = parser.textureLoader;
+			var handler = parser.options.manager.getHandler( source.uri );
+			if ( handler !== null ) loader = handler;
 
 
 		}
 		}
 
 
@@ -2474,19 +2469,14 @@ var GLTFLoader = ( function () {
 
 
 		}
 		}
 
 
-		var loader;
+		var loader = textureExtensions[ EXTENSIONS.MSFT_TEXTURE_DDS ]
+			? parser.extensions[ EXTENSIONS.MSFT_TEXTURE_DDS ].ddsLoader
+			: this.textureLoader;
 
 
 		if ( source.uri ) {
 		if ( source.uri ) {
 
 
-			loader = options.manager.getHandler( source.uri );
-
-		}
-
-		if ( ! loader ) {
-
-			loader = textureExtensions[ EXTENSIONS.MSFT_TEXTURE_DDS ]
-				? parser.extensions[ EXTENSIONS.MSFT_TEXTURE_DDS ].ddsLoader
-				: this.textureLoader;
+			var handler = options.manager.getHandler( source.uri );
+			if ( handler !== null ) loader = handler;
 
 
 		}
 		}