@loaders.gl/textures 3.1.0-alpha.5 → 3.1.0-beta.5

package/dist/workers/npy-worker.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const npy_loader_1 = require("../npy-loader");
+const loader_utils_1 = require("@loaders.gl/loader-utils");
+(0, loader_utils_1.createLoaderWorker)(npy_loader_1.NPYLoader);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/textures",
-  "version": "3.1.0-alpha.5",
+  "version": "3.1.0-beta.5",
   "description": "Framework-independent loaders for compressed and super compressed (basis) textures ",
   "license": "MIT",
   "publishConfig": {
@@ -33,21 +33,20 @@
   ],
   "scripts": {
     "pre-build": "npm run copy-libs && npm run build-worker && npm run build-bundle",
-    "post-build": "tsc",
     "copy-libs": "cp -rf ./src/libs ./dist/libs",
-    "build-bundle": "webpack --display=minimal --config ../../scripts/webpack/bundle.js",
+    "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/bundle.js",
     "build-worker": "npm run build-basis-worker && npm run build-npy-worker && npm run build-compressed-texture-worker && npm run build-crunch-worker",
-    "build-basis-worker": "webpack --entry ./src/workers/basis-worker.ts --output ./dist/basis-worker.js --config ../../scripts/webpack/worker.js",
-    "build-npy-worker": "webpack --entry ./src/workers/npy-worker.ts --output ./dist/npy-worker.js --config ../../scripts/webpack/worker.js",
-    "build-compressed-texture-worker": "webpack --entry ./src/workers/compressed-texture-worker.ts --output ./dist/compressed-texture-worker.js --config ../../scripts/webpack/worker.js",
-    "build-crunch-worker": "webpack --entry ./src/workers/crunch-worker.ts --output ./dist/crunch-worker.js --config ../../scripts/webpack/worker.js"
+    "build-basis-worker": "esbuild src/workers/basis-worker.ts --bundle --outfile=dist/basis-worker.js",
+    "build-npy-worker": "esbuild src/workers/npy-worker.ts --bundle --outfile=dist/npy-worker.js",
+    "build-compressed-texture-worker": "esbuild src/workers/compressed-texture-worker.ts --bundle --outfile=dist/compressed-texture-worker.js",
+    "build-crunch-worker": "esbuild src/workers/crunch-worker.ts --bundle --outfile=dist/crunch-worker.js"
   },
   "dependencies": {
-    "@loaders.gl/images": "3.1.0-alpha.5",
-    "@loaders.gl/loader-utils": "3.1.0-alpha.5",
-    "@loaders.gl/worker-utils": "3.1.0-alpha.5",
+    "@loaders.gl/images": "3.1.0-beta.5",
+    "@loaders.gl/loader-utils": "3.1.0-beta.5",
+    "@loaders.gl/worker-utils": "3.1.0-beta.5",
     "ktx-parse": "^0.0.4",
     "texture-compressor": "^1.0.2"
   },
-  "gitHead": "352241dd910a8c6307a235dadbe154ca915b885b"
+  "gitHead": "5d66468457cc878d2dbff3d7807d737ceb181c9a"
 }

package/src/index.ts

@@ -18,7 +18,7 @@ export {loadImageTextureArray} from './lib/texture-api/load-image-array';
 export {loadImageTextureCube} from './lib/texture-api/load-image-cube';
 
 // Utilities
-export {GL as GL_CONSTANTS} from './lib/gl-constants';
+export {GL_EXTENSIONS_CONSTANTS} from './lib/gl-extensions';
 export {selectSupportedBasisFormat} from './lib/parsers/parse-basis';
 export {getSupportedGPUTextureFormats} from './lib/utils/texture-formats';
 

