@loaders.gl/i3s 3.1.7 → 3.2.0-alpha.2

package/dist/i3s-content-worker.js

@@ -55,7 +55,7 @@
   var nodeVersion = matches && parseFloat(matches[1]) || 0;
 
   // ../worker-utils/src/lib/env-utils/version.ts
-  var VERSION = true ? "3.1.7" : DEFAULT_VERSION;
+  var VERSION = true ? "3.2.0-alpha.2" : DEFAULT_VERSION;
   if (false) {
     console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
   }
@@ -87,13 +87,13 @@
   // ../worker-utils/src/lib/worker-farm/worker-job.ts
   var WorkerJob = class {
     constructor(jobName, workerThread) {
-      this.name = jobName;
-      this.workerThread = workerThread;
       this.isRunning = true;
       this._resolve = () => {
       };
       this._reject = () => {
       };
+      this.name = jobName;
+      this.workerThread = workerThread;
       this.result = new Promise((resolve, reject) => {
         this._resolve = resolve;
         this._reject = reject;
@@ -118,6 +118,16 @@
     }
   };
 
+  // ../worker-utils/src/lib/node/worker_threads-browser.js
+  var Worker2 = class {
+    on(message, cb) {
+    }
+    postMessage(...args) {
+    }
+    terminate() {
+    }
+  };
+
   // ../worker-utils/src/lib/worker-utils/get-loadable-worker-url.ts
   var workerURLCache = new Map();
   function getLoadableWorkerURL(props) {
@@ -205,10 +215,10 @@
       this.url = url;
       this.onMessage = NOOP;
       this.onError = (error) => console.log(error);
-      this.worker = this._createBrowserWorker();
+      this.worker = isBrowser2 ? this._createBrowserWorker() : this._createNodeWorker();
     }
     static isSupported() {
-      return typeof Worker !== "undefined";
+      return typeof Worker !== "undefined" && isBrowser2 || typeof Worker2 !== void 0;
     }
     destroy() {
       this.onMessage = NOOP;
@@ -251,6 +261,27 @@
       worker.onmessageerror = (event) => console.error(event);
       return worker;
     }
+    _createNodeWorker() {
+      let worker;
+      if (this.url) {
+        const absolute = this.url.includes(":/") || this.url.startsWith("/");
+        const url = absolute ? this.url : `./${this.url}`;
+        worker = new Worker2(url, { eval: false });
+      } else if (this.source) {
+        worker = new Worker2(this.source, { eval: true });
+      } else {
+        throw new Error("no worker");
+      }
+      worker.on("message", (data) => {
+        this.onMessage(data);
+      });
+      worker.on("error", (error) => {
+        this.onError(error);
+      });
+      worker.on("exit", (code) => {
+      });
+      return worker;
+    }
   };
 
   // ../worker-utils/src/lib/worker-farm/worker-pool.ts
@@ -271,6 +302,9 @@
       this.url = props.url;
       this.setProps(props);
     }
