@jdultra/threedtiles 13.1.0 → 13.1.2

package/dist/threedtiles.es.js

@@ -2530,12 +2530,12 @@ class Ni {
     if (this.timeout = e.timeout != null ? e.timeout : 5e3, this.renderer = e.renderer, this.zUpToYUpMatrix = new E.Matrix4(), this.zUpToYUpMatrix.set(1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1), this.maxCachedItems = 100, this.proxy = e.proxy, e && (this.meshCallback = e.meshCallback, this.pointsCallback = e.pointsCallback, e.maxCachedItems != null && (this.maxCachedItems = e.maxCachedItems)), this.gltfLoader = new Dt(), e && e.dracoLoader) this.gltfLoader.setDRACOLoader(e.dracoLoader), this.hasDracoLoader = !0;
     else {
       const a = new Rt();
-      a.setDecoderPath("https://storage.googleapis.com/ogc-3d-tiles/draco/"), this.gltfLoader.setDRACOLoader(a), this.gltfLoader.hasDracoLoader = !0;
+      a.setDecoderPath("https://storage.googleapis.com/ogc-3d-tiles/draco/"), this.dracoLoader = a, this.gltfLoader.setDRACOLoadMer(a), this.gltfLoader.hasDracoLoader = !0;
     }
     if (e && e.ktx2Loader) this.gltfLoader.setKTX2Loader(e.ktx2Loader), this.hasKTX2Loader = !0;
     else if (e && e.renderer) {
       const a = new L();
-      a.setTranscoderPath("https://storage.googleapis.com/ogc-3d-tiles/basis/").detectSupport(e.renderer), this.gltfLoader.setKTX2Loader(a), this.gltfLoader.hasKTX2Loader = !0;
+      a.setTranscoderPath("https://storage.googleapis.com/ogc-3d-tiles/basis/").detectSupport(e.renderer), this.ktx2loader = a, this.gltfLoader.setKTX2Loader(a), this.gltfLoader.hasKTX2Loader = !0;
     }
     this.gltfLoader.setMeshoptDecoder(Vt), this.hasMeshOptDecoder = !0, this.b3dmDecoder = new jt(this.gltfLoader), this.splatsDecoder = new XA(this.gltfLoader, this.renderer), this.cache = new kt(), this.register = {}, this.ready = [], this.downloads = [], this.nextReady = [], this.nextDownloads = [];
   }