package/src/lib/{gl-constants.ts → gl-extensions.ts}

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-export const GL = {
+export const GL_EXTENSIONS_CONSTANTS = {
   // WEBGL_compressed_texture_s3tc
 
   COMPRESSED_RGB_S3TC_DXT1_EXT: 0x83f0,

package/src/lib/parsers/crunch-module-loader.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import {loadLibrary} from '@loaders.gl/worker-utils';
 
 /**

package/src/lib/parsers/parse-basis.js

@@ -1,20 +1,44 @@
 import {loadBasisEncoderModule, loadBasisTrascoderModule} from './basis-module-loader';
-import {GL} from '../gl-constants';
-import {getSupportedGPUTextureFormats} from '../..';
+import {GL_EXTENSIONS_CONSTANTS} from '../gl-extensions';
+import {getSupportedGPUTextureFormats} from '../utils/texture-formats';
 import {isKTX} from './parse-ktx';
 
 const OutputFormat = {
-  etc1: {basisFormat: 0, compressed: true, format: GL.COMPRESSED_RGB_ETC1_WEBGL},
+  etc1: {
+    basisFormat: 0,
+    compressed: true,
+    format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGB_ETC1_WEBGL
+  },
   etc2: {basisFormat: 1, compressed: true},
-  bc1: {basisFormat: 2, compressed: true, format: GL.COMPRESSED_RGB_S3TC_DXT1_EXT},
-  bc3: {basisFormat: 3, compressed: true, format: GL.COMPRESSED_RGBA_S3TC_DXT5_EXT},
+  bc1: {
+    basisFormat: 2,
+    compressed: true,
+    format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGB_S3TC_DXT1_EXT
+  },
+  bc3: {
+    basisFormat: 3,
+    compressed: true,
+    format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_S3TC_DXT5_EXT
+  },
   bc4: {basisFormat: 4, compressed: true},
   bc5: {basisFormat: 5, compressed: true},
   'bc7-m6-opaque-only': {basisFormat: 6, compressed: true},
   'bc7-m5': {basisFormat: 7, compressed: true},
-  'pvrtc1-4-rgb': {basisFormat: 8, compressed: true, format: GL.COMPRESSED_RGB_PVRTC_4BPPV1_IMG},
-  'pvrtc1-4-rgba': {basisFormat: 9, compressed: true, format: GL.COMPRESSED_RGBA_PVRTC_4BPPV1_IMG},
-  'astc-4x4': {basisFormat: 10, compressed: true, format: GL.COMPRESSED_RGBA_ASTC_4X4_KHR},
+  'pvrtc1-4-rgb': {
+    basisFormat: 8,
+    compressed: true,
+    format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGB_PVRTC_4BPPV1_IMG
+  },
+  'pvrtc1-4-rgba': {
+    basisFormat: 9,
+    compressed: true,
+    format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_PVRTC_4BPPV1_IMG
+  },
+  'astc-4x4': {
+    basisFormat: 10,
+    compressed: true,
+    format: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_ASTC_4X4_KHR
+  },
   'atc-rgb': {basisFormat: 11, compressed: true},
   'atc-rgba-interpolated-alpha': {basisFormat: 12, compressed: true},
   rgba32: {basisFormat: 13, compressed: false},

package/src/lib/parsers/parse-crunch.ts

@@ -1,6 +1,6 @@
 import type {TextureLevel} from '../../types';
 import {loadCrunchModule} from './crunch-module-loader';
-import {GL} from '../gl-constants';
+import {GL_EXTENSIONS_CONSTANTS} from '../gl-extensions';
 import {assert} from '@loaders.gl/loader-utils';
 import {getDxt1LevelSize, getDxtXLevelSize} from './parse-dds';
 import {extractMipmapImages} from '../utils/extract-mipmap-images';
@@ -20,15 +20,15 @@ const CRN_FORMAT = {
 // Mapping of Crunch formats to DXT formats.
 const DXT_FORMAT_MAP = {};
 DXT_FORMAT_MAP[CRN_FORMAT.cCRNFmtDXT1] = {
-  pixelFormat: GL.COMPRESSED_RGB_S3TC_DXT1_EXT,
+  pixelFormat: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGB_S3TC_DXT1_EXT,
   sizeFunction: getDxt1LevelSize
 };
 DXT_FORMAT_MAP[CRN_FORMAT.cCRNFmtDXT3] = {
-  pixelFormat: GL.COMPRESSED_RGBA_S3TC_DXT3_EXT,
+  pixelFormat: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_S3TC_DXT3_EXT,
   sizeFunction: getDxtXLevelSize
 };
 DXT_FORMAT_MAP[CRN_FORMAT.cCRNFmtDXT5] = {
-  pixelFormat: GL.COMPRESSED_RGBA_S3TC_DXT5_EXT,
+  pixelFormat: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_S3TC_DXT5_EXT,
   sizeFunction: getDxtXLevelSize
 };
 

package/src/lib/parsers/parse-dds.ts

@@ -1,11 +1,8 @@
 import type {TextureLevel} from '../../types';
 import {assert} from '@loaders.gl/loader-utils';
-import {GL} from '../gl-constants';
+import {GL_EXTENSIONS_CONSTANTS} from '../gl-extensions';
 import {extractMipmapImages} from '../utils/extract-mipmap-images';
 
-const getATCLevelSize = getDxt1LevelSize;
-const getATCALevelSize = getDxtXLevelSize;
-const getATCILevelSize = getDxtXLevelSize;
 const DDS_CONSTANTS = {
   MAGIC_NUMBER: 0x20534444,
   HEADER_LENGTH: 31,
@@ -18,23 +15,29 @@ const DDS_CONSTANTS = {
   HEADER_PF_FLAGS_INDEX: 20,
   HEADER_PF_FOURCC_INDEX: 21,
   DDSD_MIPMAPCOUNT: 0x20000,
-  DDPF_FOURCC: 0x4,
-  PIXEL_FORMATS: {
-    DXT1: GL.COMPRESSED_RGB_S3TC_DXT1_EXT,
-    DXT3: GL.COMPRESSED_RGBA_S3TC_DXT3_EXT,
-    DXT5: GL.COMPRESSED_RGBA_S3TC_DXT5_EXT,
-    'ATC ': GL.COMPRESSED_RGB_ATC_WEBGL,
-    ATCA: GL.COMPRESSED_RGBA_ATC_EXPLICIT_ALPHA_WEBGL,
-    ATCI: GL.COMPRESSED_RGBA_ATC_INTERPOLATED_ALPHA_WEBGL
-  },
-  SIZE_FUNCTIONS: {
-    DXT1: getDxt1LevelSize,
-    DXT3: getDxtXLevelSize,
-    DXT5: getDxtXLevelSize,
-    'ATC ': getATCLevelSize,
-    ATCA: getATCALevelSize,
-    ATCI: getATCILevelSize
-  }
+  DDPF_FOURCC: 0x4
+};
+
+const DDS_PIXEL_FORMATS: Record<string, number> = {
+  DXT1: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGB_S3TC_DXT1_EXT,
+  DXT3: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_S3TC_DXT3_EXT,
+  DXT5: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_S3TC_DXT5_EXT,
+  'ATC ': GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGB_ATC_WEBGL,
+  ATCA: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_ATC_EXPLICIT_ALPHA_WEBGL,
+  ATCI: GL_EXTENSIONS_CONSTANTS.COMPRESSED_RGBA_ATC_INTERPOLATED_ALPHA_WEBGL
+};
+
+const getATCLevelSize = getDxt1LevelSize;
+const getATCALevelSize = getDxtXLevelSize;
+const getATCILevelSize = getDxtXLevelSize;
+
+const DDS_SIZE_FUNCTIONS: Record<string, (width: number, height: number) => number> = {
+  DXT1: getDxt1LevelSize,
+  DXT3: getDxtXLevelSize,
+  DXT5: getDxtXLevelSize,
+  'ATC ': getATCLevelSize,
+  ATCA: getATCALevelSize,
+  ATCI: getATCILevelSize
 };
 
 /**
@@ -61,8 +64,8 @@ export function parseDDS(data: ArrayBuffer): TextureLevel[] {
     'DDS: Unsupported format, must contain a FourCC code'
   );
   const fourCC = int32ToFourCC(pixelFormatNumber);
-  const internalFormat = DDS_CONSTANTS.PIXEL_FORMATS[fourCC];
-  const sizeFunction = DDS_CONSTANTS.SIZE_FUNCTIONS[fourCC];
+  const internalFormat = DDS_PIXEL_FORMATS[fourCC];
+  const sizeFunction = DDS_SIZE_FUNCTIONS[fourCC];
   assert(internalFormat && sizeFunction, `DDS: Unknown pixel format ${pixelFormatNumber}`);
 
   let mipMapLevels = 1;
@@ -105,10 +108,10 @@ export function getDxtXLevelSize(width: number, height: number): number {
 
 /**
  * Convert every byte of Int32 value to char
- * @param {number} value - Int32 number
- * @returns {string} string of 4 characters
+ * @param value - Int32 number
+ * @returns string of 4 characters
  */
-function int32ToFourCC(value) {
+function int32ToFourCC(value: number): string {
   return String.fromCharCode(
     value & 0xff,
     (value >> 8) & 0xff,

package/src/lib/parsers/parse-ktx.js

@@ -1,16 +1,16 @@
 import {read} from 'ktx-parse';
 import {extractMipmapImages} from '../utils/extract-mipmap-images';
 import {mapVkFormatToWebGL} from '../utils/ktx-format-helper';
-
 const KTX2_ID = [
   // '´', 'K', 'T', 'X', '2', '0', 'ª', '\r', '\n', '\x1A', '\n'
   0xab, 0x4b, 0x54, 0x58, 0x20, 0x32, 0x30, 0xbb, 0x0d, 0x0a, 0x1a, 0x0a
 ];
-
 // eslint-disable-next-line complexity
 export function isKTX(data) {
-  const id = new Uint8Array(data.buffer || data, data.byteOffset || 0, KTX2_ID.length);
+  // const id = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+  const id = new Uint8Array(data);
   const notKTX =
+    id.byteLength < KTX2_ID.length ||
     id[0] !== KTX2_ID[0] || // '´'
     id[1] !== KTX2_ID[1] || // 'K'
     id[2] !== KTX2_ID[2] || // 'T'
@@ -23,10 +23,8 @@ export function isKTX(data) {
     id[9] !== KTX2_ID[9] || // '\n'
     id[10] !== KTX2_ID[10] || // '\x1A'
     id[11] !== KTX2_ID[11]; // '\n'
-
   return !notKTX;
 }
-
 export function parseKTX(arrayBuffer) {
   const uint8Array = new Uint8Array(arrayBuffer);
   const ktx = read(uint8Array);
@@ -34,7 +32,6 @@ export function parseKTX(arrayBuffer) {
   const width = ktx.pixelWidth;
   const height = ktx.pixelHeight;
   const internalFormat = mapVkFormatToWebGL(ktx.vkFormat);
-
   return extractMipmapImages(ktx.levels, {
     mipMapLevels,
     width,

package/src/lib/parsers/parse-ktx.ts

@@ -0,0 +1,47 @@
+import {read} from 'ktx-parse';
+import {extractMipmapImages} from '../utils/extract-mipmap-images';
+import {mapVkFormatToWebGL} from '../utils/ktx-format-helper';
+
+const KTX2_ID = [
+  // '´', 'K', 'T', 'X', '2', '0', 'ª', '\r', '\n', '\x1A', '\n'
+  0xab, 0x4b, 0x54, 0x58, 0x20, 0x32, 0x30, 0xbb, 0x0d, 0x0a, 0x1a, 0x0a
+];
+
+// eslint-disable-next-line complexity
+export function isKTX(data: ArrayBuffer) {
+  // const id = new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+  const id = new Uint8Array(data);
+  const notKTX =
+    id.byteLength < KTX2_ID.length ||
+    id[0] !== KTX2_ID[0] || // '´'
+    id[1] !== KTX2_ID[1] || // 'K'
+    id[2] !== KTX2_ID[2] || // 'T'
+    id[3] !== KTX2_ID[3] || // 'X'
+    id[4] !== KTX2_ID[4] || // ' '
+    id[5] !== KTX2_ID[5] || // '2'
+    id[6] !== KTX2_ID[6] || // '0'
+    id[7] !== KTX2_ID[7] || // 'ª'
+    id[8] !== KTX2_ID[8] || // '\r'
+    id[9] !== KTX2_ID[9] || // '\n'
+    id[10] !== KTX2_ID[10] || // '\x1A'
+    id[11] !== KTX2_ID[11]; // '\n'
+
+  return !notKTX;
+}
+
+export function parseKTX(arrayBuffer: ArrayBuffer) {
+  const uint8Array = new Uint8Array(arrayBuffer);
+  const ktx = read(uint8Array);
+  const mipMapLevels = Math.max(1, ktx.levels.length);
+  const width = ktx.pixelWidth;
+  const height = ktx.pixelHeight;
+  const internalFormat = mapVkFormatToWebGL(ktx.vkFormat);
+
+  return extractMipmapImages(ktx.levels, {
+    mipMapLevels,
+    width,
+    height,
+    sizeFunction: (level: any): number => level.uncompressedByteLength,
+    internalFormat
+  });
+}

package/src/lib/parsers/parse-npy.js

@@ -3,9 +3,7 @@ function systemIsLittleEndian() {
   const b = new Uint8Array(a.buffer, a.byteOffset, a.byteLength);
   return !(b[0] === 0x12);
 }
-
 const LITTLE_ENDIAN_OS = systemIsLittleEndian();
-
 // The basic string format consists of 3 characters:
 // 1. a character describing the byteorder of the data (<: little-endian, >: big-endian, |: not-relevant)
 // 2. a character code giving the basic type of the array
@@ -24,15 +22,12 @@ const DTYPES = {
   f4: Float32Array,
   f8: Float64Array
 };
-
 export function parseNPY(arrayBuffer, options) {
   if (!arrayBuffer) {
     return null;
   }
-
   const view = new DataView(arrayBuffer);
   const {header, headerEndOffset} = parseHeader(view);
-
   const numpyType = header.descr;
   const ArrayType = DTYPES[numpyType.slice(1, 3)];
   if (!ArrayType) {
@@ -40,34 +35,28 @@ export function parseNPY(arrayBuffer, options) {
     console.warn(`Decoding of npy dtype not implemented: ${numpyType}`);
     return null;
   }
-
-  const nArrayElements = header.shape.reduce((a, b) => a * b);
+  const nArrayElements = header.shape?.reduce((a, b) => a * b);
   const arrayByteLength = nArrayElements * ArrayType.BYTES_PER_ELEMENT;
-
   const data = new ArrayType(arrayBuffer.slice(headerEndOffset, headerEndOffset + arrayByteLength));
-
   // Swap endianness if needed
   if ((numpyType[0] === '>' && LITTLE_ENDIAN_OS) || (numpyType[0] === '<' && !LITTLE_ENDIAN_OS)) {
     // eslint-disable-next-line no-console, no-undef
     console.warn('Data is wrong endianness, byte swapping not yet implemented.');
   }
-
   return {
     data,
     header
   };
 }
-
 /**
  * Parse NPY header
  *
- * @param  {DataView} view
- * @return {Object}
+ * @param  view
+ * @return
  */
 function parseHeader(view) {
   const majorVersion = view.getUint8(6);
   // const minorVersion = view.getUint8(7);
-
   let offset = 8;
   let headerLength;
   if (majorVersion >= 2) {
@@ -77,13 +66,11 @@ function parseHeader(view) {
     headerLength = view.getUint16(8, true);
     offset += 2;
   }
-
   const encoding = majorVersion <= 2 ? 'latin1' : 'utf-8';
   const decoder = new TextDecoder(encoding);
   const headerArray = new Uint8Array(view.buffer, offset, headerLength);
   const headerText = decoder.decode(headerArray);
   offset += headerLength;
-
   const header = JSON.parse(
     headerText
       .replace(/'/g, '"')
@@ -91,6 +78,5 @@ function parseHeader(view) {
       .replace('(', '[')
       .replace(/,*\),*/g, ']')
   );
-
   return {header, headerEndOffset: offset};
 }

package/src/lib/parsers/parse-npy.ts

@@ -0,0 +1,98 @@
+type NumpyHeader = {descr: string; shape: number[]};
+
+function systemIsLittleEndian() {
+  const a = new Uint32Array([0x12345678]);
+  const b = new Uint8Array(a.buffer, a.byteOffset, a.byteLength);
+  return !(b[0] === 0x12);
+}
+
+const LITTLE_ENDIAN_OS = systemIsLittleEndian();
+
+// The basic string format consists of 3 characters:
+// 1. a character describing the byteorder of the data (<: little-endian, >: big-endian, |: not-relevant)
+// 2. a character code giving the basic type of the array
+// 3. an integer providing the number of bytes the type uses.
+// https://numpy.org/doc/stable/reference/arrays.interface.html
+//
+// Here I only include the second and third characters, and check endianness
+// separately
+const DTYPES: Record<string, any> = {
+  u1: Uint8Array,
+  i1: Int8Array,
+  u2: Uint16Array,
+  i2: Int16Array,
+  u4: Uint32Array,
+  i4: Int32Array,
+  f4: Float32Array,
+  f8: Float64Array
+};
+
+export function parseNPY(arrayBuffer: ArrayBuffer, options?: unknown) {
+  if (!arrayBuffer) {
+    return null;
+  }
+
+  const view = new DataView(arrayBuffer);
+  const {header, headerEndOffset} = parseHeader(view);
+
+  const numpyType = header.descr;
+  const ArrayType = DTYPES[numpyType.slice(1, 3)];
+  if (!ArrayType) {
+    // eslint-disable-next-line no-console, no-undef
+    console.warn(`Decoding of npy dtype not implemented: ${numpyType}`);
+    return null;
+  }
+
+  const nArrayElements = header.shape?.reduce((a: number, b: number): number => a * b);
+  const arrayByteLength = nArrayElements * ArrayType.BYTES_PER_ELEMENT;
+
+  const data = new ArrayType(arrayBuffer.slice(headerEndOffset, headerEndOffset + arrayByteLength));
+
+  // Swap endianness if needed
+  if ((numpyType[0] === '>' && LITTLE_ENDIAN_OS) || (numpyType[0] === '<' && !LITTLE_ENDIAN_OS)) {
+    // eslint-disable-next-line no-console, no-undef
+    console.warn('Data is wrong endianness, byte swapping not yet implemented.');
+  }
+
+  return {
+    data,
+    header
+  };
+}
+
+/**
+ * Parse NPY header
+ *
+ * @param  view
+ * @return
+ */
+function parseHeader(view: DataView): {header: NumpyHeader; headerEndOffset: number} {
+  const majorVersion = view.getUint8(6);
+  // const minorVersion = view.getUint8(7);
+
+  let offset = 8;
+  let headerLength;
+  if (majorVersion >= 2) {
+    headerLength = view.getUint32(8, true);
+    offset += 4;
+  } else {
+    headerLength = view.getUint16(8, true);
+    offset += 2;
+  }
+
+  const encoding = majorVersion <= 2 ? 'latin1' : 'utf-8';
+  const decoder = new TextDecoder(encoding);
+  const headerArray = new Uint8Array(view.buffer, offset, headerLength);
+  const headerText = decoder.decode(headerArray);
+  offset += headerLength;
+
+  const header = JSON.parse(
+    headerText
+      .replace(/'/g, '"')
+      .replace('False', 'false')
+      .replace('(', '[')
+      .replace(/,*\),*/g, ']')
+  );
+
+  return {header, headerEndOffset: offset};
+}