Browse Source

Fix character case

Popov72 5 years ago
parent
commit
2d6872576e

+ 7 - 7
ktx2Decoder/src/ktx2Decoder.ts

@@ -7,7 +7,7 @@
  *  - KTX-Software: https://github.com/KhronosGroup/KTX-Software
  */
 
-import { KTX2FileReader, supercompressionScheme, IKTX2_ImageDesc } from './ktx2FileReader';
+import { KTX2FileReader, SupercompressionScheme, IKTX2_ImageDesc } from './ktx2FileReader';
 import { TranscoderManager } from './transcoderManager';
 import { LiteTranscoder_UASTC_ASTC } from './Transcoders/liteTranscoder_UASTC_ASTC';
 import { LiteTranscoder_UASTC_BC7 } from './Transcoders/liteTranscoder_UASTC_BC7';
@@ -70,7 +70,7 @@ export class KTX2Decoder {
     public decode(data: Uint8Array, caps: ICompressedFormatCapabilities): Nullable<Promise<IDecodedData>> {
         const kfr = new KTX2FileReader(data);
 
-        if (!kfr.isValid) {
+        if (!kfr.isValid()) {
             throw new Error("Invalid KT2 file: wrong signature");
         }
 
@@ -152,7 +152,7 @@ export class KTX2Decoder {
             let levelDataOffset = kfr.levels[level].byteOffset + kfr.data.byteOffset;
             let imageOffsetInLevel = 0;
 
-            if (kfr.header.supercompressionScheme === supercompressionScheme.ZStandard) {
+            if (kfr.header.supercompressionScheme === SupercompressionScheme.ZStandard) {
                 levelDataBuffer = this._zstdDecoder.decode(new Uint8Array(levelDataBuffer, levelDataOffset, kfr.levels[level].byteLength), levelUncompressedByteLength);
                 levelDataOffset = 0;
             }
@@ -166,7 +166,7 @@ export class KTX2Decoder {
                 let encodedData: Uint8Array;
                 let imageDesc: Nullable<IKTX2_ImageDesc> = null;
 
-                if (kfr.header.supercompressionScheme === supercompressionScheme.BasisLZ) {
+                if (kfr.header.supercompressionScheme === SupercompressionScheme.BasisLZ) {
                     imageDesc = kfr.supercompressionGlobalData.imageDescs![firstImageDescIndex + imageIndex];
 
                     encodedData = new Uint8Array(levelDataBuffer, levelDataOffset + imageDesc.rgbSliceByteOffset, imageDesc.rgbSliceByteLength + imageDesc.alphaSliceByteLength);
@@ -209,6 +209,6 @@ export class KTX2Decoder {
 }
 
 // Put in the order you want the transcoders to be used in priority
-TranscoderManager.registerTranscoder(LiteTranscoder_UASTC_ASTC);
-TranscoderManager.registerTranscoder(LiteTranscoder_UASTC_BC7);
-TranscoderManager.registerTranscoder(MSCTranscoder); // catch all transcoder - will throw an error if the format can't be transcoded
+TranscoderManager.RegisterTranscoder(LiteTranscoder_UASTC_ASTC);
+TranscoderManager.RegisterTranscoder(LiteTranscoder_UASTC_BC7);
+TranscoderManager.RegisterTranscoder(MSCTranscoder); // catch all transcoder - will throw an error if the format can't be transcoded

+ 10 - 10
ktx2Decoder/src/ktx2FileReader.ts

@@ -2,19 +2,19 @@ import { DataReader } from './Misc/dataReader';
 import { sourceTextureFormat } from './transcoder';
 
 /** @hidden */
-export enum supercompressionScheme {
+export enum SupercompressionScheme {
     None = 0,
     BasisLZ = 1,
     ZStandard = 2,
     ZLib = 3
 }
 
-const enum dfdModel {
+const enum DFDModel {
     ETC1S = 163,
     UASTC = 166
 }
 
-const enum dfdChannel_ETC1S {
+const enum DFDChannel_ETC1S {
     RGB = 0,
     RRR = 3,
     GGG = 4,
@@ -22,14 +22,14 @@ const enum dfdChannel_ETC1S {
 
 }
 
-const enum dfdChannel_UASTC {
+const enum DFDChannel_UASTC {
     RGB  = 0,
     RGBA = 3,
     RRR  = 4,
     RRRG = 5
 }
 
-const enum dfdTransferFunction {
+const enum DFDTransferFunction {
     linear = 1,
     sRGB = 2
 }
@@ -323,7 +323,7 @@ export class KTX2FileReader {
     }
 
     public get textureFormat(): sourceTextureFormat {
-        return this._dfdBlock.colorModel === dfdModel.UASTC ? sourceTextureFormat.UASTC4x4 : sourceTextureFormat.ETC1S;
+        return this._dfdBlock.colorModel === DFDModel.UASTC ? sourceTextureFormat.UASTC4x4 : sourceTextureFormat.ETC1S;
     }
 
     public get hasAlpha(): boolean {
@@ -331,21 +331,21 @@ export class KTX2FileReader {
 
         switch (tformat) {
             case sourceTextureFormat.ETC1S:
-                return this._dfdBlock.numSamples === 2 && (this._dfdBlock.samples[0].channelType === dfdChannel_ETC1S.AAA || this._dfdBlock.samples[1].channelType === dfdChannel_ETC1S.AAA);
+                return this._dfdBlock.numSamples === 2 && (this._dfdBlock.samples[0].channelType === DFDChannel_ETC1S.AAA || this._dfdBlock.samples[1].channelType === DFDChannel_ETC1S.AAA);
 
             case sourceTextureFormat.UASTC4x4:
-                return this._dfdBlock.samples[0].channelType === dfdChannel_UASTC.RGBA;
+                return this._dfdBlock.samples[0].channelType === DFDChannel_UASTC.RGBA;
         }
 
         return false;
     }
 
     public get needZSTDDecoder(): boolean {
-        return this._header.supercompressionScheme === supercompressionScheme.ZStandard;
+        return this._header.supercompressionScheme === SupercompressionScheme.ZStandard;
     }
 
     public get isInGammaSpace(): boolean {
-        return this._dfdBlock.transferFunction === dfdTransferFunction.sRGB;
+        return this._dfdBlock.transferFunction === DFDTransferFunction.sRGB;
     }
 
     public static IsValid(data: ArrayBufferView): boolean {

+ 1 - 1
ktx2Decoder/src/transcoderManager.ts

@@ -9,7 +9,7 @@ export class TranscoderManager {
 
     public static _Transcoders: Array<typeof Transcoder> = [];
 
-    public static registerTranscoder(transcoder: typeof Transcoder) {
+    public static RegisterTranscoder(transcoder: typeof Transcoder) {
         TranscoderManager._Transcoders.push(transcoder);
     }