소스 검색

Moved error throwing to constructor, added suggested changes from pr

Anton Bergman 7 년 전
부모
커밋
2a0c1c07d2
1개의 변경된 파일12개의 추가작업 그리고 14개의 파일을 삭제
  1. 12 14
      examples/js/loaders/GLTFLoader.js

+ 12 - 14
examples/js/loaders/GLTFLoader.js

@@ -243,8 +243,14 @@ THREE.GLTFLoader = ( function () {
 	 */
 	function GLTFTextureDDSExtension() {
 
+		if (!THREE.DDSLoader) {
+
+			throw new Error( 'THREE.GLTFLoader: Attempting to load .dds texture without importing THREE.DDSLoader' );
+
+		}
+
 		this.name = EXTENSIONS.MSFT_TEXTURE_DDS;
-    this.ddsLoader = new THREE.DDSLoader();
+		this.ddsLoader = new THREE.DDSLoader();
 
 	}
 
@@ -1817,12 +1823,6 @@ THREE.GLTFLoader = ( function () {
 
 		if ( textureExtensions[ EXTENSIONS.MSFT_TEXTURE_DDS ] ) {
 
-			if (!THREE.DDSLoader) {
-
-				throw new Error( 'THREE.GLTFLoader: Attempting to load .dds texture without importing THREE.DDSLoader' );
-
-			}
-
 			source = json.images[ textureExtensions[ EXTENSIONS.MSFT_TEXTURE_DDS ].source ];
 
 		} else {
@@ -1853,15 +1853,13 @@ THREE.GLTFLoader = ( function () {
 
 			// Load Texture resource.
 
-			var loader;
-
-			if ( textureExtensions[ EXTENSIONS.MSFT_TEXTURE_DDS ] ) {
+			var loader = THREE.Loader.Handlers.get( sourceURI );
 
-				loader = THREE.Loader.Handlers.get( sourceURI ) || parser.extensions[EXTENSIONS.MSFT_TEXTURE_DDS].ddsLoader
-
-			} else {
+			if ( ! loader ) {
 
-				loader = THREE.Loader.Handlers.get( sourceURI ) || textureLoader;
+				loader = textureExtensions[ EXTENSIONS.MSFT_TEXTURE_DDS ]
+					? parser.extensions[ EXTENSIONS.MSFT_TEXTURE_DDS ].ddsLoader
+					: textureLoader;
 
 			}