itowns 2.44.3-next.37 → 2.44.3-next.39

package/lib/ThreeExtended/loaders/DRACOLoader.js

@@ -1,4 +1,4 @@
-import { BufferAttribute, BufferGeometry, Color, FileLoader, Loader, LinearSRGBColorSpace, SRGBColorSpace } from 'three';
+import { BufferAttribute, BufferGeometry, Color, ColorManagement, FileLoader, Loader, LinearSRGBColorSpace, SRGBColorSpace } from 'three';
 const _taskCache = new WeakMap();
 class DRACOLoader extends Loader {
   constructor(manager) {
@@ -150,7 +150,8 @@ class DRACOLoader extends Loader {
     if (inputColorSpace !== SRGBColorSpace) return;
     const _color = new Color();
     for (let i = 0, il = attribute.count; i < il; i++) {
-      _color.fromBufferAttribute(attribute, i).convertSRGBToLinear();
+      _color.fromBufferAttribute(attribute, i);
+      ColorManagement.toWorkingColorSpace(_color, SRGBColorSpace);
       attribute.setXYZ(i, _color.r, _color.g, _color.b);
     }
   }

package/lib/ThreeExtended/loaders/GLTFLoader.js

@@ -109,9 +109,6 @@ class GLTFLoader extends Loader {
     this.dracoLoader = dracoLoader;
     return this;
   }
-  setDDSLoader() {
-    throw new Error('THREE.GLTFLoader: "MSFT_texture_dds" no longer supported. Please update to "KHR_texture_basisu".');
-  }
   setKTX2Loader(ktx2Loader) {
     this.ktx2Loader = ktx2Loader;
     return this;
@@ -1514,6 +1511,7 @@ function getNormalizedComponentScale(constructor) {
 function getImageURIMimeType(uri) {
   if (uri.search(/\.jpe?g($|\?)/i) > 0 || uri.search(/^data\:image\/jpeg/) === 0) return 'image/jpeg';
   if (uri.search(/\.webp($|\?)/i) > 0 || uri.search(/^data\:image\/webp/) === 0) return 'image/webp';
+  if (uri.search(/\.ktx2($|\?)/i) > 0 || uri.search(/^data\:image\/ktx2/) === 0) return 'image/ktx2';
   return 'image/png';
 }
 const _identityMatrix = new Matrix4();
@@ -1928,6 +1926,9 @@ class GLTFParser {
           // Avoid modifying the original ArrayBuffer, if the bufferView wasn't initialized with zeroes.
           bufferAttribute = new BufferAttribute(bufferAttribute.array.slice(), bufferAttribute.itemSize, bufferAttribute.normalized);
         }
+
+        // Ignore normalized since we copy from sparse
+        bufferAttribute.normalized = false;
         for (let i = 0, il = sparseIndices.length; i < il; i++) {
           const index = sparseIndices[i];
           bufferAttribute.setX(index, sparseValues[i * itemSize]);
@@ -1936,6 +1937,7 @@ class GLTFParser {
           if (itemSize >= 4) bufferAttribute.setW(index, sparseValues[i * itemSize + 3]);
           if (itemSize >= 5) throw new Error('THREE.GLTFLoader: Unsupported itemSize in sparse BufferAttribute.');
         }
+        bufferAttribute.normalized = normalized;
       }
       return bufferAttribute;
     });
@@ -1981,6 +1983,7 @@ class GLTFParser {
       texture.minFilter = WEBGL_FILTERS[sampler.minFilter] || LinearMipmapLinearFilter;
       texture.wrapS = WEBGL_WRAPPINGS[sampler.wrapS] || RepeatWrapping;
       texture.wrapT = WEBGL_WRAPPINGS[sampler.wrapT] || RepeatWrapping;
+      texture.generateMipmaps = !texture.isCompressedTexture && texture.minFilter !== NearestFilter && texture.minFilter !== LinearFilter;
       parser.associations.set(texture, {
         textures: textureIndex
       });

package/lib/ThreeExtended/loaders/KTX2Loader.js

@@ -9,12 +9,14 @@
  * References:
  * - KTX: http://github.khronos.org/KTX-Specification/
  * - DFD: https://www.khronos.org/registry/DataFormat/specs/1.3/dataformat.1.3.html#basicdescriptor
+ * - BasisU HDR: https://github.com/BinomialLLC/basis_universal/wiki/UASTC-HDR-Texture-Specification-v1.0
  */
 
-import { CompressedTexture, CompressedArrayTexture, CompressedCubeTexture, Data3DTexture, DataTexture, DisplayP3ColorSpace, FileLoader, FloatType, HalfFloatType, NoColorSpace, LinearFilter, LinearMipmapLinearFilter, LinearDisplayP3ColorSpace, LinearSRGBColorSpace, Loader, RedFormat, RGB_ETC1_Format, RGB_ETC2_Format, RGB_PVRTC_4BPPV1_Format, RGBA_ASTC_4x4_Format, RGBA_ASTC_6x6_Format, RGBA_BPTC_Format, RGBA_ETC2_EAC_Format, RGBA_PVRTC_4BPPV1_Format, RGBA_S3TC_DXT5_Format, RGBA_S3TC_DXT1_Format, RGBAFormat, RGFormat, SRGBColorSpace, UnsignedByteType } from 'three';
+import { CompressedTexture, CompressedArrayTexture, CompressedCubeTexture, Data3DTexture, DataTexture, FileLoader, FloatType, HalfFloatType, NoColorSpace, LinearFilter, LinearMipmapLinearFilter, LinearSRGBColorSpace, Loader, RedFormat, RGB_BPTC_UNSIGNED_Format, RGB_ETC1_Format, RGB_ETC2_Format, RGB_PVRTC_4BPPV1_Format, RGBA_ASTC_4x4_Format, RGBA_ASTC_6x6_Format, RGBA_BPTC_Format, RGBA_ETC2_EAC_Format, RGBA_PVRTC_4BPPV1_Format, RGBA_S3TC_DXT5_Format, RGBA_S3TC_DXT1_Format, RGBAFormat, RGFormat, SRGBColorSpace, UnsignedByteType } from 'three';
 import { WorkerPool } from "../utils/WorkerPool.js";
-import { read, KHR_DF_FLAG_ALPHA_PREMULTIPLIED, KHR_DF_TRANSFER_SRGB, KHR_SUPERCOMPRESSION_NONE, KHR_SUPERCOMPRESSION_ZSTD, VK_FORMAT_UNDEFINED, VK_FORMAT_R16_SFLOAT, VK_FORMAT_R16G16_SFLOAT, VK_FORMAT_R16G16B16A16_SFLOAT, VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, VK_FORMAT_R8_SRGB, VK_FORMAT_R8_UNORM, VK_FORMAT_R8G8_SRGB, VK_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8B8A8_SRGB, VK_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_ASTC_6x6_SRGB_BLOCK, VK_FORMAT_ASTC_6x6_UNORM_BLOCK, KHR_DF_PRIMARIES_UNSPECIFIED, KHR_DF_PRIMARIES_BT709, KHR_DF_PRIMARIES_DISPLAYP3 } from "../libs/ktx-parse.module.js";
+import { read, KHR_DF_FLAG_ALPHA_PREMULTIPLIED, KHR_DF_TRANSFER_SRGB, KHR_SUPERCOMPRESSION_NONE, KHR_SUPERCOMPRESSION_ZSTD, VK_FORMAT_UNDEFINED, VK_FORMAT_R16_SFLOAT, VK_FORMAT_R16G16_SFLOAT, VK_FORMAT_R16G16B16A16_SFLOAT, VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, VK_FORMAT_R8_SRGB, VK_FORMAT_R8_UNORM, VK_FORMAT_R8G8_SRGB, VK_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8B8A8_SRGB, VK_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT, VK_FORMAT_ASTC_6x6_SRGB_BLOCK, VK_FORMAT_ASTC_6x6_UNORM_BLOCK, KHR_DF_PRIMARIES_UNSPECIFIED, KHR_DF_PRIMARIES_BT709, KHR_DF_PRIMARIES_DISPLAYP3 } from "../libs/ktx-parse.module.js";
 import { ZSTDDecoder } from "../libs/zstddec.module.js";
+import { DisplayP3ColorSpace, LinearDisplayP3ColorSpace } from "../math/ColorSpaces.js";
 const _taskCache = new WeakMap();
 let _activeLoaders = 0;
 let _zstd;
@@ -42,6 +44,8 @@ class KTX2Loader extends Loader {
   async detectSupportAsync(renderer) {
     this.workerConfig = {
       astcSupported: await renderer.hasFeatureAsync('texture-compression-astc'),
+      astcHDRSupported: false,
+      // https://github.com/gpuweb/gpuweb/issues/3856
       etc1Supported: await renderer.hasFeatureAsync('texture-compression-etc1'),
       etc2Supported: await renderer.hasFeatureAsync('texture-compression-etc2'),
       dxtSupported: await renderer.hasFeatureAsync('texture-compression-bc'),
@@ -54,6 +58,8 @@ class KTX2Loader extends Loader {
     if (renderer.isWebGPURenderer === true) {
       this.workerConfig = {
         astcSupported: renderer.hasFeature('texture-compression-astc'),
+        astcHDRSupported: false,
+        // https://github.com/gpuweb/gpuweb/issues/3856
         etc1Supported: renderer.hasFeature('texture-compression-etc1'),
         etc2Supported: renderer.hasFeature('texture-compression-etc2'),
         dxtSupported: renderer.hasFeature('texture-compression-bc'),
@@ -63,6 +69,7 @@ class KTX2Loader extends Loader {
     } else {
       this.workerConfig = {
         astcSupported: renderer.extensions.has('WEBGL_compressed_texture_astc'),
+        astcHDRSupported: renderer.extensions.has('WEBGL_compressed_texture_astc') && renderer.extensions.get('WEBGL_compressed_texture_astc').getSupportedProfiles().includes('hdr'),
         etc1Supported: renderer.extensions.has('WEBGL_compressed_texture_etc1'),
         etc2Supported: renderer.extensions.has('WEBGL_compressed_texture_etc'),
         dxtSupported: renderer.extensions.has('WEBGL_compressed_texture_s3tc'),
@@ -89,7 +96,7 @@ class KTX2Loader extends Loader {
       this.transcoderPending = Promise.all([jsContent, binaryContent]).then(_ref => {
         let [jsContent, binaryContent] = _ref;
         const fn = KTX2Loader.BasisWorker.toString();
-        const body = ['/* constants */', 'let _EngineFormat = ' + JSON.stringify(KTX2Loader.EngineFormat), 'let _TranscoderFormat = ' + JSON.stringify(KTX2Loader.TranscoderFormat), 'let _BasisFormat = ' + JSON.stringify(KTX2Loader.BasisFormat), '/* basis_transcoder.js */', jsContent, '/* worker */', fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))].join('\n');
+        const body = ['/* constants */', 'let _EngineFormat = ' + JSON.stringify(KTX2Loader.EngineFormat), 'let _EngineType = ' + JSON.stringify(KTX2Loader.EngineType), 'let _TranscoderFormat = ' + JSON.stringify(KTX2Loader.TranscoderFormat), 'let _BasisFormat = ' + JSON.stringify(KTX2Loader.BasisFormat), '/* basis_transcoder.js */', jsContent, '/* worker */', fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))].join('\n');
         this.workerSourceURL = URL.createObjectURL(new Blob([body]));
         this.transcoderBinary = binaryContent;
         this.workerPool.setWorkerCreator(() => {
@@ -138,21 +145,24 @@ class KTX2Loader extends Loader {
   }
   _createTextureFrom(transcodeResult, container) {
     const {
-      faces,
-      width,
-      height,
-      format,
-      type,
+      type: messageType,
       error,
-      dfdFlags
+      data: {
+        faces,
+        width,
+        height,
+        format,
+        type,
+        dfdFlags
+      }
     } = transcodeResult;
-    if (type === 'error') return Promise.reject(error);
+    if (messageType === 'error') return Promise.reject(error);
     let texture;
     if (container.faceCount === 6) {
-      texture = new CompressedCubeTexture(faces, format, UnsignedByteType);
+      texture = new CompressedCubeTexture(faces, format, type);
     } else {
       const mipmaps = faces[0].mipmaps;
-      texture = container.layerCount > 1 ? new CompressedArrayTexture(mipmaps, width, height, container.layerCount, format, UnsignedByteType) : new CompressedTexture(mipmaps, width, height, format, UnsignedByteType);
+      texture = container.layerCount > 1 ? new CompressedArrayTexture(mipmaps, width, height, container.layerCount, format, type) : new CompressedTexture(mipmaps, width, height, format, type);
     }
     texture.minFilter = faces[0].mipmaps.length === 1 ? LinearFilter : LinearMipmapLinearFilter;
     texture.magFilter = LinearFilter;
@@ -171,7 +181,17 @@ class KTX2Loader extends Loader {
   async _createTexture(buffer) {
     let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     const container = read(new Uint8Array(buffer));
-    if (container.vkFormat !== VK_FORMAT_UNDEFINED) {
+
+    // Basis UASTC HDR is a subset of ASTC, which can be transcoded efficiently
+    // to BC6H. To detect whether a KTX2 file uses Basis UASTC HDR, or default
+    // ASTC, inspect the DFD color model.
+    //
+    // Source: https://github.com/BinomialLLC/basis_universal/issues/381
+    const isBasisHDR = container.vkFormat === VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT && container.dataFormatDescriptor[0].colorModel === 0xA7;
+
+    // If the device supports ASTC, Basis UASTC HDR requires no transcoder.
+    const needsTranscoder = container.vkFormat === VK_FORMAT_UNDEFINED || isBasisHDR && !this.workerConfig.astcHDRSupported;
+    if (!needsTranscoder) {
       return createRawTexture(container);
     }
 
@@ -203,8 +223,11 @@ class KTX2Loader extends Loader {
 
 KTX2Loader.BasisFormat = {
   ETC1S: 0,
-  UASTC_4x4: 1
+  UASTC: 1,
+  UASTC_HDR: 2
 };
+
+// Source: https://github.com/BinomialLLC/basis_universal/blob/master/webgl/texture_test/index.html
 KTX2Loader.TranscoderFormat = {
   ETC1: 0,
   ETC2: 1,
@@ -222,11 +245,15 @@ KTX2Loader.TranscoderFormat = {
   RGBA32: 13,
   RGB565: 14,
   BGR565: 15,
-  RGBA4444: 16
+  RGBA4444: 16,
+  BC6H: 22,
+  RGB_HALF: 24,
+  RGBA_HALF: 25
 };
 KTX2Loader.EngineFormat = {
   RGBAFormat: RGBAFormat,
   RGBA_ASTC_4x4_Format: RGBA_ASTC_4x4_Format,
+  RGB_BPTC_UNSIGNED_Format: RGB_BPTC_UNSIGNED_Format,
   RGBA_BPTC_Format: RGBA_BPTC_Format,
   RGBA_ETC2_EAC_Format: RGBA_ETC2_EAC_Format,
   RGBA_PVRTC_4BPPV1_Format: RGBA_PVRTC_4BPPV1_Format,
@@ -236,6 +263,11 @@ KTX2Loader.EngineFormat = {
   RGB_PVRTC_4BPPV1_Format: RGB_PVRTC_4BPPV1_Format,
   RGBA_S3TC_DXT1_Format: RGBA_S3TC_DXT1_Format
 };
+KTX2Loader.EngineType = {
+  UnsignedByteType: UnsignedByteType,
+  HalfFloatType: HalfFloatType,
+  FloatType: FloatType
+};
 
 /* WEB WORKER */
 
@@ -244,6 +276,7 @@ KTX2Loader.BasisWorker = function () {
   let transcoderPending;
   let BasisModule;
   const EngineFormat = _EngineFormat; // eslint-disable-line no-undef
+  const EngineType = _EngineType; // eslint-disable-line no-undef
   const TranscoderFormat = _TranscoderFormat; // eslint-disable-line no-undef
   const BasisFormat = _BasisFormat; // eslint-disable-line no-undef
 
@@ -264,17 +297,21 @@ KTX2Loader.BasisWorker = function () {
               height,
               hasAlpha,
               format,
+              type,
               dfdFlags
             } = transcode(message.buffer);
             self.postMessage({
               type: 'transcode',
               id: message.id,
-              faces,
-              width,
-              height,
-              hasAlpha,
-              format,
-              dfdFlags
+              data: {
+                faces,
+                width,
+                height,
+                hasAlpha,
+                format,
+                type,
+                dfdFlags
+              }
             }, buffers);
           } catch (error) {
             console.error(error);
@@ -312,7 +349,16 @@ KTX2Loader.BasisWorker = function () {
       cleanup();
       throw new Error('THREE.KTX2Loader:	Invalid or unsupported .ktx2 file');
     }
-    const basisFormat = ktx2File.isUASTC() ? BasisFormat.UASTC_4x4 : BasisFormat.ETC1S;
+    let basisFormat;
+    if (ktx2File.isUASTC()) {
+      basisFormat = BasisFormat.UASTC;
+    } else if (ktx2File.isETC1S()) {
+      basisFormat = BasisFormat.ETC1S;
+    } else if (ktx2File.isHDR()) {
+      basisFormat = BasisFormat.UASTC_HDR;
+    } else {
+      throw new Error('THREE.KTX2Loader: Unknown Basis encoding');
+    }
     const width = ktx2File.getWidth();
     const height = ktx2File.getHeight();
     const layerCount = ktx2File.getLayers() || 1;
@@ -322,7 +368,8 @@ KTX2Loader.BasisWorker = function () {
     const dfdFlags = ktx2File.getDFDFlags();
     const {
       transcoderFormat,
-      engineFormat
+      engineFormat,
+      engineType
     } = getTranscoderFormat(basisFormat, width, height, hasAlpha);
     if (!width || !height || !levelCount) {
       cleanup();
@@ -354,8 +401,11 @@ KTX2Loader.BasisWorker = function () {
             mipWidth = levelInfo.width;
             mipHeight = levelInfo.height;
           }
-          const dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, transcoderFormat));
+          let dst = new Uint8Array(ktx2File.getImageTranscodedSizeInBytes(mip, layer, 0, transcoderFormat));
           const status = ktx2File.transcodeImage(dst, mip, layer, face, transcoderFormat, 0, -1, -1);
+          if (engineType === EngineType.HalfFloatType) {
+            dst = new Uint16Array(dst.buffer, dst.byteOffset, dst.byteLength / Uint16Array.BYTES_PER_ELEMENT);
+          }
           if (!status) {
             cleanup();
             throw new Error('THREE.KTX2Loader: .transcodeImage failed.');
@@ -374,7 +424,8 @@ KTX2Loader.BasisWorker = function () {
         mipmaps,
         width,
         height,
-        format: engineFormat
+        format: engineFormat,
+        type: engineType
       });
     }
     cleanup();
@@ -384,99 +435,131 @@ KTX2Loader.BasisWorker = function () {
       width,
       height,
       hasAlpha,
+      dfdFlags,
       format: engineFormat,
-      dfdFlags
+      type: engineType
     };
   }
 
   //
 
-  // Optimal choice of a transcoder target format depends on the Basis format (ETC1S or UASTC),
-  // device capabilities, and texture dimensions. The list below ranks the formats separately
-  // for ETC1S and UASTC.
+  // Optimal choice of a transcoder target format depends on the Basis format (ETC1S, UASTC, or
+  // UASTC HDR), device capabilities, and texture dimensions. The list below ranks the formats
+  // separately for each format. Currently, priority is assigned based on:
+  //
+  //   high quality > low quality > uncompressed
+  //
+  // Prioritization may be revisited, or exposed for configuration, in the future.
   //
-  // In some cases, transcoding UASTC to RGBA32 might be preferred for higher quality (at
-  // significant memory cost) compared to ETC1/2, BC1/3, and PVRTC. The transcoder currently
-  // chooses RGBA32 only as a last resort and does not expose that option to the caller.
+  // Reference: https://github.com/KhronosGroup/3D-Formats-Guidelines/blob/main/KTXDeveloperGuide.md
   const FORMAT_OPTIONS = [{
     if: 'astcSupported',
-    basisFormat: [BasisFormat.UASTC_4x4],
+    basisFormat: [BasisFormat.UASTC],
     transcoderFormat: [TranscoderFormat.ASTC_4x4, TranscoderFormat.ASTC_4x4],
     engineFormat: [EngineFormat.RGBA_ASTC_4x4_Format, EngineFormat.RGBA_ASTC_4x4_Format],
+    engineType: [EngineType.UnsignedByteType],
     priorityETC1S: Infinity,
     priorityUASTC: 1,
     needsPowerOfTwo: false
   }, {
     if: 'bptcSupported',
-    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC_4x4],
+    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC],
     transcoderFormat: [TranscoderFormat.BC7_M5, TranscoderFormat.BC7_M5],
     engineFormat: [EngineFormat.RGBA_BPTC_Format, EngineFormat.RGBA_BPTC_Format],
+    engineType: [EngineType.UnsignedByteType],
     priorityETC1S: 3,
     priorityUASTC: 2,
     needsPowerOfTwo: false
   }, {
     if: 'dxtSupported',
-    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC_4x4],
+    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC],
     transcoderFormat: [TranscoderFormat.BC1, TranscoderFormat.BC3],
     engineFormat: [EngineFormat.RGBA_S3TC_DXT1_Format, EngineFormat.RGBA_S3TC_DXT5_Format],
+    engineType: [EngineType.UnsignedByteType],
     priorityETC1S: 4,
     priorityUASTC: 5,
     needsPowerOfTwo: false
   }, {
     if: 'etc2Supported',
-    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC_4x4],
+    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC],
     transcoderFormat: [TranscoderFormat.ETC1, TranscoderFormat.ETC2],
     engineFormat: [EngineFormat.RGB_ETC2_Format, EngineFormat.RGBA_ETC2_EAC_Format],
+    engineType: [EngineType.UnsignedByteType],
     priorityETC1S: 1,
     priorityUASTC: 3,
     needsPowerOfTwo: false
   }, {
     if: 'etc1Supported',
-    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC_4x4],
+    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC],
     transcoderFormat: [TranscoderFormat.ETC1],
     engineFormat: [EngineFormat.RGB_ETC1_Format],
+    engineType: [EngineType.UnsignedByteType],
     priorityETC1S: 2,
     priorityUASTC: 4,
     needsPowerOfTwo: false
   }, {
     if: 'pvrtcSupported',
-    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC_4x4],
+    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC],
     transcoderFormat: [TranscoderFormat.PVRTC1_4_RGB, TranscoderFormat.PVRTC1_4_RGBA],
     engineFormat: [EngineFormat.RGB_PVRTC_4BPPV1_Format, EngineFormat.RGBA_PVRTC_4BPPV1_Format],
+    engineType: [EngineType.UnsignedByteType],
     priorityETC1S: 5,
     priorityUASTC: 6,
     needsPowerOfTwo: true
+  }, {
+    if: 'bptcSupported',
+    basisFormat: [BasisFormat.UASTC_HDR],
+    transcoderFormat: [TranscoderFormat.BC6H],
+    engineFormat: [EngineFormat.RGB_BPTC_UNSIGNED_Format],
+    engineType: [EngineType.HalfFloatType],
+    priorityHDR: 1,
+    needsPowerOfTwo: false
+  },
+  // Uncompressed fallbacks.
+
+  {
+    basisFormat: [BasisFormat.ETC1S, BasisFormat.UASTC],
+    transcoderFormat: [TranscoderFormat.RGBA32, TranscoderFormat.RGBA32],
+    engineFormat: [EngineFormat.RGBAFormat, EngineFormat.RGBAFormat],
+    engineType: [EngineType.UnsignedByteType, EngineType.UnsignedByteType],
+    priorityETC1S: 100,
+    priorityUASTC: 100,
+    needsPowerOfTwo: false
+  }, {
+    basisFormat: [BasisFormat.UASTC_HDR],
+    transcoderFormat: [TranscoderFormat.RGBA_HALF],
+    engineFormat: [EngineFormat.RGBAFormat],
+    engineType: [EngineType.HalfFloatType],
+    priorityHDR: 100,
+    needsPowerOfTwo: false
   }];
-  const ETC1S_OPTIONS = FORMAT_OPTIONS.sort(function (a, b) {
-    return a.priorityETC1S - b.priorityETC1S;
-  });
-  const UASTC_OPTIONS = FORMAT_OPTIONS.sort(function (a, b) {
-    return a.priorityUASTC - b.priorityUASTC;
-  });
+  const OPTIONS = {
+    // TODO: For ETC1S we intentionally sort by _UASTC_ priority, preserving
+    // a historical accident shown to avoid performance pitfalls for Linux with
+    // Firefox & AMD GPU (RadeonSI). Further work needed.
+    // See https://github.com/mrdoob/three.js/pull/29730.
+    [BasisFormat.ETC1S]: FORMAT_OPTIONS.filter(opt => opt.basisFormat.includes(BasisFormat.ETC1S)).sort((a, b) => a.priorityUASTC - b.priorityUASTC),
+    [BasisFormat.UASTC]: FORMAT_OPTIONS.filter(opt => opt.basisFormat.includes(BasisFormat.UASTC)).sort((a, b) => a.priorityUASTC - b.priorityUASTC),
+    [BasisFormat.UASTC_HDR]: FORMAT_OPTIONS.filter(opt => opt.basisFormat.includes(BasisFormat.UASTC_HDR)).sort((a, b) => a.priorityHDR - b.priorityHDR)
+  };
   function getTranscoderFormat(basisFormat, width, height, hasAlpha) {
-    let transcoderFormat;
-    let engineFormat;
-    const options = basisFormat === BasisFormat.ETC1S ? ETC1S_OPTIONS : UASTC_OPTIONS;
+    const options = OPTIONS[basisFormat];
     for (let i = 0; i < options.length; i++) {
       const opt = options[i];
-      if (!config[opt.if]) continue;
+      if (opt.if && !config[opt.if]) continue;
       if (!opt.basisFormat.includes(basisFormat)) continue;
       if (hasAlpha && opt.transcoderFormat.length < 2) continue;
       if (opt.needsPowerOfTwo && !(isPowerOfTwo(width) && isPowerOfTwo(height))) continue;
-      transcoderFormat = opt.transcoderFormat[hasAlpha ? 1 : 0];
-      engineFormat = opt.engineFormat[hasAlpha ? 1 : 0];
+      const transcoderFormat = opt.transcoderFormat[hasAlpha ? 1 : 0];
+      const engineFormat = opt.engineFormat[hasAlpha ? 1 : 0];
+      const engineType = opt.engineType[0];
       return {
         transcoderFormat,
-        engineFormat
+        engineFormat,
+        engineType
       };
     }
-    console.warn('THREE.KTX2Loader: No suitable compressed texture format found. Decoding to RGBA32.');
-    transcoderFormat = TranscoderFormat.RGBA32;
-    engineFormat = EngineFormat.RGBAFormat;
-    return {
-      transcoderFormat,
-      engineFormat
-    };
+    throw new Error('THREE.KTX2Loader: Failed to identify transcoding target.');
   }
   function isPowerOfTwo(value) {
     if (value <= 2) return true;
@@ -502,8 +585,7 @@ KTX2Loader.BasisWorker = function () {
   }
 };
 
-//
-// Parsing for non-Basis textures. These textures are may have supercompression
+// Parsing for non-Basis textures. These textures may have supercompression
 // like Zstd, but they do not require transcoding.
 
 const UNCOMPRESSED_FORMATS = new Set([RGBAFormat, RGFormat, RedFormat]);
@@ -520,6 +602,7 @@ const FORMAT_MAP = {
   [VK_FORMAT_R16_SFLOAT]: RedFormat,
   [VK_FORMAT_R8_SRGB]: RedFormat,
   [VK_FORMAT_R8_UNORM]: RedFormat,
+  [VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT]: RGBA_ASTC_4x4_Format,
   [VK_FORMAT_ASTC_6x6_SRGB_BLOCK]: RGBA_ASTC_6x6_Format,
   [VK_FORMAT_ASTC_6x6_UNORM_BLOCK]: RGBA_ASTC_6x6_Format
 };
@@ -536,6 +619,7 @@ const TYPE_MAP = {
   [VK_FORMAT_R16_SFLOAT]: HalfFloatType,
   [VK_FORMAT_R8_SRGB]: UnsignedByteType,
   [VK_FORMAT_R8_UNORM]: UnsignedByteType,
+  [VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT]: HalfFloatType,
   [VK_FORMAT_ASTC_6x6_SRGB_BLOCK]: UnsignedByteType,
   [VK_FORMAT_ASTC_6x6_UNORM_BLOCK]: UnsignedByteType
 };

package/lib/ThreeExtended/math/ColorSpaces.js

@@ -0,0 +1,59 @@
+import { LinearTransfer, Matrix3, SRGBTransfer } from 'three';
+
+// Reference: http://www.russellcottrell.com/photo/matrixCalculator.htm
+
+const P3_PRIMARIES = [0.680, 0.320, 0.265, 0.690, 0.150, 0.060];
+const P3_LUMINANCE_COEFFICIENTS = [0.2289, 0.6917, 0.0793];
+const REC2020_PRIMARIES = [0.708, 0.292, 0.170, 0.797, 0.131, 0.046];
+const REC2020_LUMINANCE_COEFFICIENTS = [0.2627, 0.6780, 0.0593];
+const D65 = [0.3127, 0.3290];
+
+/******************************************************************************
+ * Display P3 definitions
+ */
+
+const LINEAR_DISPLAY_P3_TO_XYZ = /*@__PURE__*/new Matrix3().set(0.4865709, 0.2656677, 0.1982173, 0.2289746, 0.6917385, 0.0792869, 0.0000000, 0.0451134, 1.0439444);
+const XYZ_TO_LINEAR_DISPLAY_P3 = /*@__PURE__*/new Matrix3().set(2.4934969, -0.9313836, -0.4027108, -0.8294890, 1.7626641, 0.0236247, 0.0358458, -0.0761724, 0.9568845);
+export const DisplayP3ColorSpace = 'display-p3';
+export const LinearDisplayP3ColorSpace = 'display-p3-linear';
+export const DisplayP3ColorSpaceImpl = {
+  primaries: P3_PRIMARIES,
+  whitePoint: D65,
+  transfer: SRGBTransfer,
+  toXYZ: LINEAR_DISPLAY_P3_TO_XYZ,
+  fromXYZ: XYZ_TO_LINEAR_DISPLAY_P3,
+  luminanceCoefficients: P3_LUMINANCE_COEFFICIENTS,
+  outputColorSpaceConfig: {
+    drawingBufferColorSpace: DisplayP3ColorSpace
+  }
+};
+export const LinearDisplayP3ColorSpaceImpl = {
+  primaries: P3_PRIMARIES,
+  whitePoint: D65,
+  transfer: LinearTransfer,
+  toXYZ: LINEAR_DISPLAY_P3_TO_XYZ,
+  fromXYZ: XYZ_TO_LINEAR_DISPLAY_P3,
+  luminanceCoefficients: P3_LUMINANCE_COEFFICIENTS,
+  workingColorSpaceConfig: {
+    unpackColorSpace: DisplayP3ColorSpace
+  },
+  outputColorSpaceConfig: {
+    drawingBufferColorSpace: DisplayP3ColorSpace
+  }
+};
+
+/******************************************************************************
+ * Rec. 2020 definitions
+ */
+
+const LINEAR_REC2020_TO_XYZ = /*@__PURE__*/new Matrix3().set(0.6369580, 0.1446169, 0.1688810, 0.2627002, 0.6779981, 0.0593017, 0.0000000, 0.0280727, 1.0609851);
+const XYZ_TO_LINEAR_REC2020 = /*@__PURE__*/new Matrix3().set(1.7166512, -0.3556708, -0.2533663, -0.6666844, 1.6164812, 0.0157685, 0.0176399, -0.0427706, 0.9421031);
+export const LinearRec2020ColorSpace = 'rec2020-linear';
+export const LinearRec2020ColorSpaceImpl = {
+  primaries: REC2020_PRIMARIES,
+  whitePoint: D65,
+  transfer: LinearTransfer,
+  toXYZ: LINEAR_REC2020_TO_XYZ,
+  fromXYZ: XYZ_TO_LINEAR_REC2020,
+  luminanceCoefficients: REC2020_LUMINANCE_COEFFICIENTS
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.44.3-next.37",
+  "version": "2.44.3-next.39",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",
@@ -61,7 +61,7 @@
     "@maplibre/maplibre-gl-style-spec": "^22.0.0",
     "@tmcw/togeojson": "^5.8.1",
     "@tweenjs/tween.js": "^25.0.0",
-    "3d-tiles-renderer": "^0.3.39",
+    "3d-tiles-renderer": "^0.4.4",
     "brotli-compress": "^1.3.3",
     "copc": "^0.0.6",
     "earcut": "^3.0.0",
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "proj4": "^2.12.1",
-    "three": "^0.168.0"
+    "three": "^0.170.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.6",
@@ -84,7 +84,7 @@
     "@babel/register": "^7.24.6",
     "@stylistic/eslint-plugin": "^2.8.0",
     "@types/proj4": "^2.5.5",
-    "@types/three": "^0.168.0",
+    "@types/three": "^0.170.0",
     "@typescript-eslint/eslint-plugin": "^8.5.0",
     "@typescript-eslint/parser": "^8.5.0",
     "@xmldom/xmldom": "^0.9.2",
@@ -120,7 +120,7 @@
     "q": "^1.5.1",
     "replace-in-file": "^8.1.0",
     "sinon": "^19.0.2",
-    "three": "^0.168.0",
+    "three": "^0.170.0",
     "typescript": "^5.6.2",
     "undici": "^7.2.0",
     "webgl-mock": "^0.1.7",