@@ -2681,22 +2681,30 @@ class Ni {
   invalidate(e, a) {
     const t = ct(e);
     this.register[t] && setTimeout(() => {
-      delete this.register[t][a], this._checkSize();
+      this.register && (delete this.register[t][a], this._checkSize());
     }, this.timeout);
   }
+  dispose() {
+    let e = this.cache.head();
+    for (this._disposeEntryContent(e); (e = e.next()).key != null; ) this._disposeEntryContent(e);
+    this.cache.reset(), this.cache = void 0, this.register = void 0, this.dracoLoader && this.dracoLoader.dispose(), this.ktx2loader && this.ktx2loader.dispose();
+  }
   _checkSize() {
     const e = this;
     let a = 0;
     for (; e.cache.size() > e.maxCachedItems && a < e.cache.size(); ) {
       a++;
       const t = e.cache.head(), A = e.register[t.key];
-      A && (Object.keys(A).length > 0 ? (e.cache.remove(t.key), e.cache.put(t.key, t.value)) : (e.cache.remove(t.key), delete e.register[t.key], t.value.isSplatsBatch ? t.value.remove() : t.value.traverse && t.value.traverse((i) => {
-        if (i.material) if (i.material.length) for (let s = 0; s < i.material.length; ++s) i.material[s].dispose();
-        else i.material.dispose();
-        i.geometry && i.geometry.dispose();
-      })));
+      A && (Object.keys(A).length > 0 ? (e.cache.remove(t.key), e.cache.put(t.key, t.value)) : (e.cache.remove(t.key), delete e.register[t.key], e._disposeEntryContent(t)));
     }
   }
+  _disposeEntryContent(e) {
+    e.value && (e.value.isSplatsBatch ? e.value.remove() : e.value.traverse && e.value.traverse((a) => {
+      if (a.material) if (a.material.length) for (let t = 0; t < a.material.length; ++t) a.material[t].dispose();
+      else a.material.dispose();
+      a.geometry && a.geometry.dispose();
+    }));
+  }
 }
 function ct(c) {
   for (var e = c.split("/"), a = [], t = 0, A = 0; A < e.length; A++) {
@@ -3124,7 +3132,7 @@ void main() {
     this.copyQuad = new xa(f, this.copyMaterial2D), this.copyScene.add(this.copyQuad), this.copyScene.matrixAutoUpdate = !1, this.copyQuad.matrixAutoUpdate = !1;
   }
   dispose() {
-    this.material.dispose(), this.copyMaterial2D.dispose(), this.copyMaterial3D.dispose(), this.cov1RenderTarget.dispose(), this.cov2RenderTarget.dispose(), this.positionRenderTarget.dispose(), this.colorRenderTarget.dispose(), this.worker.terminate(), this.worker = null, this.geometry.dispose();
+    this.material.dispose(), this.copyMaterial2D.dispose(), this.copyMaterial3D.dispose(), this.cov1RenderTarget.dispose(), this.cov2RenderTarget.dispose(), this.positionRenderTarget.dispose(), this.colorRenderTarget.dispose(), this.worker.terminate(), this.worker = null, this.orderAttribute.array = void 0, this.geometry.dispose();
   }
   copyTex2D(e, a, t, A) {
     this.copyMaterial2D.uniforms.sourceTexture.value = e;
@@ -3147,11 +3155,12 @@ void main() {
     this.material.uniforms.cropRadius.value = e;
   }
   sort(e) {
-    !e && this.cameraPosition ? this.worker.postMessage({ method: "sort", xyz: [this.cameraPosition.x, this.cameraPosition.z, -this.cameraPosition.y], id: this.sortID++ }) : this.cameraPosition && e.equals(this.cameraPosition) || (this.cameraPosition.copy(e), this.worker.postMessage({ method: "sort", xyz: [this.cameraPosition.x, this.cameraPosition.z, -this.cameraPosition.y], id: this.sortID++ }));
+    this.worker && (!e && this.cameraPosition ? this.worker.postMessage({ method: "sort", xyz: [this.cameraPosition.x, this.cameraPosition.z, -this.cameraPosition.y], id: this.sortID++ }) : this.cameraPosition && e.equals(this.cameraPosition) || (this.cameraPosition.copy(e), this.worker.postMessage({ method: "sort", xyz: [this.cameraPosition.x, this.cameraPosition.z, -this.cameraPosition.y], id: this.sortID++ })));
   }
   raycast(e, a) {
   }
   addSplatsTile(e, a, t, A) {
+    if (!this.worker) return;
     const i = this, s = e.data ? e.data.array : e.array, r = e.data && e.data.isInterleavedBuffer ? e.data.stride : 3, o = e.data && e.data.isInterleavedBuffer ? e.offset : 0, n = Math.ceil(s.length / (this.batchSize * r)), d = [], b = [];
     let g = () => {
     };
@@ -3174,15 +3183,15 @@ void main() {
     i.worker.postMessage({ method: "addBatches", insertionIndexes: b, positions: s.buffer, offset: o, stride: r, batchSize: i.batchSize }, [s.buffer]);
     let h = !1;
     return { hide: () => {
-      h == 1 && (i.numVisibleBatches--, h = !1, i.worker.postMessage({ method: "hideBatches", insertionIndexes: b, xyz: [i.cameraPosition.x, i.cameraPosition.z, -i.cameraPosition.y], id: i.sortID++ }));
+      h == 1 && i.worker && (i.numVisibleBatches--, h = !1, i.worker.postMessage({ method: "hideBatches", insertionIndexes: b, xyz: [i.cameraPosition.x, i.cameraPosition.z, -i.cameraPosition.y], id: i.sortID++ }));
     }, show: (f) => {
-      if (h == 0) {
+      if (h == 0 && i.worker) {
         i.numVisibleBatches--, h = !0;
         const I = i.sortID, m = (u) => u >= I && (f(), !0);
         i.sortListeners.push(m), i.worker.postMessage({ method: "showBatches", insertionIndexes: b, xyz: [i.cameraPosition.x, i.cameraPosition.z, -i.cameraPosition.y], id: i.sortID++ });
       }
     }, remove: () => {
-      g = void 0, i.worker.postMessage({ method: "removeBatches", insertionIndexes: b, xyz: [i.cameraPosition.x, i.cameraPosition.z, -i.cameraPosition.y], id: i.sortID++ }), d.forEach((f) => i.freeAddresses.add(f));
+      i.worker && (g = void 0, i.worker.postMessage({ method: "removeBatches", insertionIndexes: b, xyz: [i.cameraPosition.x, i.cameraPosition.z, -i.cameraPosition.y], id: i.sortID++ }), d.forEach((f) => i.freeAddresses.add(f)));
     }, sort: this.sort, raycast: g, isSplatsBatch: !0 };
   }
   addSplatsBatch(e, a, t, A, i, s) {
@@ -3561,7 +3570,7 @@ class Wt extends E.Object3D {
       a && a.asset && a.asset.copyright && (a.asset.copyright.split(";").forEach((t) => {
         Z[t] && Z[t]--;
       }), e.displayCopyright && pa());
-    }), e.childrenTiles.forEach((a) => a.dispose()), e.deleted = !0, e.splatsMesh && (e.meshContent.forEach((a) => a.hide()), e.parentTile || e.splatsMesh.dispose()), e.contentURL && (e.contentURL.forEach((a) => {
+    }), e.childrenTiles.forEach((a) => a.dispose()), e.deleted = !0, e.splatsMesh && (e.meshContent.forEach((a) => a.hide()), e.parentTile || (e.splatsMesh.dispose(), e.splatsMesh = void 0)), e.contentURL && (e.contentURL.forEach((a) => {
       e.tileLoader.invalidate(a, e.uuid);
     }), e.contentURL = []), e.abortController && !e.jsonRequested && e.abortController.abort("tile not needed"), this.parent = null, e.meshContent = [], e.bbox && e.bbox.dispose(), this.dispatchEvent({ type: "removed" });
   }