+    static isSupported() {
+      return WorkerThread.isSupported();
+    }
     destroy() {
       this.idleQueue.forEach((worker) => worker.destroy());
       this.isDestroyed = true;
@@ -360,9 +394,9 @@
   var DEFAULT_PROPS = {
     maxConcurrency: 3,
     maxMobileConcurrency: 1,
+    reuseWorkers: true,
     onDebug: () => {
-    },
-    reuseWorkers: true
+    }
   };
   var WorkerFarm = class {
     constructor(props) {
@@ -383,6 +417,7 @@
       for (const workerPool of this.workerPools.values()) {
         workerPool.destroy();
       }
+      this.workerPools = new Map();
     }
     setProps(props) {
       this.props = { ...this.props, ...props };
@@ -415,16 +450,33 @@
   };
 
   // ../worker-utils/src/lib/worker-farm/worker-body.ts
+  function getParentPort() {
+    let parentPort;
+    try {
+      eval("globalThis.parentPort = require('worker_threads').parentPort");
+      parentPort = globalThis.parentPort;
+    } catch {
+    }
+    return parentPort;
+  }
   var onMessageWrapperMap = new Map();
   var WorkerBody = class {
+    static inWorkerThread() {
+      return typeof self !== "undefined" || Boolean(getParentPort());
+    }
     static set onmessage(onMessage2) {
-      self.onmessage = (message) => {
-        if (!isKnownMessage(message)) {
-          return;
-        }
-        const { type, payload } = message.data;
+      function handleMessage(message) {
+        const parentPort3 = getParentPort();
+        const { type, payload } = parentPort3 ? message : message.data;
         onMessage2(type, payload);
-      };
+      }
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        parentPort2.on("message", handleMessage);
+        parentPort2.on("exit", () => console.debug("Node worker closing"));
+      } else {
+        globalThis.onmessage = handleMessage;
+      }
     }
     static addEventListener(onMessage2) {
       let onMessageWrapper = onMessageWrapperMap.get(onMessage2);
@@ -433,22 +485,36 @@
           if (!isKnownMessage(message)) {
             return;
           }
-          const { type, payload } = message.data;
+          const parentPort3 = getParentPort();
+          const { type, payload } = parentPort3 ? message : message.data;
           onMessage2(type, payload);
         };
       }
-      self.addEventListener("message", onMessageWrapper);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        console.error("not implemented");
+      } else {
+        globalThis.addEventListener("message", onMessageWrapper);
+      }
     }
     static removeEventListener(onMessage2) {
       const onMessageWrapper = onMessageWrapperMap.get(onMessage2);
       onMessageWrapperMap.delete(onMessage2);
-      self.removeEventListener("message", onMessageWrapper);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        console.error("not implemented");
+      } else {
+        globalThis.removeEventListener("message", onMessageWrapper);
+      }
     }
     static postMessage(type, payload) {
-      if (self) {
-        const data = { source: "loaders.gl", type, payload };
-        const transferList = getTransferList(payload);
-        self.postMessage(data, transferList);
+      const data = { source: "loaders.gl", type, payload };
+      const transferList = getTransferList(payload);
+      const parentPort2 = getParentPort();
+      if (parentPort2) {
+        parentPort2.postMessage(data, transferList);
+      } else {
+        globalThis.postMessage(data, transferList);
       }
     }
   };
@@ -458,7 +524,7 @@
   }
 
   // ../worker-utils/src/lib/worker-api/get-worker-url.ts
