@maptalks/3dtiles 0.12.6 → 0.12.7

package/dist/maptalks.3dtiles.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/3dtiles v0.12.6
+ * @maptalks/3dtiles v0.12.7
  * LICENSE : UNLICENSED
  * (c) 2016-2022 maptalks.com
  */
@@ -146,7 +146,7 @@
         s(), o(1, 0, 0), o(0, 1, 0), g(), g(), A = new e(9), e != Float32Array && (A[1] = 0, 
         A[2] = 0, A[3] = 0, A[5] = 0, A[6] = 0, A[7] = 0), A[0] = 1, A[4] = 1, A[8] = 1;
         /*!
-     * @maptalks/gltf-loader v0.25.3
+     * @maptalks/gltf-loader v0.25.5
      * LICENSE : UNLICENSED
      * (c) 2016-2022 maptalks.org
      */
@@ -255,29 +255,23 @@
             getArrayBuffer: (t, e = {}) => (e || (e = {}), e.responseType = "arraybuffer", z.get(t, e)),
             getJSON: function(t, e = {}) {
                 return e && e.jsonp ? z.jsonp(t) : ((e = e || {}).responseType = "json", z.get(t, e));
+            },
+            jsonp: function(t) {
+                const e = "_maptalks_jsonp_" + v++;
+                t.match(/\?/) ? t += "&callback=" + e : t += "?callback=" + e;
+                let n = document.createElement("script");
+                return n.type = "text/javascript", n.src = t, new Promise(t => {
+                    window[e] = function(r) {
+                        document.getElementsByTagName("head")[0].removeChild(n), n = null, delete window[e], 
+                        t(r);
+                    }, document.getElementsByTagName("head")[0].appendChild(n);
+                });
             }
         };
