فهرست منبع

Style and d.ts fix

shrekshao 5 سال پیش
والد
کامیت
777407f70a
3فایلهای تغییر یافته به همراه25 افزوده شده و 14 حذف شده
  1. 12 6
      examples/js/loaders/BasisTextureLoader.js
  2. 1 3
      examples/jsm/loaders/BasisTextureLoader.d.ts
  3. 12 5
      examples/jsm/loaders/BasisTextureLoader.js

+ 12 - 6
examples/js/loaders/BasisTextureLoader.js

@@ -68,7 +68,7 @@ THREE.BasisTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.
 		config.pvrtcSupported = !! renderer.extensions.get( 'WEBGL_compressed_texture_pvrtc' )
 		config.pvrtcSupported = !! renderer.extensions.get( 'WEBGL_compressed_texture_pvrtc' )
 			|| !! renderer.extensions.get( 'WEBKIT_WEBGL_compressed_texture_pvrtc' );
 			|| !! renderer.extensions.get( 'WEBKIT_WEBGL_compressed_texture_pvrtc' );
 
 
-		if (config.astcSupported) {
+		if ( config.astcSupported ) {
 
 
 			config.format = THREE.BasisTextureLoader.BASIS_FORMAT.cTFASTC_4x4;
 			config.format = THREE.BasisTextureLoader.BASIS_FORMAT.cTFASTC_4x4;
 
 
@@ -144,7 +144,8 @@ THREE.BasisTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.
 
 
 				var texture;
 				var texture;
 
 
-				switch(format) {
+				switch ( format ) {
+
 					case THREE.BasisTextureLoader.BASIS_FORMAT.cTFASTC_4x4:
 					case THREE.BasisTextureLoader.BASIS_FORMAT.cTFASTC_4x4:
 						texture = new THREE.CompressedTexture( mipmaps, width, height, THREE.RGBA_ASTC_4x4_Format );
 						texture = new THREE.CompressedTexture( mipmaps, width, height, THREE.RGBA_ASTC_4x4_Format );
 						break;
 						break;
@@ -163,6 +164,7 @@ THREE.BasisTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.
 						break;
 						break;
 					default:
 					default:
 						throw new Error( 'THREE.BasisTextureLoader: No supported format available.' );
 						throw new Error( 'THREE.BasisTextureLoader: No supported format available.' );
+
 				}
 				}
 
 
 				texture.minFilter = mipmaps.length === 1 ? THREE.LinearFilter : THREE.LinearMipmapLinearFilter;
 				texture.minFilter = mipmaps.length === 1 ? THREE.LinearFilter : THREE.LinearMipmapLinearFilter;
@@ -403,7 +405,7 @@ THREE.BasisTextureLoader.BasisWorker = function () {
 		transcoderPending = new Promise( ( resolve ) => {
 		transcoderPending = new Promise( ( resolve ) => {
 
 
 			BasisModule = { wasmBinary, onRuntimeInitialized: resolve };
 			BasisModule = { wasmBinary, onRuntimeInitialized: resolve };
-			BASIS(BasisModule);
+			BASIS( BasisModule );
 
 
 		} ).then( () => {
 		} ).then( () => {
 
 
@@ -433,14 +435,18 @@ THREE.BasisTextureLoader.BasisWorker = function () {
 
 
 		}
 		}
 
 
-		if ( !hasAlpha ) {
-			switch(config.format) {
+		if ( ! hasAlpha ) {
+
+			switch ( config.format ) {
+
 				case 9: // Hardcoded: THREE.BasisTextureLoader.BASIS_FORMAT.cTFPVRTC1_4_RGBA
 				case 9: // Hardcoded: THREE.BasisTextureLoader.BASIS_FORMAT.cTFPVRTC1_4_RGBA
 					config.format = 8; // Hardcoded: THREE.BasisTextureLoader.BASIS_FORMAT.cTFPVRTC1_4_RGB;
 					config.format = 8; // Hardcoded: THREE.BasisTextureLoader.BASIS_FORMAT.cTFPVRTC1_4_RGB;
 					break;
 					break;
 				default:
 				default:
 					break;
 					break;
+
 			}
 			}
+
 		}
 		}
 
 
 		if ( ! width || ! height || ! levels ) {
 		if ( ! width || ! height || ! levels ) {
@@ -491,4 +497,4 @@ THREE.BasisTextureLoader.BasisWorker = function () {
 
 
 	}
 	}
 
 
-};
+};

+ 1 - 3
examples/jsm/loaders/BasisTextureLoader.d.ts

@@ -8,15 +8,13 @@ import {
 export class BasisTextureLoader extends Loader {
 export class BasisTextureLoader extends Loader {
 
 
 	constructor( manager?: LoadingManager );
 	constructor( manager?: LoadingManager );
-	useAlpha: boolean;
 	transcoderBinary: ArrayBuffer | null;
 	transcoderBinary: ArrayBuffer | null;
 	transcoderPath: string;
 	transcoderPath: string;
 	transcoderPending: Promise<void> | null;
 	transcoderPending: Promise<void> | null;
 
 
 	workerConfig: {
 	workerConfig: {
 		format: number;
 		format: number;
-		useAlpha: boolean,
-		astcSupported: boolean,
+		astcSupported: boolean;
 		etcSupported: boolean;
 		etcSupported: boolean;
 		dxtSupported: boolean;
 		dxtSupported: boolean;
 		pvrtcSupported: boolean;
 		pvrtcSupported: boolean;

+ 12 - 5
examples/jsm/loaders/BasisTextureLoader.js

@@ -81,7 +81,7 @@ BasisTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ),
 		config.pvrtcSupported = !! renderer.extensions.get( 'WEBGL_compressed_texture_pvrtc' )
 		config.pvrtcSupported = !! renderer.extensions.get( 'WEBGL_compressed_texture_pvrtc' )
 			|| !! renderer.extensions.get( 'WEBKIT_WEBGL_compressed_texture_pvrtc' );
 			|| !! renderer.extensions.get( 'WEBKIT_WEBGL_compressed_texture_pvrtc' );
 
 
-		if (config.astcSupported) {
+		if ( config.astcSupported ) {
 
 
 			config.format = BasisTextureLoader.BASIS_FORMAT.cTFASTC_4x4;
 			config.format = BasisTextureLoader.BASIS_FORMAT.cTFASTC_4x4;
 
 
@@ -157,7 +157,8 @@ BasisTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ),
 
 
 				var texture;
 				var texture;
 
 
-				switch(format) {
+				switch ( format ) {
+
 					case BasisTextureLoader.BASIS_FORMAT.cTFASTC_4x4:
 					case BasisTextureLoader.BASIS_FORMAT.cTFASTC_4x4:
 						texture = new CompressedTexture( mipmaps, width, height, RGBA_ASTC_4x4_Format );
 						texture = new CompressedTexture( mipmaps, width, height, RGBA_ASTC_4x4_Format );
 						break;
 						break;
@@ -176,6 +177,7 @@ BasisTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ),
 						break;
 						break;
 					default:
 					default:
 						throw new Error( 'THREE.BasisTextureLoader: No supported format available.' );
 						throw new Error( 'THREE.BasisTextureLoader: No supported format available.' );
+
 				}
 				}
 
 
 				texture.minFilter = mipmaps.length === 1 ? LinearFilter : LinearMipmapLinearFilter;
 				texture.minFilter = mipmaps.length === 1 ? LinearFilter : LinearMipmapLinearFilter;
@@ -416,7 +418,7 @@ BasisTextureLoader.BasisWorker = function () {
 		transcoderPending = new Promise( ( resolve ) => {
 		transcoderPending = new Promise( ( resolve ) => {
 
 
 			BasisModule = { wasmBinary, onRuntimeInitialized: resolve };
 			BasisModule = { wasmBinary, onRuntimeInitialized: resolve };
-			BASIS(BasisModule);
+			BASIS( BasisModule );
 
 
 		} ).then( () => {
 		} ).then( () => {
 
 
@@ -446,14 +448,18 @@ BasisTextureLoader.BasisWorker = function () {
 
 
 		}
 		}
 
 
-		if ( !hasAlpha ) {
-			switch(config.format) {
+		if ( ! hasAlpha ) {
+
+			switch ( config.format ) {
+
 				case 9: // Hardcoded: BasisTextureLoader.BASIS_FORMAT.cTFPVRTC1_4_RGBA
 				case 9: // Hardcoded: BasisTextureLoader.BASIS_FORMAT.cTFPVRTC1_4_RGBA
 					config.format = 8; // Hardcoded: BasisTextureLoader.BASIS_FORMAT.cTFPVRTC1_4_RGB;
 					config.format = 8; // Hardcoded: BasisTextureLoader.BASIS_FORMAT.cTFPVRTC1_4_RGB;
 					break;
 					break;
 				default:
 				default:
 					break;
 					break;
+
 			}
 			}
+
 		}
 		}
 
 
 		if ( ! width || ! height || ! levels ) {
 		if ( ! width || ! height || ! levels ) {
@@ -505,4 +511,5 @@ BasisTextureLoader.BasisWorker = function () {
 	}
 	}
 
 
 };
 };
+
 export { BasisTextureLoader };
 export { BasisTextureLoader };