-  var NPM_TAG = "latest";
+  var NPM_TAG = "beta";
   function getWorkerURL(worker, options = {}) {
     const workerOptions = options[worker.id] || {};
     const workerFile = `${worker.id}-worker.js`;
@@ -493,7 +559,7 @@
 
   // ../worker-utils/src/lib/library-utils/library-utils.ts
   var node = __toModule(require_require_utils());
-  var LATEST = "latest";
+  var LATEST = "beta";
   var VERSION2 = typeof VERSION !== "undefined" ? VERSION : LATEST;
   var loadLibraryPromises = {};
   async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
@@ -564,7 +630,7 @@
   // ../loader-utils/src/lib/worker-loader-utils/create-loader-worker.ts
   var requestId = 0;
   function createLoaderWorker(loader) {
-    if (typeof self === "undefined") {
+    if (!WorkerBody.inWorkerThread()) {
       return;
     }
     WorkerBody.onmessage = async (type, payload) => {
@@ -640,6 +706,9 @@
     if (!WorkerFarm.isSupported()) {
       return false;
     }
+    if (!isBrowser2 && !options?._nodeWorkers) {
+      return false;
+    }
     return loader.worker && options?.worker;
   }
   async function parseWithWorker(loader, data, options, context, parseOnMainThread2) {
@@ -932,7 +1001,7 @@
         text += ` ${await response.text()}`;
       }
       message += text;
-      message = message.length > 60 ? `${message.slice(60)}...` : message;
+      message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
     } catch (error) {
     }
     return message;
@@ -1016,7 +1085,7 @@
   var process_ = globals3.process || {};
 
   // ../../node_modules/probe.gl/dist/esm/utils/globals.js
-  var VERSION3 = true ? "3.1.7" : "untranspiled source";
+  var VERSION3 = true ? "3.2.0-alpha.2" : "untranspiled source";
   var isBrowser4 = isBrowser3();
 
   // ../../node_modules/probe.gl/dist/esm/utils/local-storage.js
@@ -1549,7 +1618,8 @@
     worker: true,
     maxConcurrency: 3,
     maxMobileConcurrency: 1,
-    reuseWorkers: true,
+    reuseWorkers: isBrowser,
+    _nodeWorkers: false,
     _workerType: "",
     limit: 0,
     _limitMB: 0,
@@ -1761,7 +1831,7 @@
   var process_2 = globals4.process || {};
 
   // ../../node_modules/@probe.gl/env/dist/esm/utils/globals.js
-  var VERSION4 = true ? "3.1.7" : "untranspiled source";
+  var VERSION4 = true ? "3.2.0-alpha.2" : "untranspiled source";
   var isBrowser6 = isBrowser5();
 
   // ../../node_modules/@probe.gl/log/dist/esm/utils/local-storage.js
@@ -4877,7 +4947,7 @@
   };
 
   // ../images/src/lib/utils/version.ts
-  var VERSION5 = true ? "3.1.7" : "latest";
+  var VERSION5 = true ? "3.2.0-alpha.2" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var { _parseImageNode } = globalThis;
@@ -5225,7 +5295,7 @@
   };
 
   // ../draco/src/lib/utils/version.ts
-  var VERSION6 = true ? "3.1.7" : "latest";
+  var VERSION6 = true ? "3.2.0-alpha.2" : "latest";
 
   // ../draco/src/draco-loader.ts
   var DEFAULT_DRACO_OPTIONS = {
@@ -6209,10 +6279,10 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION7 = true ? "3.1.7" : "latest";
+  var VERSION7 = true ? "3.2.0-alpha.2" : "beta";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
-  var VERSION8 = true ? "3.1.7" : "latest";
+  var VERSION8 = true ? "3.2.0-alpha.2" : "beta";
   var BASIS_CDN_ENCODER_WASM = `https://unpkg.com/@loaders.gl/textures@${VERSION8}/dist/libs/basis_encoder.wasm`;
   var BASIS_CDN_ENCODER_JS = `https://unpkg.com/@loaders.gl/textures@${VERSION8}/dist/libs/basis_encoder.js`;
   var loadBasisTranscoderPromise;
@@ -6693,7 +6763,7 @@
     const basisFile = new BasisFile(new Uint8Array(data));
     try {
       if (!basisFile.startTranscoding()) {
-        return null;
+        throw new Error("Failed to start basis transcoding");
       }
       const imageCount = basisFile.getNumImages();
       const images = [];
@@ -6719,22 +6789,22 @@
     const decodedSize = basisFile.getImageTranscodedSizeInBytes(imageIndex, levelIndex, basisFormat);
     const decodedData = new Uint8Array(decodedSize);
     if (!basisFile.transcodeImage(decodedData, imageIndex, levelIndex, basisFormat, 0, 0)) {
-      return null;
+      throw new Error("failed to start Basis transcoding");
     }
     return {
       width,
       height,
       data: decodedData,
       compressed,
-      hasAlpha,
-      format
+      format,
+      hasAlpha
     };
   }
   function parseKTX2File(KTX2File, data, options) {
     const ktx2File = new KTX2File(new Uint8Array(data));
     try {
       if (!ktx2File.startTranscoding()) {
-        return null;
+        throw new Error("failed to start KTX2 transcoding");
       }
       const levelsCount = ktx2File.getLevels();
       const levels = [];
@@ -6742,7 +6812,7 @@
         levels.push(transcodeKTX2Image(ktx2File, levelIndex, options));
         break;
       }
-      return levels;
+      return [levels];
     } finally {
       ktx2File.close();
       ktx2File.delete();
@@ -6754,14 +6824,14 @@
     const decodedSize = ktx2File.getImageTranscodedSizeInBytes(levelIndex, 0, 0, basisFormat);
     const decodedData = new Uint8Array(decodedSize);
     if (!ktx2File.transcodeImage(decodedData, levelIndex, 0, 0, basisFormat, 0, -1, -1)) {
-      return null;
+      throw new Error("Failed to transcode KTX2 image");
     }
     return {
       width,
       height,
       data: decodedData,
       compressed,
-      alphaFlag,
+      hasAlpha: alphaFlag,
       format
     };
   }
@@ -7147,7 +7217,7 @@
           containerFormat: "ktx2",
           module: "encoder"
         };