-        z.jsonp = function(t) {
-            const e = "_maptalks_jsonp_" + v++;
-            t.match(/\?/) ? t += "&callback=" + e : t += "?callback=" + e;
-            let n = document.createElement("script");
-            return n.type = "text/javascript", n.src = t, new Promise(t => {
-                window[e] = function(r) {
-                    document.getElementsByTagName("head")[0].removeChild(n), n = null, delete window[e], 
-                    t(r);
-                }, document.getElementsByTagName("head")[0].appendChild(n);
-            });
-        };
         class j {
             constructor(t, e, n) {
                 this.i = t, this.decoders = e, this.o = n, this.images = {}, this.h = {};
             }
-            abortRequests() {
-                for (const t in this.h) {
-                    const e = this.h[t];
-                    e && e.xhr && e.xhr.abort();
-                }
-            }
             requestImageFromBufferURI(t, e, n) {
                 if (this.buffers[t.id]) {
                     const r = this.buffers[t.id], s = this.u(e, r);
@@ -314,8 +308,7 @@
             requestExternalImage(t) {
                 if (this.images[t.id]) return Promise.resolve(this.images[t.id]);
                 const e = 0 === t.uri.indexOf("data:image/") ? t.uri : this.rootPath + "/" + t.uri;
-                if (this.h[t.id]) return this.h[t.id].then(() => this.images[t.id]);
-                return this.h[t.id] = this.l(t.id, e);
+                return this.h[t.id] ? this.h[t.id].then(() => this.images[t.id]) : this.h[t.id] = this.l(t.id, e);
             }
             l(t, e) {
                 return new Promise((n, r) => {
@@ -378,8 +371,7 @@
                 });
             }
             g(t, e, n, r = 0) {
-                const s = this.gltf, i = s.accessors[e], o = void 0 !== i.bufferView ? s.bufferViews[i.bufferView] : {}, a = (o.byteOffset || 0) + r, c = this.A(i.type), h = I(i.componentType), u = o.byteStride || 0;
-                const f = {
+                const s = this.gltf, i = s.accessors[e], o = void 0 !== i.bufferView ? s.bufferViews[i.bufferView] : {}, a = (o.byteOffset || 0) + r, c = this.A(i.type), h = I(i.componentType), u = o.byteStride || 0, f = {
                     array: void 0,
                     name: t,
                     accessorName: e,
@@ -489,7 +481,7 @@
                     r.instanceTechnique && r.instanceTechnique.values ? (s = r.instanceTechnique, i = s.values.diffuse) : (s = r, 
                     i = s.values.tex || s.values.diffuseTex || s.values.diffuse);
                     const o = {
-                        "baseColorTexture": {
+                        baseColorTexture: {
                             index: i
                         }
                     };
@@ -610,8 +602,7 @@
             N(t, e) {
                 const n = new Array(t.byteLength);
                 for (let e = 0; e < t.byteLength; e++) n[e] = String.fromCharCode(t[e]);
-                n.join("");
-                return "data:" + (e = e || "image/png") + ";base64," + function(t) {
+                return n.join(""), "data:" + (e = e || "image/png") + ";base64," + function(t) {
                     return "undefined" != typeof self ? self.btoa(t) : window.btoa(t);
                 }(unescape(encodeURIComponent(n)));
             }
@@ -635,19 +626,19 @@
                 });
             }
         }
-        const $ = "undefined" != typeof TextDecoder ? new TextDecoder("utf-8") : null, J = 1313821514, K = 5130562;
-        class X {
+        const $ = "undefined" != typeof TextDecoder ? new TextDecoder("utf-8") : null;
+        class J {
             static read(t, e = 0, n = 0) {
                 n || (n = t.byteLength);
                 const r = new DataView(t, e, n), s = r.getUint32(4, !0);
-                if (1 === s) return X.readV1(r, e);
-                if (2 === s) return X.readV2(t, e);
+                if (1 === s) return J.readV1(r, e);
+                if (2 === s) return J.readV2(t, e);
                 throw new Error("Unsupported glb version : " + s);
             }
             static readV1(t, e) {
                 const n = t.getUint32(8, !0), r = t.getUint32(12, !0);
                 if (n !== t.byteLength) throw new Error("Length in GLB header is inconsistent with glb's byte length.");
-                const s = W(t.buffer, 20 + e, r);
+                const s = K(t.buffer, 20 + e, r);
                 return {
                     json: JSON.parse(s),
                     glbBuffer: {
@@ -665,7 +656,7 @@
                     const a = i.getUint32(o, !0);
                     o += 4;
                     const c = i.getUint32(o, !0);
-                    if (o += 4, c === J) n = W(t, e + 12 + o, a); else if (c === K) {
+                    if (o += 4, 1313821514 === c) n = K(t, e + 12 + o, a); else if (5130562 === c) {
                         s = e + 12 + o, r = a;
                         break;
                     }
@@ -681,7 +672,7 @@
                 };
             }
         }
-        function W(t, e, n) {
+        function K(t, e, n) {
             if ($) {
                 const r = new Uint8Array(t, e, n);
                 return $.decode(r);
@@ -692,7 +683,7 @@
                 for (let r = 0; r < e; ) {
                     let s = t[r++];
                     if (128 & s) {
-                        let n = Z[s >> 3 & 7];
+                        let n = X[s >> 3 & 7];
                         if (!(64 & s) || !n || r + n > e) return null;
                         for (s &= 63 >> n; n > 0; n -= 1) {
                             const e = t[r++];
@@ -705,29 +696,28 @@
                 return n;
             }(new Uint8Array(t, e, n));
         }
-        const Z = [ 1, 1, 1, 1, 2, 2, 3, 0 ];
-        const Q = [ 0, 0, 0 ], Y = [ 0, 0, 0, 1 ], tt = [ 1, 1, 1 ], et = {
+        const X = [ 1, 1, 1, 1, 2, 2, 3, 0 ], W = [ 0, 0, 0 ], Z = [ 0, 0, 0, 1 ], Q = [ 1, 1, 1 ], Y = {
             TRANSLATION: [ 0, 0, 0 ],
             ROTATION: [ 0, 0, 0, 1 ],
             SCALE: [ 1, 1, 1 ]
-        }, nt = {
+        }, tt = {
             PREVIOUS: null,
             NEXT: null,
             PREINDEX: null,
             NEXTINDEX: null,
             INTERPOLATION: null
-        }, rt = {
+        }, et = {
             P(t, e, n, r, s, i, o, c) {
                 const h = S(t) ? e.animations : [ e.animations[0] ], u = {};
                 for (let e = 0; e < h.length; e++) {
-                    const f = h[e];
-                    if (S(t) && f.name !== t) continue;
-                    const l = f.channelsMap[n];
-                    if (l) for (let t = 0; t < l.length; t++) {
-                        const e = l[t];
-                        "translation" === e.target.path ? (this.L(s, f.samplers[e.sampler], r, 1), u.translation = a(Q, s)) : "rotation" === e.target.path ? (this.B(i, f.samplers[e.sampler], r, 1), 
-                        u.rotation = O(Y, i)) : "scale" === e.target.path ? (this.L(o, f.samplers[e.sampler], r, 1), 
-                        u.scale = a(tt, o)) : "weights" === e.target.path && c && (this.L(c, f.samplers[e.sampler], r, c.length), 
+                    const f = h[e], l = f.name || e;
+                    if (S(t) && l !== t) continue;
+                    const d = f.channelsMap[n];
+                    if (d) for (let t = 0; t < d.length; t++) {
+                        const e = d[t];
+                        "translation" === e.target.path ? (this.L(s, f.samplers[e.sampler], r, 1), u.translation = a(W, s)) : "rotation" === e.target.path ? (this.B(i, f.samplers[e.sampler], r, 1), 
+                        u.rotation = O(Z, i)) : "scale" === e.target.path ? (this.L(o, f.samplers[e.sampler], r, 1), 
+                        u.scale = a(Q, o)) : "weights" === e.target.path && c && (this.L(c, f.samplers[e.sampler], r, c.length), 
                         u.weights = c);
                     }
                 }
@@ -737,7 +727,7 @@
                 switch (e.interpolation) {
                   case "LINEAR":
                     {
-                        const s = this.U(nt, e, n, 1 * r);
+                        const s = this.U(tt, e, n, 1 * r);
                         s && (t = function(t, e, n, r) {
                             for (let s = 0; s < t.length; s++) t[s] = e[s] + r * (n[s] - e[s]);
                             return t;
@@ -747,7 +737,7 @@
 
                   case "STEP":
                     {
-                        const s = this.U(nt, e, n, 1 * r);
+                        const s = this.U(tt, e, n, 1 * r);
                         s && (t = function(t, e) {
                             for (let n = 0; n < t.length; n++) t[n] = e[n];
                             return t;
@@ -757,7 +747,7 @@
 
                   case "CUBICSPLINE":
                     {
-                        const s = this.U(nt, e, n, 3 * r);
+                        const s = this.U(tt, e, n, 3 * r);
                         s && (t = this.C(t, s, e.input.array, 3 * r));
                         break;
                     }
@@ -768,21 +758,21 @@
                 switch (e.interpolation) {
                   case "LINEAR":
                     {
-                        const r = this.U(nt, e, n, 1);
+                        const r = this.U(tt, e, n, 1);
                         r && T(t, r.PREVIOUS, r.NEXT, r.INTERPOLATION);
                         break;
                     }
 
                   case "STEP":
                     {
-                        const r = this.U(nt, e, n, 1);
+                        const r = this.U(tt, e, n, 1);
                         r && (t = _(t, ...r.PREVIOUS));
                         break;
                     }
 
                   case "CUBICSPLINE":
                     {
-                        const r = this.U(nt, e, n, 3);
+                        const r = this.U(tt, e, n, 3);
                         if (r) {
                             for (let t = 0; t < r.PREVIOUS.length; t++) r.PREVIOUS[t] = Math.acos(r.PREVIOUS[t]), 
                             r.NEXT[t] = Math.acos(r.NEXT[t]);
@@ -833,8 +823,7 @@
             },
             getAnimationClip(t, e, n, r) {
                 const s = t.nodes[e] && t.nodes[e].weights;
-                c(Q, ...et.TRANSLATION), _(Y, ...et.ROTATION), c(tt, ...et.SCALE);
-                return this.P(r, t, e, n, Q, Y, tt, s);
+                return c(W, ...Y.TRANSLATION), _(Z, ...Y.ROTATION), c(Q, ...Y.SCALE), this.P(r, t, e, n, W, Z, Q, s);
             },
             getTimeSpan(t) {
                 if (!t.animations) return null;
@@ -859,27 +848,24 @@
                 return n ? S(e) ? n[e] : n[Object.keys(n)[0]] : null;
             }
         };
-        let st = !1;
+        let nt = !1;
         if ("undefined" != typeof OffscreenCanvas) {
             let t;
             try {
                 t = new OffscreenCanvas(2, 2).getContext("2d");
-            } catch (t) {}
-            t && "undefined" != typeof createImageBitmap && (st = !0);
+            } catch (Qt) {}
+            t && "undefined" != typeof createImageBitmap && (nt = !0);
         }
-        const it = "undefined" == typeof document ? null : document.createElement("canvas");
-        class ot {
+        const rt = "undefined" == typeof document ? null : document.createElement("canvas");
+        class st {
             constructor(t, e, n) {
                 if (this.options = n || {}, this.options.decoders || (this.options.decoders = {}), 
                 e.buffer instanceof ArrayBuffer) {
-                    const {json: n, glbBuffer: r} = X.read(e.buffer, e.byteOffset, e.byteLength);
+                    const {json: n, glbBuffer: r} = J.read(e.buffer, e.byteOffset, e.byteLength);
                     this.F(t, n, r);
                 } else this.F(t, e);
                 this.D = new G(this.rootPath, this.gltf, this.glbBuffer), this.k();
             }
-            abort() {
-                this.adapter && this.adapter.abortRequests();
-            }
             k() {
                 const t = this.gltf.extensionsRequired;
                 if (t) {
@@ -926,10 +912,10 @@
                 return t;
             }
             static getAnimationClip(t, e, n, r) {
-                return rt.getAnimationClip(t, e, n, r);
+                return et.getAnimationClip(t, e, n, r);
             }
             static getAnimationTimeSpan(t, e) {
-                return rt.getTimeSpanByName(t, e);
+                return et.getTimeSpanByName(t, e);
             }
             static getTypedArrayCtor(t) {
                 return I(t);
@@ -939,7 +925,7 @@
             }
             F(t, e, n) {
                 this.gltf = e, this.glbBuffer = n, this.version = e.asset ? +e.asset.version : 1, 
-                this.rootPath = t, this.buffers = {}, this.requests = {}, this.options.requestImage = st ? ut : this.options.requestImage || at, 
+                this.rootPath = t, this.buffers = {}, this.requests = {}, this.options.requestImage = nt ? ct : this.options.requestImage || it, 
                 this.options.transferable && (this.transferables = []), 2 === this.version ? (this.adapter = new q(t, e, n, this.options.requestImage, this.options.decoders || {}, this.options.supportedFormats || {}), 
                 this.adapter.iterate((t, e, n) => {
                     e.id = "buffer_" + n;
@@ -956,7 +942,7 @@
             }
             q(t, e) {
                 if (t.children && t.children.length > 0) {
-                    if (!(n = t.children[0], "number" == typeof n && isFinite(n) || function(t) {
+                    if (!("number" == typeof (n = t.children[0]) && isFinite(n) || function(t) {
                         return !M(t) && ("string" == typeof t || null !== t.constructor && t.constructor === String);
                     }(t.children[0]))) return t;
                     const r = t.children.map(t => {
@@ -1121,12 +1107,12 @@
                 });
             }
         }
-        function at(t, e) {
+        function it(t, e) {
             const n = new Image;
             n.crossOrigin = "", n.onload = () => {
-                if (!it) return void e(new Error("There is no canvas to draw image!"));
-                it.width = n.width, it.height = n.height;
-                const t = it.getContext("2d");
+                if (!rt) return void e(new Error("There is no canvas to draw image!"));
+                rt.width = n.width, rt.height = n.height;
+                const t = rt.getContext("2d");
                 t.drawImage(n, 0, 0, n.width, n.height);
                 const r = t.getImageData(0, 0, n.width, n.height), s = {
                     width: n.width,
@@ -1138,12 +1124,13 @@
                 e(t);
             }, n.src = t;
         }
-        let ct, ht;
-        function ut(t, e) {
-            ct || (ct = new OffscreenCanvas(2, 2), ht = ct.getContext("2d")), fetch(t).then(t => t.blob()).then(t => createImageBitmap(t)).then(t => {
-                const {width: n, height: r} = t;
-                ct.width = n, ct.height = r, ht.drawImage(t, 0, 0), t.close();
-                const s = ht.getImageData(0, 0, n, r);
+        let ot, at;
+        function ct(t, e) {
+            ot || (ot = new OffscreenCanvas(2, 2), at = ot.getContext("2d")), fetch(t).then(t => t.blob()).then(t => createImageBitmap(t)).then(t => {
+                let {width: n, height: r} = t;
+                ht(n) || (n = ut(n)), ht(r) || (r = ut(r)), ot.width = n, ot.height = r, at.drawImage(t, 0, 0, n, r), 
+                t.close();
+                const s = at.getImageData(0, 0, n, r);
                 e(null, {
                     width: n,
                     height: r,
@@ -1153,6 +1140,12 @@
                 console.warn(t), e(t);
             });
         }
+        function ht(t) {
+            return 0 == (t & t - 1) && 0 !== t;
+        }
+        function ut(t) {
+            return Math.pow(2, Math.floor(Math.log(t) / Math.LN2));
+        }
         function ft(t) {
             return t / Math.PI * 180;
         }
@@ -1389,8 +1382,10 @@
                 south: "down"
             }
         }[qt = "east"][$t = "north"], Ft[Xt = qt + $t] ? Jt = Ft[Xt] : (Jt = function(t, e, n) {
-            if (c = Vt, h = (o = t)[0], d = o[1], y = o[2], b = c[0], p = c[1], w = c[2], Math.abs(h - b) <= 1e-6 * Math.max(1, Math.abs(h), Math.abs(b)) && Math.abs(d - p) <= 1e-6 * Math.max(1, Math.abs(d), Math.abs(p)) && Math.abs(y - w) <= 1e-6 * Math.max(1, Math.abs(y), Math.abs(w))) a(kt, Rt[qt]), 
-            a(zt, Rt[$t]), a(jt, Rt[Kt]); else if (Gt(t[0], 0, 1e-14) && Gt(t[1], 0, 1e-14)) {
+            if (function(t, e) {
+                var n = t[0], r = t[1], s = t[2], i = e[0], o = e[1], a = e[2];
+                return Math.abs(n - i) <= 1e-6 * Math.max(1, Math.abs(n), Math.abs(i)) && Math.abs(r - o) <= 1e-6 * Math.max(1, Math.abs(r), Math.abs(o)) && Math.abs(s - a) <= 1e-6 * Math.max(1, Math.abs(s), Math.abs(a));
+            }(t, Vt)) a(kt, Rt[qt]), a(zt, Rt[$t]), a(jt, Rt[Kt]); else if (Gt(t[0], 0, 1e-14) && Gt(t[1], 0, 1e-14)) {
                 var r = lt(t[2]);
                 a(kt, Rt[qt]), "east" !== qt && "west" !== qt && f(kt, kt, r), a(zt, Rt[$t]), "east" !== $t && "west" !== $t && f(zt, zt, r), 
                 a(jt, Rt[Kt]), "east" !== Kt && "west" !== Kt && f(jt, jt, r);
@@ -1402,7 +1397,6 @@
                 i[0] = -t[1], i[1] = t[0], i[2] = 0, l(Dt.east, i), m(Dt.north, s, i), f(Dt.down, Dt.up, -1), 
                 f(Dt.west, Dt.east, -1), f(Dt.south, Dt.north, -1), kt = Dt[qt], zt = Dt[$t], jt = Dt[Kt];
             }
-            var o, c, h, d, y, b, p, w;
             return n[0] = kt[0], n[1] = kt[1], n[2] = kt[2], n[3] = 0, n[4] = zt[0], n[5] = zt[1], 
             n[6] = zt[2], n[7] = 0, n[8] = jt[0], n[9] = jt[1], n[10] = jt[2], n[11] = 0, n[12] = t[0], 
             n[13] = t[1], n[14] = t[2], n[15] = 1, n;
@@ -1430,7 +1424,7 @@
         };
         class Yt {
             constructor(t, e, n) {
-                this.i = t, this.Y = e || ot, this.o = n, this.tt = {
+                this.i = t, this.Y = e || st, this.o = n, this.tt = {
                     "image/crn": Qt.crn && Qt.crn(),
                     "image/ktx2": Qt.ktx2 && Qt.ktx2(),
                     "image/cttf": Qt.ktx2 && Qt.ktx2(),
@@ -1525,7 +1519,7 @@
         }
         class te {
             constructor(t, e, n) {
-                this.i = t, this.Y = e || ot, this.o = n, this.tt = {
+                this.i = t, this.Y = e || st, this.o = n, this.tt = {
                     "image/crn": Qt.crn && Qt.crn(),
                     "image/ktx2": Qt.ktx2 && Qt.ktx2(),
                     "image/cttf": Qt.ktx2 && Qt.ktx2(),
@@ -1956,7 +1950,7 @@
         }
         class oe {
             constructor(t, e) {
-                this.i = t, this.Y = e || ot;
+                this.i = t, this.Y = e || st;
             }
             load(t, e, n = 0, r = 0) {
                 return e ? this.et(t, e, n, r) : z.getArrayBuffer(t, {}).then(e => {
@@ -2030,7 +2024,7 @@
         }
         function he(t, e) {
             let {componentType: n, byteOffset: r, byteStride: s, count: i, itemSize: o} = t;
-            const a = t.array.buffer, c = n ? ot.getTypedArrayCtor(n) : t.array.constructor;
+            const a = t.array.buffer, c = n ? st.getTypedArrayCtor(n) : t.array.constructor;
             if (r = void 0 === r ? t.array.byteOffset : r, s = s || 0, i = i || t.array.length / o, 
             (!s || s === o * c.BYTES_PER_ELEMENT) && r % c.BYTES_PER_ELEMENT == 0) {
                 const t = new c(a, r, i * o);
@@ -2062,7 +2056,7 @@
                 this.bt = {}, r(null, {}, []);
             }
             pt(t) {
-                this.wt || (this._t = new se, this.wt = new Yt(this.dt, ot, t), this.gt = new te(this.dt, ot, t));
+                this.wt || (this._t = new se, this.wt = new Yt(this.dt, st, t), this.gt = new te(this.dt, st, t));
             }
             requestImage(t, e) {
                 me ? fetch(t).then(t => t.blob()).then(t => createImageBitmap(t)).then(t => {
@@ -2113,7 +2107,7 @@
                             e(null, r, i);
                         });
                     } else if ("cmpt" === s) {
-                        new oe(this.dt, ot).load(n, r).then(n => {
+                        new oe(this.dt, st).load(n, r).then(n => {
                             const {content: r, transferables: s} = this.Ot(n, t);
                             e(null, r, s);
                         }).catch(t => {
@@ -2388,7 +2382,7 @@
             return !0;
         }
         function h(t, e) {
-            var n = e.slice(0, 3), r = t, s = e.slice(3), i = r[0], o = r[1], a = r[2], c = Math.abs(i * s[0] + o * s[3] + a * s[6]) + Math.abs(i * s[1] + o * s[4] + a * s[7]) + Math.abs(i * s[2] + o * s[5] + a * s[8]), h = l(t, n);
+            var n = e, r = t, s = e, i = r[0], o = r[1], a = r[2], c = Math.abs(i * s[3] + o * s[6] + a * s[9]) + Math.abs(i * s[4] + o * s[7] + a * s[10]) + Math.abs(i * s[5] + o * s[8] + a * s[11]), h = l(t, n);
             return !(h <= -c);
         }
         function u(t) {
@@ -2397,8 +2391,8 @@
             f(i[3], o - r, u - c, y - d, _ - p), f(i[4], o - s, u - h, y - m, _ - w), f(i[5], o + s, u + h, y + m, _ + w);
         }
         function f(t, e, n, r, s) {
-            return t[0] = e * (1 / 6), t[1] = n * (1 / 6), t[2] = r * (1 / 6), t[3] = s * (1 / 6), 
-            t;
+            var i = 1 / Math.sqrt(e * e + n * n + r * r);
+            return t[0] = e * i, t[1] = n * i, t[2] = r * i, t[3] = s * i, t;
         }
         function l(t, e) {
             return t[0] * e[0] + t[1] * e[1] + t[2] * e[2] + t[3];
@@ -2556,7 +2550,7 @@
         E(), L(1, 0, 0), L(0, 1, 0), q(), q(), J = new I(9), I != Float32Array && (J[1] = 0, 
         J[2] = 0, J[3] = 0, J[5] = 0, J[6] = 0, J[7] = 0), J[0] = 1, J[4] = 1, J[8] = 1;
         /*!
-       * @maptalks/gltf-loader v0.25.3
+       * @maptalks/gltf-loader v0.25.5
        * LICENSE : UNLICENSED
        * (c) 2016-2022 maptalks.org
        */
@@ -2665,29 +2659,23 @@
             getArrayBuffer: (t, e = {}) => (e || (e = {}), e.responseType = "arraybuffer", ft.get(t, e)),
             getJSON: function(t, e = {}) {
                 return e && e.jsonp ? ft.jsonp(t) : ((e = e || {}).responseType = "json", ft.get(t, e));
+            },
+            jsonp: function(t) {
+                const e = "_maptalks_jsonp_" + X++;
+                t.match(/\?/) ? t += "&callback=" + e : t += "?callback=" + e;
+                let n = document.createElement("script");
+                return n.type = "text/javascript", n.src = t, new Promise(t => {
+                    window[e] = function(r) {
+                        document.getElementsByTagName("head")[0].removeChild(n), n = null, delete window[e], 
+                        t(r);
+                    }, document.getElementsByTagName("head")[0].appendChild(n);
+                });
             }
         };
-        ft.jsonp = function(t) {
-            const e = "_maptalks_jsonp_" + X++;
-            t.match(/\?/) ? t += "&callback=" + e : t += "?callback=" + e;
-            let n = document.createElement("script");
-            return n.type = "text/javascript", n.src = t, new Promise(t => {
-                window[e] = function(r) {
-                    document.getElementsByTagName("head")[0].removeChild(n), n = null, delete window[e], 
-                    t(r);
-                }, document.getElementsByTagName("head")[0].appendChild(n);
-            });
-        };
         class lt {
             constructor(t, e, n) {
                 this.i = t, this.decoders = e, this.o = n, this.images = {}, this.h = {};
             }
-            abortRequests() {
-                for (const t in this.h) {
-                    const e = this.h[t];
-                    e && e.xhr && e.xhr.abort();
-                }
-            }
             requestImageFromBufferURI(t, e, n) {
                 if (this.buffers[t.id]) {
                     const r = this.buffers[t.id], s = this.u(e, r);
@@ -2724,8 +2712,7 @@
             requestExternalImage(t) {
                 if (this.images[t.id]) return Promise.resolve(this.images[t.id]);
                 const e = 0 === t.uri.indexOf("data:image/") ? t.uri : this.rootPath + "/" + t.uri;
-                if (this.h[t.id]) return this.h[t.id].then(() => this.images[t.id]);
-                return this.h[t.id] = this.l(t.id, e);
+                return this.h[t.id] ? this.h[t.id].then(() => this.images[t.id]) : this.h[t.id] = this.l(t.id, e);
             }
             l(t, e) {
                 return new Promise((n, r) => {
@@ -2788,8 +2775,7 @@
                 });
             }
             g(t, e, n, r = 0) {
-                const s = this.gltf, i = s.accessors[e], o = void 0 !== i.bufferView ? s.bufferViews[i.bufferView] : {}, a = (o.byteOffset || 0) + r, c = this.A(i.type), h = Y(i.componentType), u = o.byteStride || 0;
-                const f = {
+                const s = this.gltf, i = s.accessors[e], o = void 0 !== i.bufferView ? s.bufferViews[i.bufferView] : {}, a = (o.byteOffset || 0) + r, c = this.A(i.type), h = Y(i.componentType), u = o.byteStride || 0, f = {
                     array: void 0,
                     name: t,
                     accessorName: e,
@@ -2903,7 +2889,7 @@
                     r.instanceTechnique && r.instanceTechnique.values ? (s = r.instanceTechnique, i = s.values.diffuse) : (s = r, 
                     i = s.values.tex || s.values.diffuseTex || s.values.diffuse);
                     const o = {
-                        "baseColorTexture": {
+                        baseColorTexture: {
                             index: i
                         }
                     };
@@ -3024,8 +3010,7 @@
             N(t, e) {
                 const n = new Array(t.byteLength);
                 for (let e = 0; e < t.byteLength; e++) n[e] = String.fromCharCode(t[e]);
-                n.join("");
-                return "data:" + (e = e || "image/png") + ";base64," + function(t) {
+                return n.join(""), "data:" + (e = e || "image/png") + ";base64," + function(t) {
                     return "undefined" != typeof self ? self.btoa(t) : window.btoa(t);
                 }(unescape(encodeURIComponent(n)));
             }
@@ -3049,19 +3034,19 @@
                 });
             }
         }
-        const pt = "undefined" != typeof TextDecoder ? new TextDecoder("utf-8") : null, wt = 1313821514, _t = 5130562;
-        class gt {
+        const pt = "undefined" != typeof TextDecoder ? new TextDecoder("utf-8") : null;
+        class wt {
             static read(t, e = 0, n = 0) {
                 n || (n = t.byteLength);
                 const r = new DataView(t, e, n), s = r.getUint32(4, !0);
-                if (1 === s) return gt.readV1(r, e);
-                if (2 === s) return gt.readV2(t, e);
+                if (1 === s) return wt.readV1(r, e);
+                if (2 === s) return wt.readV2(t, e);
                 throw new Error("Unsupported glb version : " + s);
             }
             static readV1(t, e) {
                 const n = t.getUint32(8, !0), r = t.getUint32(12, !0);
                 if (n !== t.byteLength) throw new Error("Length in GLB header is inconsistent with glb's byte length.");
-                const s = Tt(t.buffer, 20 + e, r);
+                const s = _t(t.buffer, 20 + e, r);
                 return {
                     json: JSON.parse(s),
                     glbBuffer: {
@@ -3079,7 +3064,7 @@
                     const a = i.getUint32(o, !0);
                     o += 4;
                     const c = i.getUint32(o, !0);
-                    if (o += 4, c === wt) n = Tt(t, e + 12 + o, a); else if (c === _t) {
+                    if (o += 4, 1313821514 === c) n = _t(t, e + 12 + o, a); else if (5130562 === c) {
                         s = e + 12 + o, r = a;
                         break;
                     }
@@ -3095,7 +3080,7 @@
                 };
             }
         }
-        function Tt(t, e, n) {
+        function _t(t, e, n) {
             if (pt) {
                 const r = new Uint8Array(t, e, n);
                 return pt.decode(r);
@@ -3106,7 +3091,7 @@
                 for (let r = 0; r < e; ) {
                     let s = t[r++];
                     if (128 & s) {
-                        let n = At[s >> 3 & 7];
+                        let n = gt[s >> 3 & 7];
                         if (!(64 & s) || !n || r + n > e) return null;
                         for (s &= 63 >> n; n > 0; n -= 1) {
                             const e = t[r++];
@@ -3119,29 +3104,28 @@
                 return n;
             }(new Uint8Array(t, e, n));
         }
-        const At = [ 1, 1, 1, 1, 2, 2, 3, 0 ];
-        const Ot = [ 0, 0, 0 ], vt = [ 0, 0, 0, 1 ], Mt = [ 1, 1, 1 ], St = {
+        const gt = [ 1, 1, 1, 1, 2, 2, 3, 0 ], Tt = [ 0, 0, 0 ], At = [ 0, 0, 0, 1 ], Ot = [ 1, 1, 1 ], vt = {
             TRANSLATION: [ 0, 0, 0 ],
             ROTATION: [ 0, 0, 0, 1 ],
             SCALE: [ 1, 1, 1 ]
-        }, xt = {
+        }, Mt = {
             PREVIOUS: null,
             NEXT: null,
             PREINDEX: null,
             NEXTINDEX: null,
             INTERPOLATION: null
-        }, It = {
+        }, St = {
             P(t, e, n, r, s, i, o, a) {
                 const c = Z(t) ? e.animations : [ e.animations[0] ], h = {};
                 for (let e = 0; e < c.length; e++) {
-                    const u = c[e];
-                    if (Z(t) && u.name !== t) continue;
-                    const f = u.channelsMap[n];
-                    if (f) for (let t = 0; t < f.length; t++) {
-                        const e = f[t];
-                        "translation" === e.target.path ? (this.L(s, u.samplers[e.sampler], r, 1), h.translation = B(Ot, s)) : "rotation" === e.target.path ? (this.B(i, u.samplers[e.sampler], r, 1), 
-                        h.rotation = K(vt, i)) : "scale" === e.target.path ? (this.L(o, u.samplers[e.sampler], r, 1), 
-                        h.scale = B(Mt, o)) : "weights" === e.target.path && a && (this.L(a, u.samplers[e.sampler], r, a.length), 
+                    const u = c[e], f = u.name || e;
+                    if (Z(t) && f !== t) continue;
+                    const l = u.channelsMap[n];
+                    if (l) for (let t = 0; t < l.length; t++) {
+                        const e = l[t];
+                        "translation" === e.target.path ? (this.L(s, u.samplers[e.sampler], r, 1), h.translation = B(Tt, s)) : "rotation" === e.target.path ? (this.B(i, u.samplers[e.sampler], r, 1), 
+                        h.rotation = K(At, i)) : "scale" === e.target.path ? (this.L(o, u.samplers[e.sampler], r, 1), 
+                        h.scale = B(Ot, o)) : "weights" === e.target.path && a && (this.L(a, u.samplers[e.sampler], r, a.length), 
                         h.weights = a);
                     }
                 }
@@ -3151,7 +3135,7 @@
                 switch (e.interpolation) {
                   case "LINEAR":
                     {
-                        const s = this.U(xt, e, n, 1 * r);
+                        const s = this.U(Mt, e, n, 1 * r);
                         s && (t = function(t, e, n, r) {
                             for (let s = 0; s < t.length; s++) t[s] = e[s] + r * (n[s] - e[s]);
                             return t;
@@ -3161,7 +3145,7 @@
 
                   case "STEP":
                     {
-                        const s = this.U(xt, e, n, 1 * r);
+                        const s = this.U(Mt, e, n, 1 * r);
                         s && (t = function(t, e) {
                             for (let n = 0; n < t.length; n++) t[n] = e[n];
                             return t;
@@ -3171,7 +3155,7 @@
 
                   case "CUBICSPLINE":
                     {
-                        const s = this.U(xt, e, n, 3 * r);
+                        const s = this.U(Mt, e, n, 3 * r);
                         s && (t = this.C(t, s, e.input.array, 3 * r));
                         break;
                     }
@@ -3182,21 +3166,21 @@
                 switch (e.interpolation) {
                   case "LINEAR":
                     {
-                        const r = this.U(xt, e, n, 1);
+                        const r = this.U(Mt, e, n, 1);
                         r && $(t, r.PREVIOUS, r.NEXT, r.INTERPOLATION);
                         break;
                     }
 
                   case "STEP":
                     {
-                        const r = this.U(xt, e, n, 1);
+                        const r = this.U(Mt, e, n, 1);
                         r && (t = H(t, ...r.PREVIOUS));
                         break;
                     }
 
                   case "CUBICSPLINE":
                     {
-                        const r = this.U(xt, e, n, 3);
+                        const r = this.U(Mt, e, n, 3);
                         if (r) {
                             for (let t = 0; t < r.PREVIOUS.length; t++) r.PREVIOUS[t] = Math.acos(r.PREVIOUS[t]), 
                             r.NEXT[t] = Math.acos(r.NEXT[t]);
@@ -3247,8 +3231,7 @@
             },
             getAnimationClip(t, e, n, r) {
                 const s = t.nodes[e] && t.nodes[e].weights;
-                U(Ot, ...St.TRANSLATION), H(vt, ...St.ROTATION), U(Mt, ...St.SCALE);
-                return this.P(r, t, e, n, Ot, vt, Mt, s);
+                return U(Tt, ...vt.TRANSLATION), H(At, ...vt.ROTATION), U(Ot, ...vt.SCALE), this.P(r, t, e, n, Tt, At, Ot, s);
             },
             getTimeSpan(t) {
                 if (!t.animations) return null;
@@ -3273,27 +3256,24 @@
                 return n ? Z(e) ? n[e] : n[Object.keys(n)[0]] : null;
             }
         };
-        let Nt = !1;
+        let xt = !1;
         if ("undefined" != typeof OffscreenCanvas) {
             let t;
             try {
                 t = new OffscreenCanvas(2, 2).getContext("2d");
-            } catch (t) {}
-            t && "undefined" != typeof createImageBitmap && (Nt = !0);
+            } catch (qn) {}
+            t && "undefined" != typeof createImageBitmap && (xt = !0);
         }
-        const Et = "undefined" == typeof document ? null : document.createElement("canvas");
-        class Pt {
+        const It = "undefined" == typeof document ? null : document.createElement("canvas");
+        class Nt {
             constructor(t, e, n) {
                 if (this.options = n || {}, this.options.decoders || (this.options.decoders = {}), 
                 e.buffer instanceof ArrayBuffer) {
-                    const {json: n, glbBuffer: r} = gt.read(e.buffer, e.byteOffset, e.byteLength);
+                    const {json: n, glbBuffer: r} = wt.read(e.buffer, e.byteOffset, e.byteLength);
                     this.F(t, n, r);
                 } else this.F(t, e);
                 this.D = new mt(this.rootPath, this.gltf, this.glbBuffer), this.k();
             }
-            abort() {
-                this.adapter && this.adapter.abortRequests();
-            }
             k() {
                 const t = this.gltf.extensionsRequired;
                 if (t) {
@@ -3340,10 +3320,10 @@
                 return t;
             }
             static getAnimationClip(t, e, n, r) {
-                return It.getAnimationClip(t, e, n, r);
+                return St.getAnimationClip(t, e, n, r);
             }
             static getAnimationTimeSpan(t, e) {
-                return It.getTimeSpanByName(t, e);
+                return St.getTimeSpanByName(t, e);
             }
             static getTypedArrayCtor(t) {
                 return Y(t);
@@ -3353,7 +3333,7 @@
             }
             F(t, e, n) {
                 this.gltf = e, this.glbBuffer = n, this.version = e.asset ? +e.asset.version : 1, 
-                this.rootPath = t, this.buffers = {}, this.requests = {}, this.options.requestImage = Nt ? Ct : this.options.requestImage || Lt, 
+                this.rootPath = t, this.buffers = {}, this.requests = {}, this.options.requestImage = xt ? Bt : this.options.requestImage || Et, 
                 this.options.transferable && (this.transferables = []), 2 === this.version ? (this.adapter = new bt(t, e, n, this.options.requestImage, this.options.decoders || {}, this.options.supportedFormats || {}), 
                 this.adapter.iterate((t, e, n) => {
                     e.id = "buffer_" + n;
@@ -3370,7 +3350,7 @@
             }
             q(t, e) {
                 if (t.children && t.children.length > 0) {
-                    if (!(n = t.children[0], "number" == typeof n && isFinite(n) || function(t) {
+                    if (!("number" == typeof (n = t.children[0]) && isFinite(n) || function(t) {
                         return !W(t) && ("string" == typeof t || null !== t.constructor && t.constructor === String);
                     }(t.children[0]))) return t;
                     const r = t.children.map(t => {
@@ -3535,12 +3515,12 @@
                 });
             }
         }
-        function Lt(t, e) {
+        function Et(t, e) {
             const n = new Image;
             n.crossOrigin = "", n.onload = () => {
-                if (!Et) return void e(new Error("There is no canvas to draw image!"));
-                Et.width = n.width, Et.height = n.height;
-                const t = Et.getContext("2d");
+                if (!It) return void e(new Error("There is no canvas to draw image!"));
+                It.width = n.width, It.height = n.height;
+                const t = It.getContext("2d");
                 t.drawImage(n, 0, 0, n.width, n.height);
                 const r = t.getImageData(0, 0, n.width, n.height), s = {
                     width: n.width,
@@ -3552,12 +3532,13 @@
                 e(t);
             }, n.src = t;
         }
-        let Bt, Ut;
-        function Ct(t, e) {
-            Bt || (Bt = new OffscreenCanvas(2, 2), Ut = Bt.getContext("2d")), fetch(t).then(t => t.blob()).then(t => createImageBitmap(t)).then(t => {
-                const {width: n, height: r} = t;
-                Bt.width = n, Bt.height = r, Ut.drawImage(t, 0, 0), t.close();
-                const s = Ut.getImageData(0, 0, n, r);
+        let Pt, Lt;
+        function Bt(t, e) {
+            Pt || (Pt = new OffscreenCanvas(2, 2), Lt = Pt.getContext("2d")), fetch(t).then(t => t.blob()).then(t => createImageBitmap(t)).then(t => {
+                let {width: n, height: r} = t;
+                Ut(n) || (n = Ct(n)), Ut(r) || (r = Ct(r)), Pt.width = n, Pt.height = r, Lt.drawImage(t, 0, 0, n, r), 
+                t.close();
+                const s = Lt.getImageData(0, 0, n, r);
                 e(null, {
                     width: n,
                     height: r,
@@ -3567,6 +3548,12 @@
                 console.warn(t), e(t);
             });
         }
+        function Ut(t) {
+            return 0 == (t & t - 1) && 0 !== t;
+        }
+        function Ct(t) {
+            return Math.pow(2, Math.floor(Math.log(t) / Math.LN2));
+        }
         const Rt = "undefined" == typeof document ? null : document.createElement("canvas");
         class Ft extends s.worker.Actor {
             constructor(t, e) {
@@ -3757,7 +3744,7 @@
         }
         function Gt(t, e, n) {
             let {componentType: r, byteOffset: s, byteStride: i, itemSize: o} = e;
-            const a = e.array.buffer, c = r ? Pt.getTypedArrayCtor(r) : e.array.constructor;
+            const a = e.array.buffer, c = r ? Nt.getTypedArrayCtor(r) : e.array.constructor;
             if (s = void 0 === s ? e.array.byteOffset : s, i = i || 0, !i || i === o * c.BYTES_PER_ELEMENT && s % c.BYTES_PER_ELEMENT == 0) {
                 const e = new c(a, s + n * o * c.BYTES_PER_ELEMENT, o);
                 return t.set(e), t;
@@ -4007,8 +3994,10 @@
                 south: "down"
             }
         }[Ne = "east"][Ee = "north"], ge[Be = Ne + Ee] ? Pe = ge[Be] : (Pe = function(t, e, n) {
-            if (a = Me, c = (o = t)[0], h = o[1], u = o[2], f = a[0], l = a[1], d = a[2], Math.abs(c - f) <= 1e-6 * Math.max(1, Math.abs(c), Math.abs(f)) && Math.abs(h - l) <= 1e-6 * Math.max(1, Math.abs(h), Math.abs(l)) && Math.abs(u - d) <= 1e-6 * Math.max(1, Math.abs(u), Math.abs(d))) B(Ae, _e[Ne]), 
-            B(Oe, _e[Ee]), B(ve, _e[Le]); else if (Se(t[0], 0, 1e-14) && Se(t[1], 0, 1e-14)) {
+            if (function(t, e) {
+                var n = t[0], r = t[1], s = t[2], i = e[0], o = e[1], a = e[2];
+                return Math.abs(n - i) <= 1e-6 * Math.max(1, Math.abs(n), Math.abs(i)) && Math.abs(r - o) <= 1e-6 * Math.max(1, Math.abs(r), Math.abs(o)) && Math.abs(s - a) <= 1e-6 * Math.max(1, Math.abs(s), Math.abs(a));
+            }(t, Me)) B(Ae, _e[Ne]), B(Oe, _e[Ee]), B(ve, _e[Le]); else if (Se(t[0], 0, 1e-14) && Se(t[1], 0, 1e-14)) {
                 var r = _(t[2]);
                 B(Ae, _e[Ne]), "east" !== Ne && "west" !== Ne && F(Ae, Ae, r), B(Oe, _e[Ee]), "east" !== Ee && "west" !== Ee && F(Oe, Oe, r), 
                 B(ve, _e[Le]), "east" !== Le && "west" !== Le && F(ve, ve, r);
@@ -4018,7 +4007,6 @@
                 i[0] = -t[1], i[1] = t[0], i[2] = 0, D(Te.east, i), z(Te.north, s, i), F(Te.down, Te.up, -1), 
                 F(Te.west, Te.east, -1), F(Te.south, Te.north, -1), Ae = Te[Ne], Oe = Te[Ee], ve = Te[Le];
             }
-            var o, a, c, h, u, f, l, d;
             return n[0] = Ae[0], n[1] = Ae[1], n[2] = Ae[2], n[3] = 0, n[4] = Oe[0], n[5] = Oe[1], 
             n[6] = Oe[2], n[7] = 0, n[8] = ve[0], n[9] = ve[1], n[10] = ve[2], n[11] = 0, n[12] = t[0], 
             n[13] = t[1], n[14] = t[2], n[15] = 1, n;
@@ -4259,7 +4247,7 @@
                 }, M = new Float32Array(3), S = new Float32Array(3), x = [], I = new Float32Array(1), N = new Float32Array(3), E = [], P = [], L = [], B = [], U = new Float32Array(9);
                 !function(t, e) {
                     let {componentType: n, byteOffset: r, byteStride: s, count: i, itemSize: o} = t;
-                    const a = t.array.buffer, c = n ? Pt.getTypedArrayCtor(n) : t.array.constructor;
+                    const a = t.array.buffer, c = n ? Nt.getTypedArrayCtor(n) : t.array.constructor;
                     if (r = void 0 === r ? t.array.byteOffset : r, s = s || 0, i = i || t.array.length / o, 
                     (!s || s === o * c.BYTES_PER_ELEMENT) && r % c.BYTES_PER_ELEMENT == 0) {
                         const t = new c(a, r, i * o);
@@ -5051,7 +5039,7 @@
             }
         }
         function wn(t, e) {
-            return 0 === t.ce && 0 === e.ce ? t.Ye - e.Ye : t.ce - e.ce;
+            return t.ce - e.ce;
         }
         function _n(t, e, n) {
             return t[0] = e[n], t[1] = e[n + 3], t[2] = e[n + 6], t;
@@ -5061,23 +5049,23 @@
                 var r = C(Tn, n, t), s = _n(An, e, 0), i = _n(On, e, 1), o = _n(vn, e, 2), a = G(s), c = G(i), h = G(o);
                 D(s, s), D(i, i), D(o, o);
                 var u = Mn;
-                u.x = k(r, s), u.y = k(r, i), u.z = k(r, o);
+                u[0] = k(r, s), u[1] = k(r, i), u[2] = k(r, o);
                 var f, l = 0;
-                u.x < -a ? (f = u.x + a, l += f * f) : u.x > a && (f = u.x - a, l += f * f);
-                u.y < -c ? (f = u.y + c, l += f * f) : u.y > c && (f = u.y - c, l += f * f);
-                u.z < -h ? (f = u.z + h, l += f * f) : u.z > h && (f = u.z - h, l += f * f);
+                u[0] < -a ? (f = u[0] + a, l += f * f) : u[0] > a && (f = u[0] - a, l += f * f);
+                u[1] < -c ? (f = u[1] + c, l += f * f) : u[1] > c && (f = u[1] - c, l += f * f);
+                u[2] < -h ? (f = u[2] + h, l += f * f) : u[2] > h && (f = u[2] - h, l += f * f);
                 return l;
             }(t, e, n));
         }
         const Tn = [], An = [], On = [], vn = [], Mn = [];
-        const Sn = s.projection.EPSG3857, xn = new s.Extent(0, 0, 0, 0), In = new s.Extent(0, 0, 0, 0), Nn = [], En = [], Pn = [], Ln = [], Bn = new s.Point(0, 0), Un = [], Cn = new s.Coordinate(0, 0), Rn = n.mat4.identity([]);
-        class Fn extends s.Layer {
+        const Sn = s.projection.EPSG3857, xn = new s.Extent(0, 0, 0, 0), In = new s.Extent(0, 0, 0, 0), Nn = [], En = [], Pn = [], Ln = [], Bn = new s.Point(0, 0), Un = new s.Coordinate(0, 0), Cn = new s.Coordinate(0, 0), Rn = [], Fn = new s.Coordinate(0, 0), Dn = n.mat4.identity([]);
+        class kn extends s.Layer {
             constructor(t, e) {
-                super(t, e), this.tn(), this.bt = {}, this.en = {};
+                super(t, e), this.Ye(), this.bt = {}, this.tn = [];
             }
-            tn() {
+            Ye() {
                 let t = this.options.services.map(t => t.url);
-                this.nn = t.map((t, e) => function(t, e) {
+                this.en = t.map((t, e) => function(t, e) {
                     t = w(t);
                     return {
                         baseUrl: t.substring(0, t.lastIndexOf("/")) + "/",
@@ -5090,22 +5078,22 @@
                         qe: 0
                     };
                 }(t, e)), this.fire("rootready", {
-                    roots: this.nn.slice(0)
+                    roots: this.en.slice(0)
                 });
             }
             getExtent(t) {
                 if (!t && 0 !== t) {
                     const t = new s.Extent;
-                    for (let e = 0; e < this.nn.length; e++) if (this.nn[e].boundingVolume) {
-                        const n = this.boundingVolumeToExtent(this.nn[e]);
+                    for (let e = 0; e < this.en.length; e++) if (this.en[e].boundingVolume) {
+                        const n = this.boundingVolumeToExtent(this.en[e]);
                         t._combine(n);
                     }
                     return t;
                 }
-                return this.nn[t] && this.nn[t].boundingVolume ? this.boundingVolumeToExtent(this.nn[t]) : null;
+                return this.en[t] && this.en[t].boundingVolume ? this.boundingVolumeToExtent(this.en[t]) : null;
             }
             boundingVolumeToExtent(t) {
-                const e = t.boundingVolume.rn ? Rn : t.matrix, r = this.getMap();
+                const e = t.boundingVolume.nn ? Dn : t.matrix, r = this.getMap();
                 if (t.boundingVolume.region) {
                     const e = t.boundingVolume.region;
                     return new s.Extent(p(e[0]), p(e[1]), p(e[2]), p(e[3]));
@@ -5123,50 +5111,48 @@
                 return null;
             }
             getRootTiles() {
-                return this.nn;
+                return this.en;
             }
             getTiles() {
-                return this.getRenderer().ready ? this.sn() : (this.in(), {
+                if (!this.getRenderer().ready) return this.rn(), {
                     tiles: Ln
-                });
-            }
-            sn() {
+                };
                 const t = this.getMap(), e = t.cameraPosition;
                 let r, s;
-                if (t.getGLZoom) s = t.pointToDistance(e[2], 0, t.getGLZoom()), Cn.set(e[0], e[1]), 
-                r = t.pointToCoord(Cn, t.getGLZoom()); else {
+                if (t.getGLZoom) s = t.pointToDistance(e[2], 0, t.getGLZoom()), Fn.set(e[0], e[1]), 
+                r = t.pointToCoord(Fn, t.getGLZoom()); else {
                     const n = t.getGLRes();
-                    s = t.pointAtResToDistance(e[2], 0, n), Cn.set(e[0], e[1]), r = t.pointAtResToCoord(Cn, n);
+                    s = t.pointAtResToDistance(e[2], 0, n), Fn.set(e[0], e[1]), r = t.pointAtResToCoord(Fn, n);
                 }
-                this.an = this.an || [], n.vec3.set(this.an, b(r.x), b(r.y), s), this.cn = Kt(this.cn || [], this.an[0], this.an[1], this.an[2]), 
-                this.hn = 2 * Math.tan(.5 * b(t.getFov())), this.un = Sn.project(r).toArray();
+                this.sn = this.sn || [], n.vec3.set(this.sn, b(r.x), b(r.y), s), this.in = Kt(this.in || [], this.sn[0], this.sn[1], this.sn[2]), 
+                this.an = 2 * Math.tan(.5 * b(t.getFov())), this.cn = Sn.project(r).toArray();
                 const i = t.projViewMatrix, o = {
                     children: [],
                     level: -1
                 };
                 let a = o;
                 const c = [];
-                for (let t = 0; t < this.nn.length; t++) {
+                for (let t = 0; t < this.en.length; t++) {
                     let e = 1 / 0;
-                    const n = [ this.nn[t] ], r = this.ln(t);
+                    const n = [ this.en[t] ], r = this.hn(t);
                     for (;n.length > 0; ) {
                         const t = n.pop();
-                        for (t.id || this.dn(t); a.level >= t.qe; ) a = a.parent;
-                        const s = this.mn(t, r, i);
+                        for (t.id || this.un(t); a.level >= t.qe; ) a = a.parent;
+                        const s = this.ln(t, r, i);
                         if (s < 1) {
                             let n = a;
                             for (;n && !n.content; ) n = n.parent;
-                            0 === s && n && n.content && this.yn(c, n);
+                            0 === s && n && n.content && this.dn(c, n);
                             if (!1 === this.options.services[t.te].alwaysShow) continue;
                             if (!(0 === s && t.qe <= e)) continue;
                             t.content && (e = t.qe);
                         }
-                        t.ce < 1 / 0 && this.bn(t);
+                        t.ce < 1 / 0 && this.mn(t);
                         const o = this.$e(t, a);
                         a.children.push(o);
                         const h = t.children, u = h && h.length, f = o.content;
-                        if (!u && f && this.yn(c, o), u) {
-                            f && "add" === t.refine && this.yn(c, o), a = o;
+                        if (!u && f && this.dn(c, o), u) {
+                            f && "add" === t.refine && this.dn(c, o), a = o;
                             const e = h[0].parent;
                             for (let r = 0, s = h.length; r < s; r++) {
                                 if (!e) {
@@ -5184,15 +5170,15 @@
                     tiles: c
                 };
             }
-            yn(t, e) {
+            dn(t, e) {
                 const {viewerRequestVolume: n} = e.node;
                 n && !function(t, e, n) {
                     if (n.region) {
                         const e = n.region;
                         if (t[0] >= e[0] && t[0] <= e[2] && t[1] >= e[1] && t[1] <= e[3]) return !0;
                     } else {
-                        if (n.sphere) return Dn(n, e);
-                        if (n.box) return 0 === kn(n, e);
+                        if (n.sphere) return zn(n, e);
+                        if (n.box) return 0 === jn(n, e);
                     }
                     return !1;
                 }
@@ -5200,7 +5186,7 @@
        * @maptalks/gl v0.65.0
        * LICENSE : UNLICENSED
        * (c) 2016-2022 maptalks.com
-       */ (this.an, this.cn, n) || t.push(e);
+       */ (this.sn, this.in, n) || t.push(e);
             }
             $e(t, e) {
                 return {
@@ -5212,37 +5198,36 @@
                     content: t.content && t.content.url
                 };
             }
-            dn(t) {
-                t.id = s.Util.GUID(), t.matrix = t.transform || n.mat4.identity([]), t.pn = this.wn(t), 
+            un(t) {
+                t.id = s.Util.GUID(), t.matrix = t.transform || n.mat4.identity([]), t.yn = this.bn(t), 
                 t.parent && (t.matrix = n.mat4.multiply(t.matrix, t.parent.matrix, t.matrix), t.te = t.parent.te, 
                 void 0 === t.qe && (t.qe = t.parent.qe + 1), t.maxExtent = t.parent.maxExtent), 
                 t.refine = t.refine && t.refine.toLowerCase() || "replace", t.content && !t.content.url && t.content.uri && (t.content.url = t.content.uri), 
-                this._n(t);
+                this.pn(t);
             }
-            _n(t) {
+            pn(t) {
                 const e = t.boundingVolume;
-                if (!e || e.rn) return;
+                if (!e || e.nn) return;
                 const r = this.options.services[t.te].heightOffset || 0, s = this.options.offset, i = y(s) || s[0] || s[1];
-                if (!t.boundingVolume || !r && n.mat4.exactEquals(t.matrix, Rn) && !i) return;
+                if (!t.boundingVolume || !r && n.mat4.exactEquals(t.matrix, Dn) && !i) return;
                 const {region: o, box: a, sphere: c} = e;
                 if (o) {
-                    const t = this.gn([ p(o[0]), p(o[1]) ]);
+                    const t = this.wn([ p(o[0]), p(o[1]) ]);
                     o[0] = b(t.x), o[1] = b(t.y);
-                    const e = this.gn([ p(o[2]), p(o[3]) ]);
+                    const e = this.wn([ p(o[2]), p(o[3]) ]);
                     o[2] = b(e.x), o[3] = b(e.y), o[4] += r, o[5] += r;
                 } else if (a || c) {
-                    const e = a || c, s = n.vec3.transformMat4(Nn, e, t.matrix), i = te(En, s), o = this.gn([ i[0], i[1] ]);
+                    const e = a || c, s = n.vec3.transformMat4(Nn, e, t.matrix), i = te(En, s), o = this.wn([ i[0], i[1] ]);
                     i[0] = o.x, i[1] = o.y, i[2] += r, Kt(e, b(i[0]), b(i[1]), i[2]);
                 }
-                e.rn = !0;
+                e.nn = !0;
             }
-            wn(t) {
+            bn(t) {
                 return void 0 === t.geometricError || !t.boundingVolume;
             }
-            bn(t) {
+            mn(t) {
                 let e = t.parent;
-                for (;e && e.pn && !(e.ce <= t.ce && e.Ye <= t.Ye); ) e.ce = t.ce, e.Ye = t.Ye, 
-                e = t.parent;
+                for (;e && e.yn && !(e.ce <= t.ce); ) e.ce = t.ce, e = t.parent;
             }
             onTilesetLoad(t, e, r) {
                 if (!t) return void console.warn("invalid tileset at : " + r);
@@ -5252,55 +5237,52 @@
                     m(e, t.root), e.refine = e.refine && e.refine.toLowerCase() || "replace", r && (e.boundingVolume = r);
                     const s = t.root.transform;
                     s && (e.parent ? e.matrix = n.mat4.multiply([], e.parent.matrix, s) : e.matrix = s), 
-                    this._n(e), e.Tn = e.content, delete e.content, t.root.content && (e.content = t.root.content), 
-                    e.pn = this.wn(e);
+                    this.pn(e), e._n = e.content, delete e.content, t.root.content && (e.content = t.root.content), 
+                    e.yn = this.bn(e);
                     const i = e.content && (e.content.url || e.content.uri);
                     i && e.content.uri && (e.content.url = e.content.uri, delete e.content.uri), i && !M(i) && -1 === i.indexOf("http://") && -1 === i.indexOf("https://") && (e.content.url = e.baseUrl + i);
                 }
-                this.in(), this.fire("loadtileset", {
+                this.rn(), this.fire("loadtileset", {
                     tileset: t,
                     index: e.te,
                     url: r
                 });
             }
-            mn(t, e, n) {
-                if (t.ce = 1 / 0, 0 === t.qe || t.pn) return 1;
-                if (!this.An(t, e, n)) return -1;
+            ln(t, e, n) {
+                if (t.ce = 1 / 0, 0 === t.qe || t.yn) return 1;
+                if (!this.gn(t, e, n)) return -1;
                 if (0 === t.geometricError) return 1;
                 let r = this.options.services[t.te].maximumScreenSpaceError;
                 null == r && (r = 8);
-                let s = this.On(t);
-                return 0 === s && t.parent && (s = .5 * (t.parent.vn || 0)), s >= r ? 1 : 0;
+                let s = this.Tn(t);
+                return 0 === s && t.parent && (s = .5 * (t.parent.An || 0)), s >= r ? 1 : 0;
             }
             ye(t, e) {
                 e || (e = new s.Point(0, 0));
                 const n = this.getMap();
                 return n.getGLZoom ? n.coordToPoint(t, n.getGLZoom(), e) : n.coordToPointAtRes(t, n.getGLRes(), e);
             }
-            An(t, e, r) {
-                if (!this.getMap()) return !1;
+            gn(t, e, r) {
                 const o = t.id;
-                let a = this.en[o];
-                const {boundingVolume: f} = t;
-                if (!f) return !1;
-                const {sphere: d, region: m, box: y} = f;
+                let a = this.tn[o];
+                const {boundingVolume: f} = t, d = f.sphere, m = f.region, y = f.box;
                 if (!a) {
                     let e, r, i;
                     if (m) {
                         e = xn.set(p(m[0]), p(m[1]), p(m[2]), p(m[3]));
-                        const t = e.getCenter(), n = this.Mn(t);
-                        e = e.convertTo(t => this.ye(t, Bn), In), i = m[4], r = m[5], a = this.en[o] = [ [ e.xmin, e.ymin, i * n[2] ], [ e.xmax, e.ymax, r * n[2] ] ], 
+                        const t = e.getCenter(), n = this.On(t);
+                        e = e.convertTo(t => this.ye(t, Bn), In), i = m[4], r = m[5], a = this.tn[o] = [ [ e.xmin, e.ymin, i * n[2] ], [ e.xmax, e.ymax, r * n[2] ] ], 
                         a.center = t;
                     } else if (d) {
-                        const t = te(Nn, d), e = new s.Coordinate(t), n = this.ye(e, Bn).toArray(), r = this.Mn(e);
-                        n.push(t[2] * r[2]), a = this.en[o] = [ n, d[3] * r[2] ], a.center = e;
+                        const t = te(Nn, d), e = new s.Coordinate(t), n = this.ye(e, Bn).toArray(), r = this.On(e);
+                        n.push(t[2] * r[2]), a = this.tn[o] = [ n, d[3] * r[2] ], a.center = e;
                     } else if (y) {
-                        const e = te(Nn, y), r = new s.Coordinate(e), i = this.ye(r, Bn).toArray(), c = this.Mn(r);
+                        const e = te(Nn, y), r = new s.Coordinate(e), i = this.ye(r, Bn).toArray(), c = this.On(r);
                         i.push(e[2] * c[2]);
                         const h = y.slice(3);
-                        n.mat4.exactEquals(t.matrix, Rn) || n.mat3.multiply(h, n.mat3.fromMat4(Un, t.matrix), h);
+                        n.mat4.exactEquals(t.matrix, Dn) || n.mat3.multiply(h, n.mat3.fromMat4(Rn, t.matrix), h);
                         for (let t = 0; t < h.length; t++) h[t] *= c[t % 3], y[3 + t] = h[t];
-                        a = this.en[o] = [ ...i, ...h ], a.center = r;
+                        a = this.tn[o] = [ ...i, ...h ], a.center = r;
                     }
                 }
                 if (e) {
@@ -5327,11 +5309,11 @@
                     return !0;
                 }(r, a);
             }
-            Mn(t) {
+            On(t) {
                 const e = this.getMap(), r = e.distanceToPointAtRes(100, 100, e.getGLRes(), t);
                 return n.vec3.set(Pn, r.x / 100 * 1.01, r.y / 100 * 1.01, r.y / 100), Pn;
             }
-            gn(t) {
+            wn(t) {
                 Array.isArray(t) && (t = new s.Coordinate(t));
                 let e = this.options.offset;
                 if (y(e) && (e = e(Array.isArray(t) ? new s.Coordinate(t) : t)), e[0] || e[1]) {
@@ -5340,64 +5322,58 @@
                 }
                 return t;
             }
-            ln(t) {
+            hn(t) {
                 const e = this.options.services[t].maxExtent;
                 if (!e) return null;
-                const n = this.nn[t];
+                const n = this.en[t];
                 return n.maxExtent || (n.maxExtent = new s.Extent(e).convertTo(t => this.ye(t))), 
                 n.maxExtent;
             }
-            On(t) {
-                const e = this.hn, r = t.geometricError;
-                if (0 === r) return 0;
-                const s = this.getMap();
-                let i, o;
+            Tn(t) {
+                const e = this.an, n = t.geometricError;
+                if (0 === n) return 0;
+                const r = this.getMap();
+                let s;
                 if (t.boundingVolume.region) {
-                    const e = this.en[t.id].center, r = (s.getGLZoom ? s.distanceToPoint(100, 0, s.getGLZoom(), e) : s.distanceToPointAtRes(100, 0, s.getGLRes(), e)).x / 100;
-                    i = function(t, e, n, r) {
+                    const e = this.tn[t.id].center, n = (r.getGLZoom ? r.distanceToPoint(100, 0, r.getGLZoom(), e) : r.distanceToPointAtRes(100, 0, r.getGLRes(), e)).x / 100;
+                    s = function(t, e, n, r) {
                         const s = t.boundingVolume.region;
-                        let i = t.Sn;
-                        i || (i = t.Sn = [ Vn(s[0], s[1]), Vn(s[0], s[3]), Vn(s[2], s[1]), Vn(s[2], s[3]), Vn(s[0], s[1]), Vn(s[0], s[3]), Vn(s[2], s[1]), Vn(s[2], s[3]) ], 
-                        t.xn = [ Math.min.apply(Math, i.map(t => t[0])), Math.min.apply(Math, i.map(t => t[1])) ], 
-                        t.In = [ Math.max.apply(Math, i.map(t => t[0])), Math.max.apply(Math, i.map(t => t[1])) ]);
+                        let i = t.vn;
+                        i || (i = t.vn = [ Vn(s[0], s[1]), Vn(s[0], s[3]), Vn(s[2], s[1]), Vn(s[2], s[3]), Vn(s[0], s[1]), Vn(s[0], s[3]), Vn(s[2], s[1]), Vn(s[2], s[3]) ], 
+                        t.Mn = [ Math.min.apply(Math, i.map(t => t[0])), Math.min.apply(Math, i.map(t => t[1])) ], 
+                        t.Sn = [ Math.max.apply(Math, i.map(t => t[0])), Math.max.apply(Math, i.map(t => t[1])) ]);
                         if (n[0] >= s[0] && n[0] <= s[2] && n[1] >= s[1] && n[1] <= s[3]) return n[2] <= s[5] ? 0 : n[2] - s[5];
-                        const o = (a = t.xn, c = t.In, h = e, u = Math.max(a[0] - h[0], 0, h[0] - c[0]), 
+                        const o = (a = t.Mn, c = t.Sn, h = e, u = Math.max(a[0] - h[0], 0, h[0] - c[0]), 
                         f = Math.max(a[1] - h[1], 0, h[1] - c[1]), Math.sqrt(u * u + f * f) / r);
                         var a, c, h, u, f;
                         let l = 0;
                         n[2] > s[5] && (l = n[2] - s[5]);
                         return Math.sqrt(o * o + l * l);
-                    }(t, this.un, this.an, r), o = function(t, e) {
-                        const r = t.boundingVolume.region, s = Kt(zn, r[0], r[1], r[4]), i = Kt(jn, r[2], r[3], r[5]), o = n.vec3.scale(s, n.vec3.add(s, s, i), .5);
-                        return n.vec3.dist(o, e);
-                    }(t, this.cn);
-                } else t.boundingVolume.sphere ? (i = Dn(t.boundingVolume, this.cn), o = function(t, e) {
-                    const r = t.boundingVolume.sphere;
-                    return n.vec3.dist(r, e);
-                }(t, this.cn)) : t.boundingVolume.box && (i = kn(t.boundingVolume, this.cn), o = function(t, e) {
-                    const r = t.boundingVolume.box;
-                    return n.vec3.dist(r, e);
-                }(t, this.cn));
-                const a = Math.max(Math.abs(i), 1e-7), c = r * s.height / (a * e);
-                return t.ce = i, t.Ye = o, t.vn = c, c;
-            }
-            in() {
+                    }(t, this.cn, this.sn, n);
+                } else t.boundingVolume.sphere ? s = zn(t.boundingVolume, this.in) : t.boundingVolume.box && (s = jn(t.boundingVolume, this.in));
+                const i = Math.max(Math.abs(s), 1e-7), o = n * r.height / (i * e);
+                return t.ce = s, t.An = o, o;
+            }
+            rn() {
                 const t = this.getRenderer();
                 t && t.setToRedraw();
             }
             Me(t) {
-                return this.en[t];
+                return this.tn[t];
             }
         }
-        function Dn(t, e) {
+        function zn(t, e) {
             const r = t.sphere, s = n.vec3.dist(r, e), i = t.sphere[3];
             return s < i ? 0 : s - i;
         }
-        function kn(t, e) {
-            const n = t.box;
-            return gn(n.slice(0, 3), n.slice(3), e);
+        function jn(t, e) {
+            const r = t.box;
+            return gn(n.vec3.set(Nn, r[0], r[1], r[2]), n.mat3.set(Rn, r[3], r[4], r[5], r[6], r[7], r[8], r[9], r[10], r[11]), e);
+        }
+        function Vn(t, e) {
+            return Un.x = p(t), Un.y = p(e), Sn.project(Un, Cn).toArray();
         }
-        Fn.mergeOptions({
+        kn.mergeOptions({
             "maxGPUMemory": 512,
             "retireInterval": 2e3,
             "loadingLimitOnInteracting": 5,
@@ -5413,12 +5389,7 @@
             "sRGBTolinear": !1,
             "optionalExtensions": [ "ANGLE_instanced_arrays", "OES_element_index_uint", "OES_standard_derivatives", "OES_vertex_array_object", "OES_texture_half_float", "OES_texture_half_float_linear", "OES_texture_float", "OES_texture_float_linear", "WEBGL_depth_texture", "EXT_shader_texture_lod", "WEBGL_compressed_texture_astc", "WEBGL_compressed_texture_etc", "WEBGL_compressed_texture_etc1", "WEBGL_compressed_texture_pvrtc", "WEBGL_compressed_texture_s3tc", "WEBGL_compressed_texture_s3tc_srgb" ],
             "offset": [ 0, 0 ]
-        }), Fn.registerRenderer("gl", pn);
-        const zn = [], jn = [];
-        function Vn(t, e) {
-            const n = new s.Coordinate(p(t), p(e));
-            return Sn.project(n).toArray();
-        }
+        }), kn.registerRenderer("gl", pn);
         const Gn = function() {
             if ("undefined" != typeof self) return self;
             if ("undefined" != typeof window) return window;
@@ -5437,7 +5408,7 @@
         };
         class $n {
             constructor(t, e, n) {
-                this.i = t, this.Y = e || Pt, this.o = n, this.tt = {
+                this.i = t, this.Y = e || Nt, this.o = n, this.tt = {
                     "image/crn": qn.crn && qn.crn(),
                     "image/ktx2": qn.ktx2 && qn.ktx2(),
                     "image/cttf": qn.ktx2 && qn.ktx2(),
@@ -5532,7 +5503,7 @@
         }
         class Jn {
             constructor(t, e, n) {
-                this.i = t, this.Y = e || Pt, this.o = n, this.tt = {
+                this.i = t, this.Y = e || Nt, this.o = n, this.tt = {
                     "image/crn": qn.crn && qn.crn(),
                     "image/ktx2": qn.ktx2 && qn.ktx2(),
                     "image/cttf": qn.ktx2 && qn.ktx2(),
@@ -5961,7 +5932,7 @@
         }
         class Yn {
             constructor(t, e) {
-                this.i = t, this.Y = e || Pt;
+                this.i = t, this.Y = e || Nt;
             }
             load(t, e, n = 0, r = 0) {
                 return e ? this.et(t, e, n, r) : ft.getArrayBuffer(t, {}).then(e => {
@@ -6011,9 +5982,9 @@
                 return o;
             }
         }
-        t.B3DMLoader = $n, t.CMPTLoader = Yn, t.Geo3DTilesLayer = Fn, t.Geo3DTilesUtil = x, 
+        t.B3DMLoader = $n, t.CMPTLoader = Yn, t.Geo3DTilesLayer = kn, t.Geo3DTilesUtil = x, 
         t.Geo3DTransform = oe, Object.defineProperty(t, "t", {
             value: !0
         });
-    })), i.Map.VERSION, o.GroupGLLayer.VERSION, "undefined" != typeof console && console.log("@maptalks/3dtiles v0.12.6");
+    })), i.Map.VERSION, o.GroupGLLayer.VERSION, "undefined" != typeof console && console.log("@maptalks/3dtiles v0.12.7");
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maptalks/3dtiles",
-  "version": "0.12.6",
+  "version": "0.12.7",
   "description": "3d tiles layer for maptalks",
   "main": "dist/maptalks.3dtiles.js",
   "module": "dist/maptalks.3dtiles.es.js",
@@ -35,8 +35,8 @@
   },
   "homepage": "https://github.com/fuzhenn/3dtiles-issues/",
   "dependencies": {
-    "@maptalks/gltf-loader": "^0.25.3",
-    "frustum-intersects": "^0.2.0",
+    "@maptalks/gltf-loader": "^0.25.5",
+    "frustum-intersects": "^0.2.2",
     "gl-matrix": "^2.6.1"
   },
   "devDependencies": {