-        return await parseBasis(arrayBuffer, options);
+        return (await parseBasis(arrayBuffer, options))[0];
       }
       return parseCompressedTexture(arrayBuffer);
     }
@@ -7881,7 +7951,10 @@
             tile.content.texture = await parse(arrayBuffer2, loader, options2);
           }
         } else if (loader === CompressedTextureLoader || loader === BasisLoader) {
-          const texture = await load(arrayBuffer2, loader, tile.textureLoaderOptions);
+          let texture = await load(arrayBuffer2, loader, tile.textureLoaderOptions);
+          if (loader === BasisLoader) {
+            texture = texture[0];
+          }
           tile.content.texture = {
             compressed: true,
             mipmaps: false,
@@ -8033,38 +8106,38 @@
       byteOffset
     };
   }
-  function normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, vertexCount, attributesOrder) {
+  function normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, attributeCount, attributesOrder) {
     const attributes = {};
     for (const attribute of attributesOrder) {
       if (vertexAttributes[attribute]) {
         const { valueType, valuesPerElement } = vertexAttributes[attribute];
-        const count = vertexCount;
-        if (byteOffset + count * valuesPerElement > arrayBuffer.byteLength) {
+        if (byteOffset + attributeCount * valuesPerElement * sizeOf(valueType) <= arrayBuffer.byteLength) {
+          const buffer = arrayBuffer.slice(byteOffset);
+          let value;
+          if (valueType === "UInt64") {
+            value = parseUint64Values(buffer, attributeCount * valuesPerElement, sizeOf(valueType));
+          } else {
+            const TypedArrayType = getConstructorForDataFormat(valueType);
+            value = new TypedArrayType(buffer, 0, attributeCount * valuesPerElement);
+          }
+          attributes[attribute] = {
+            value,
+            type: GL_TYPE_MAP[valueType],
+            size: valuesPerElement
+          };
+          switch (attribute) {
+            case "color":
+              attributes.color.normalized = true;
+              break;
+            case "position":
+            case "region":
+            case "normal":
+            default:
+          }
+          byteOffset = byteOffset + attributeCount * valuesPerElement * sizeOf(valueType);
+        } else if (attribute !== "uv0") {
           break;
         }
-        const buffer = arrayBuffer.slice(byteOffset);
-        let value;
-        if (valueType === "UInt64") {
-          value = parseUint64Values(buffer, count * valuesPerElement, sizeOf(valueType));
-        } else {
-          const TypedArrayType = getConstructorForDataFormat(valueType);
-          value = new TypedArrayType(buffer, 0, count * valuesPerElement);
-        }
-        attributes[attribute] = {
-          value,
-          type: GL_TYPE_MAP[valueType],
-          size: valuesPerElement
-        };
-        switch (attribute) {
-          case "color":
-            attributes.color.normalized = true;
-            break;
-          case "position":
-          case "region":
-          case "normal":
-          default:
-        }
-        byteOffset = byteOffset + count * valuesPerElement * sizeOf(valueType);
       }
     }
     return { attributes, byteOffset };
@@ -8215,7 +8288,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION9 = true ? "3.1.7" : "latest";
+  var VERSION9 = true ? "3.2.0-alpha.2" : "beta";
   var I3SContentLoader = {
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",

package/dist/index.d.ts

@@ -2,6 +2,6 @@ export { I3SLoader } from './i3s-loader';
 export { I3SContentLoader } from './i3s-content-loader';
 export { I3SAttributeLoader, loadFeatureAttributes } from './i3s-attribute-loader';
 export { I3SBuildingSceneLayerLoader } from './i3s-building-scene-layer-loader';
-export type { BoundingVolumes, Mbs, Obb, SceneLayer3D, AttributeStorageInfo, Field, ESRIField, PopupInfo, Node3DIndexDocument, LodSelection, NodeReference, Resource, MaxScreenThresholdSQ, NodeInPage, SharedResources, Attribute, Extent, FeatureAttribute, FieldInfo, I3SMaterialDefinition } from './types';
+export type { BoundingVolumes, Mbs, Obb, SceneLayer3D, AttributeStorageInfo, Field, ESRIField, PopupInfo, Node3DIndexDocument, LodSelection, NodeReference, Resource, MaxScreenThresholdSQ, NodeInPage, SharedResources, Attribute, Extent, FeatureAttribute, FieldInfo, I3SMaterialDefinition, TextureDefinitionInfo, MaterialDefinitionInfo, FullExtent } from './types';
 export { COORDINATE_SYSTEM } from './lib/parsers/constants';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAE,qBAAqB,EAAC,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAC,2BAA2B,EAAC,MAAM,mCAAmC,CAAC;AAC9E,YAAY,EACV,eAAe,EACf,GAAG,EACH,GAAG,EACH,YAAY,EACZ,oBAAoB,EACpB,KAAK,EACL,SAAS,EACT,SAAS,EACT,mBAAmB,EACnB,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,oBAAoB,EACpB,UAAU,EACV,eAAe,EACf,SAAS,EACT,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,qBAAqB,EACtB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,kBAAkB,EAAE,qBAAqB,EAAC,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAC,2BAA2B,EAAC,MAAM,mCAAmC,CAAC;AAC9E,YAAY,EACV,eAAe,EACf,GAAG,EACH,GAAG,EACH,YAAY,EACZ,oBAAoB,EACpB,KAAK,EACL,SAAS,EACT,SAAS,EACT,mBAAmB,EACnB,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,oBAAoB,EACpB,UAAU,EACV,eAAe,EACf,SAAS,EACT,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,UAAU,EACX,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC"}

package/dist/lib/helpers/i3s-nodepages-tiles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-nodepages-tiles.d.ts","sourceRoot":"","sources":["../../../src/lib/helpers/i3s-nodepages-tiles.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACL,gBAAgB,EAEhB,QAAQ,EACR,UAAU,EAIV,gBAAgB,EAEhB,aAAa,EACd,MAAM,aAAa,CAAC;AAErB;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,OAAO,EAAE,gBAAgB,CAAC;IAC1B,SAAS,EAAE,QAAQ,EAAE,CAAM;IAC3B,gBAAgB,EAAE;QAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAA;KAAC,EAAE,CAAM;IAClF,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,iCAAiC,EAAE,CAAC;QAAC,MAAM,EAAE,gBAAgB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,GAAG,IAAI,CAAC,EAAE,CAAM;IAC5F,OAAO,CAAC,oBAAoB,CAA4B;IAExD;;;;;OAKG;gBACS,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,aAAa;IAS7D;;;OAGG;IACG,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAqBlD;;;OAGG;IAEG,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAuD/D;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IA6BrB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAiBvB;;;;;;;OAOG;IACH,OAAO,CAAC,0BAA0B;IAuBlC;;;;OAIG;IACH,OAAO,CAAC,wCAAwC;IA2BhD;;;OAGG;IACH,OAAO,CAAC,0BAA0B;CAuBnC"}
+{"version":3,"file":"i3s-nodepages-tiles.d.ts","sourceRoot":"","sources":["../../../src/lib/helpers/i3s-nodepages-tiles.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACL,gBAAgB,EAEhB,QAAQ,EACR,UAAU,EAIV,gBAAgB,EAEhB,aAAa,EACd,MAAM,aAAa,CAAC;AAErB;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,OAAO,EAAE,gBAAgB,CAAC;IAC1B,SAAS,EAAE,QAAQ,EAAE,CAAM;IAC3B,gBAAgB,EAAE;QAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAA;KAAC,EAAE,CAAM;IAClF,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,iCAAiC,EAAE,CAAC;QAAC,MAAM,EAAE,gBAAgB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,GAAG,IAAI,CAAC,EAAE,CAAM;IAC5F,OAAO,CAAC,oBAAoB,CAA4B;IAExD;;;;;OAKG;gBACS,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,aAAa;IAS7D;;;OAGG;IACG,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAqBlD;;;OAGG;IAEG,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IA4D/D;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IA6BrB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAiBvB;;;;;;;OAOG;IACH,OAAO,CAAC,0BAA0B;IAuBlC;;;;OAIG;IACH,OAAO,CAAC,wCAAwC;IA2BhD;;;OAGG;IACH,OAAO,CAAC,0BAA0B;CAuBnC"}

package/dist/lib/helpers/i3s-nodepages-tiles.js

@@ -51,14 +51,18 @@ class I3SNodePagesTiles {
      * Forms tile header using node and tileset data
      * @param id - id of node through all node pages
      */
-    // eslint-disable-next-line complexity
+    // eslint-disable-next-line complexity, max-statements
     async formTileFromNodePages(id) {
         const node = await this.getNodeById(id);
         const children = [];
+        const childNodesPromises = [];
         for (const child of node.children || []) {
-            const childNode = await this.getNodeById(child);
+            childNodesPromises.push(this.getNodeById(child));
+        }
+        const childNodes = await Promise.all(childNodesPromises);
+        for (const childNode of childNodes) {
             children.push({
-                id: child.toString(),
+                id: childNode.index.toString(),
                 obb: childNode.obb
             });
         }

package/dist/lib/parsers/parse-i3s-tile-content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-i3s-tile-content.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-i3s-tile-content.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAK3E,OAAO,EACL,gBAAgB,EAChB,aAAa,EAQd,MAAM,aAAa,CAAC;AAuBrB,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,gBAAgB,EACzB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,0BA+CxB"}
+{"version":3,"file":"parse-i3s-tile-content.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-i3s-tile-content.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAK3E,OAAO,EACL,gBAAgB,EAChB,aAAa,EAQd,MAAM,aAAa,CAAC;AAuBrB,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,gBAAgB,EACzB,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,aAAa,0BAkDxB"}

package/dist/lib/parsers/parse-i3s-tile-content.js

@@ -50,7 +50,10 @@ async function parseI3STileContent(arrayBuffer, tile, tileset, options, context)
                 }
             }
             else if (loader === textures_1.CompressedTextureLoader || loader === textures_1.BasisLoader) {
-                const texture = await (0, core_1.load)(arrayBuffer, loader, tile.textureLoaderOptions);
+                let texture = await (0, core_1.load)(arrayBuffer, loader, tile.textureLoaderOptions);
+                if (loader === textures_1.BasisLoader) {
+                    texture = texture[0];
+                }
                 tile.content.texture = {
                     compressed: true,
                     mipmaps: false,
@@ -220,47 +223,48 @@ function parseHeaders(tileset, arrayBuffer) {
     };
 }
 /* eslint-enable max-statements */
-function normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, vertexCount, attributesOrder) {
+function normalizeAttributes(arrayBuffer, byteOffset, vertexAttributes, attributeCount, attributesOrder) {
     const attributes = {};
     // the order of attributes depend on the order being added to the vertexAttributes object
     for (const attribute of attributesOrder) {
         if (vertexAttributes[attribute]) {
             const { valueType, valuesPerElement } = vertexAttributes[attribute];
-            // update count and byteOffset count by calculating from defaultGeometrySchema + binnary content
-            const count = vertexCount;
             // protect from arrayBuffer read overunns by NOT assuming node has regions always even though its declared in defaultGeometrySchema.
             // In i3s 1.6: client is required to decide that based on ./shared resource of the node (materialDefinitions.[Mat_id].params.vertexRegions == true)
             // In i3s 1.7 the property has been rolled into the 3d scene layer json/node pages.
             // Code below does not account when the bytelength is actually bigger than
             // the calculated value (b\c the tile potentially could have mesh segmentation information).
             // In those cases tiles without regions could fail or have garbage values.
-            if (byteOffset + count * valuesPerElement > arrayBuffer.byteLength) {
-                break;
-            }
-            const buffer = arrayBuffer.slice(byteOffset);
-            let value;
-            if (valueType === 'UInt64') {
-                value = parseUint64Values(buffer, count * valuesPerElement, (0, constants_1.sizeOf)(valueType));
-            }
-            else {
-                const TypedArrayType = (0, constants_1.getConstructorForDataFormat)(valueType);
-                value = new TypedArrayType(buffer, 0, count * valuesPerElement);
+            if (byteOffset + attributeCount * valuesPerElement * (0, constants_1.sizeOf)(valueType) <=
+                arrayBuffer.byteLength) {
+                const buffer = arrayBuffer.slice(byteOffset);
+                let value;
+                if (valueType === 'UInt64') {
+                    value = parseUint64Values(buffer, attributeCount * valuesPerElement, (0, constants_1.sizeOf)(valueType));
+                }
+                else {
+                    const TypedArrayType = (0, constants_1.getConstructorForDataFormat)(valueType);
+                    value = new TypedArrayType(buffer, 0, attributeCount * valuesPerElement);
+                }
+                attributes[attribute] = {
+                    value,
+                    type: constants_1.GL_TYPE_MAP[valueType],
+                    size: valuesPerElement
+                };
+                switch (attribute) {
+                    case 'color':
+                        attributes.color.normalized = true;
+                        break;
+                    case 'position':
+                    case 'region':
+                    case 'normal':
+                    default:
+                }
+                byteOffset = byteOffset + attributeCount * valuesPerElement * (0, constants_1.sizeOf)(valueType);
             }
-            attributes[attribute] = {
-                value,
-                type: constants_1.GL_TYPE_MAP[valueType],
-                size: valuesPerElement
-            };
-            switch (attribute) {
-                case 'color':
-                    attributes.color.normalized = true;
-                    break;
-                case 'position':
-                case 'region':
-                case 'normal':
-                default:
+            else if (attribute !== 'uv0') {
+                break;
             }
-            byteOffset = byteOffset + count * valuesPerElement * (0, constants_1.sizeOf)(valueType);
         }
     }
     return { attributes, byteOffset };

package/dist/lib/parsers/parse-i3s.js

@@ -70,7 +70,7 @@ async function normalizeTilesetData(tileset, options, context) {
     tileset.url = context.url;
     if (tileset.nodePages) {
         tileset.nodePagesTile = new i3s_nodepages_tiles_1.default(tileset, options);
-        tileset.root = await tileset.nodePagesTile.formTileFromNodePages(0);
+        tileset.root = tileset.nodePagesTile.formTileFromNodePages(0);
     }
     else {
         const rootNodeUrl = (0, url_utils_1.getUrlWithToken)(`${tileset.url}/nodes/root`, options.i3s?.token);