@maptalks/3dtiles 0.12.5 → 0.12.6

package/dist/maptalks.3dtiles.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/3dtiles v0.12.5
+ * @maptalks/3dtiles v0.12.6
  * LICENSE : UNLICENSED
  * (c) 2016-2022 maptalks.com
  */
@@ -4722,7 +4722,7 @@
             draw(t, e) {
                 const n = this.prepareCanvas();
                 if (n && !n.intersects(this.canvasExtent2D)) return void this.completeRender();
-                const {root: r, tiles: s} = this.layer.getTiles(), i = s ? Object.keys(s).length : 0;
+                const {root: r, tiles: s} = this.layer.getTiles(), i = s.length;
                 if (!s || !i) return void this.completeRender();
                 this.Be();
                 const {selectedTiles: o, leaves: a, requests: c} = this.Ue(r, s);
@@ -4734,7 +4734,7 @@
                 let r = 0;
                 const s = this.De(), i = {};
                 let o = !1, a = !1;
-                for (const t in e) {
+                for (let t = 0; t < e.length; t++) {
                     const s = e[t], c = s.node;
                     if (i[c.id]) continue;
                     i[c.id] = 1;
@@ -4806,13 +4806,13 @@
                 for (;r.length > 0; ) {
                     const s = r.pop().children;
                     for (let i = 0, o = s.length; i < o; i++) {
-                        if (!this.layer.$e(s[i]) && s[i].children && s[i].children.length) {
+                        if ((!s[i].content || !s[i].content.url) && s[i].children && s[i].children.length) {
                             r.push(s[i]);
                             continue;
                         }
                         const o = s[i].id;
                         if (this.tileCache.has(o)) {
-                            const n = this.layer.Je(s[i], t);
+                            const n = this.layer.$e(s[i], t);
                             n.selected = !0, n.data = this.tileCache.get(o), t.children.push(n), e.push(n);
                         } else s[i].qe <= n && r.push(s[i]);
                     }
@@ -4853,7 +4853,7 @@
                 let e = t.content.url;
                 if (M(e)) {
                     const n = S(e);
-                    return void this.Ke(e, n, t);
+                    return void this.Je(e, n, t);
                 }
                 t && -1 === e.indexOf("http://") && -1 === e.indexOf("https://") && (e = t.baseUrl + e);
                 const n = this.layer.options.services[t.te];
@@ -4863,13 +4863,13 @@
                     let s = ft.getArrayBuffer(e + (r || ""), n.ajaxOptions);
                     const i = s.xhr;
                     s = s.then(n => {
-                        delete this.bt[e], n ? this.Ke(e, n.data, t) : this.onTileError(null, t);
+                        delete this.bt[e], n ? this.Je(e, n.data, t) : this.onTileError(null, t);
                     }).catch(n => {
                         delete this.bt[e], this.onTileError(n, t);
                     }), this.bt[e] = i;
-                } else this.Ke(e, null, t);
+                } else this.Je(e, null, t);
             }
-            Ke(t, e, r) {
+            Je(t, e, r) {
                 let s = this.o;
                 s || (s = n.reshader.Util.getSupportedFormats(this.gl.gl || this.gl), this.o = s), 
                 this.workerConn.loadTile(this.layer.getId(), {
@@ -4894,29 +4894,29 @@
                 for (;this.Le.length && (n < e || !t.isInteracting()); ) {
                     const {data: t, tile: e} = this.Le.shift(), {magic: r} = t;
                     "b3dm" === r ? this.painter.createB3DMMesh(t, e.id, e, (n, {mesh: r}) => {
-                        this.Xe(t, e, n, r);
+                        this.Ke(t, e, n, r);
                     }) : "pnts" === r ? this.painter.createPntsMesh(t, e.id, e, (n, {mesh: r}) => {
-                        this.Xe(t, e, n, r);
+                        this.Ke(t, e, n, r);
                     }) : "i3dm" === r ? this.painter.createI3DMMesh(t, e.id, e, (n, {mesh: r}) => {
-                        this.Xe(t, e, n, r);
+                        this.Ke(t, e, n, r);
                     }) : "cmpt" === r && this.painter.createCMPTMesh(t, e.id, e, (n, {mesh: r}) => {
-                        this.Xe(t, e, n, r);
+                        this.Ke(t, e, n, r);
                     }), n++;
                 }
             }
-            Xe(t, e, n, r) {
+            Ke(t, e, n, r) {
                 if (n) this.onTileError(n, e); else {
-                    const n = this.We(r);
+                    const n = this.Xe(r);
                     e.memorySize = n, this.onTileLoad(t, e);
                 }
             }
-            We(t) {
+            Xe(t) {
                 let e = 0;
-                if (Array.isArray(t)) for (let n = 0; n < t.length; n++) t[n] && (e += this.We(t[n])); else t && (e += t.getMemorySize());
+                if (Array.isArray(t)) for (let n = 0; n < t.length; n++) t[n] && (e += this.Xe(t[n])); else t && (e += t.getMemorySize());
                 return e;
             }
             onTileLoad(t, e) {
-                this.layer && (delete this.tilesLoading[e.id], this.Ze(e), this.setToRedraw(), this.layer.fire("tileload", {
+                this.layer && (delete this.tilesLoading[e.id], this.We(e), this.setToRedraw(), this.layer.fire("tileload", {
                     node: e
                 }));
             }
@@ -4927,7 +4927,7 @@
                 if (!this.layer) return;
                 const n = e.content.url;
                 console.warn("failed to load 3d tile: " + n), console.warn(t), delete this.tilesLoading[e.id], 
-                this.Ze(e), this.setToRedraw(), this.layer.fire("tileerror", {
+                this.We(e), this.setToRedraw(), this.layer.fire("tileerror", {
                     node: e,
                     error: t
                 });
@@ -4935,7 +4935,7 @@
             ke(t) {
                 return this.tileCache.get(t);
             }
-            Ze(t) {
+            We(t) {
                 const e = {
                     loadTime: s.Util.now(),
                     current: !0,
@@ -4967,7 +4967,7 @@
                     antialias: t.options.antialias
                 };
                 this.canvas.gl && this.canvas.gl.wrap ? (this.gl = this.canvas.gl.wrap(), this.regl = this.canvas.gl.regl) : (this.glOptions = e, 
-                this.gl = this.Qe(this.canvas, e)), this.regl = this.regl || n.createREGL({
+                this.gl = this.Ze(this.canvas, e)), this.regl = this.regl || n.createREGL({
                     gl: this.gl,
                     attributes: e,
                     extensions: [ "OES_element_index_uint", "WEBGL_compressed_texture_s3tc" ],
@@ -5010,10 +5010,10 @@
                 return 0;
             }
             Re(t) {
-                this.Ye || (this.Ye = Date.now());
+                this.Qe || (this.Qe = Date.now());
                 const e = Date.now();
-                if (t || !(e - this.Ye < this.layer.options.retireInterval)) {
-                    this.Ye = e;
+                if (t || !(e - this.Qe < this.layer.options.retireInterval)) {
+                    this.Qe = e;
                     for (const e in this.tilesLoading) {
                         const n = this.tilesLoading[e];
                         !t && n.current || this.abortTileLoading(n);
@@ -5023,7 +5023,7 @@
             De() {
                 return this.getMap().isInteracting() ? this.layer.options.loadingLimitOnInteracting : this.layer.options.loadingLimit;
             }
-            Qe(t, e) {
+            Ze(t, e) {
                 const n = [ "webgl", "experimental-webgl" ];
                 let r = null;
                 for (let s = 0; s < n.length; ++s) {
@@ -5051,7 +5051,7 @@
             }
         }
         function wn(t, e) {
-            return 0 === t.ce && 0 === e.ce ? t.tn - e.tn : t.ce - e.ce;
+            return 0 === t.ce && 0 === e.ce ? t.Ye - e.Ye : 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;
@@ -5070,14 +5070,14 @@
             }(t, e, n));
         }
         const Tn = [], An = [], On = [], vn = [], Mn = [];
-        const Sn = s.projection.EPSG3857, xn = new s.Extent(0, 0, 0, 0), In = [], Nn = [], En = [], Pn = new s.Coordinate(0, 0), Ln = n.mat4.identity([]);
-        class Bn 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 = [], Cn = new s.Coordinate(0, 0), Rn = n.mat4.identity([]);
+        class Fn extends s.Layer {
             constructor(t, e) {
-                super(t, e), this.en(), this.bt = {}, this.nn = {};
+                super(t, e), this.tn(), this.bt = {}, this.en = {};
             }
-            en() {
+            tn() {
                 let t = this.options.services.map(t => t.url);
-                this.rn = t.map((t, e) => function(t, e) {
+                this.nn = t.map((t, e) => function(t, e) {
                     t = w(t);
                     return {
                         baseUrl: t.substring(0, t.lastIndexOf("/")) + "/",
@@ -5090,22 +5090,22 @@
                         qe: 0
                     };
                 }(t, e)), this.fire("rootready", {
-                    roots: this.rn.slice(0)
+                    roots: this.nn.slice(0)
                 });
             }
             getExtent(t) {
                 if (!t && 0 !== t) {
                     const t = new s.Extent;
-                    for (let e = 0; e < this.rn.length; e++) if (this.rn[e].boundingVolume) {
-                        const n = this.boundingVolumeToExtent(this.rn[e]);
+                    for (let e = 0; e < this.nn.length; e++) if (this.nn[e].boundingVolume) {
+                        const n = this.boundingVolumeToExtent(this.nn[e]);
                         t._combine(n);
                     }
                     return t;
                 }
-                return this.rn[t] && this.rn[t].boundingVolume ? this.boundingVolumeToExtent(this.rn[t]) : null;
+                return this.nn[t] && this.nn[t].boundingVolume ? this.boundingVolumeToExtent(this.nn[t]) : null;
             }
             boundingVolumeToExtent(t) {
-                const e = t.boundingVolume.sn ? Ln : t.matrix, r = this.getMap();
+                const e = t.boundingVolume.rn ? Rn : 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,57 +5123,58 @@
                 return null;
             }
             getRootTiles() {
-                return this.rn;
+                return this.nn;
             }
             getTiles() {
-                return this.getRenderer().ready ? this.in() : (this.an(), {
-                    tiles: null
+                return this.getRenderer().ready ? this.sn() : (this.in(), {
+                    tiles: Ln
                 });
             }
-            in() {
+            sn() {
                 const t = this.getMap(), e = t.cameraPosition;
                 let r, s;
-                if (t.getGLZoom) s = t.pointToDistance(e[2], 0, t.getGLZoom()), Pn.set(e[0], e[1]), 
-                r = t.pointToCoord(Pn, t.getGLZoom()); else {
+                if (t.getGLZoom) s = t.pointToDistance(e[2], 0, t.getGLZoom()), Cn.set(e[0], e[1]), 
+                r = t.pointToCoord(Cn, t.getGLZoom()); else {
                     const n = t.getGLRes();
-                    s = t.pointAtResToDistance(e[2], 0, n), Pn.set(e[0], e[1]), r = t.pointAtResToCoord(Pn, n);
+                    s = t.pointAtResToDistance(e[2], 0, n), Cn.set(e[0], e[1]), r = t.pointAtResToCoord(Cn, n);
                 }
-                this.cn = this.cn || [], n.vec3.set(this.cn, b(r.x), b(r.y), s), this.hn = Kt(this.hn || [], this.cn[0], this.cn[1], this.cn[2]), 
-                this.un = 2 * Math.tan(.5 * b(t.getFov())), this.ln = Sn.project(r).toArray();
+                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();
                 const i = t.projViewMatrix, o = {
                     children: [],
                     level: -1
                 };
                 let a = o;
-                const c = {};
-                for (let t = 0; t < this.rn.length; t++) {
+                const c = [];
+                for (let t = 0; t < this.nn.length; t++) {
                     let e = 1 / 0;
-                    const n = [ this.rn[t] ], r = this.dn(t);
+                    const n = [ this.nn[t] ], r = this.ln(t);
                     for (;n.length > 0; ) {
                         const t = n.pop();
-                        for (this.mn(t); a.level >= t.qe; ) a = a.parent;
-                        const s = this.yn(t, r, i);
+                        for (t.id || this.dn(t); a.level >= t.qe; ) a = a.parent;
+                        const s = this.mn(t, r, i);
                         if (s < 1) {
                             let n = a;
                             for (;n && !n.content; ) n = n.parent;
-                            0 === s && n && n.content && (t.bn = n, this.pn(c, n));
+                            0 === s && n && n.content && this.yn(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.wn(t);
-                        const o = this.Je(t, a);
+                        t.ce < 1 / 0 && this.bn(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.pn(c, o), u) {
-                            f && "add" === t.refine && this.pn(c, o), a = o;
-                            for (let e = 0, r = h.length; e < r; e++) {
-                                if (!h[e].parent) {
-                                    h[e].parent = t, h[e].Te = t.Te, h[e].baseUrl = t.baseUrl;
-                                    const n = h[e].content && (h[e].content.url || h[e].content.uri);
-                                    n && (M(n) ? h[e].baseUrl = t.baseUrl : -1 === n.indexOf("http://") && -1 === n.indexOf("https://") ? h[e].content.url = t.baseUrl + n : h[e].baseUrl = n.substring(0, n.lastIndexOf("/") + 1));
+                        if (!u && f && this.yn(c, o), u) {
+                            f && "add" === t.refine && this.yn(c, o), a = o;
+                            const e = h[0].parent;
+                            for (let r = 0, s = h.length; r < s; r++) {
+                                if (!e) {
+                                    h[r].parent = t, h[r].Te = t.Te, h[r].baseUrl = t.baseUrl;
+                                    const e = h[r].content && (h[r].content.url || h[r].content.uri);
+                                    e && (M(e) ? h[r].baseUrl = t.baseUrl : -1 === e.indexOf("http://") && -1 === e.indexOf("https://") ? h[r].content.url = t.baseUrl + e : h[r].baseUrl = e.substring(0, e.lastIndexOf("/") + 1));
                                 }
-                                n.push(h[e]);
+                                n.push(h[r]);
                             }
                         }
                     }
@@ -5183,14 +5184,15 @@
                     tiles: c
                 };
             }
-            pn(t, e) {
-                e.node.viewerRequestVolume && !function(t, e, n) {
+            yn(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 Un(n, e);
-                        if (n.box) return 0 === Cn(n, e);
+                        if (n.sphere) return Dn(n, e);
+                        if (n.box) return 0 === kn(n, e);
                     }
                     return !1;
                 }
@@ -5198,51 +5200,48 @@
        * @maptalks/gl v0.65.0
        * LICENSE : UNLICENSED
        * (c) 2016-2022 maptalks.com
-       */ (this.cn, this.hn, e.node.viewerRequestVolume) || (t[e.node.id] = e);
+       */ (this.an, this.cn, n) || t.push(e);
             }
-            Je(t, e) {
+            $e(t, e) {
                 return {
                     id: t.id,
                     node: t,
                     children: [],
                     level: t.qe,
                     parent: e,
-                    content: this.$e(t)
+                    content: t.content && t.content.url
                 };
             }
-            mn(t) {
-                void 0 === t.id && (t.id = s.Util.GUID(), t.matrix = t.transform || n.mat4.identity([]), 
-                t._n = this.gn(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), 
+            dn(t) {
+                t.id = s.Util.GUID(), t.matrix = t.transform || n.mat4.identity([]), t.pn = this.wn(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.Tn(t));
+                this._n(t);
             }
-            Tn(t) {
+            _n(t) {
                 const e = t.boundingVolume;
-                if (!e || e.sn) return;
+                if (!e || e.rn) 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, Ln) && !i) return;
+                if (!t.boundingVolume || !r && n.mat4.exactEquals(t.matrix, Rn) && !i) return;
                 const {region: o, box: a, sphere: c} = e;
                 if (o) {
-                    const t = this.An([ p(o[0]), p(o[1]) ]);
+                    const t = this.gn([ p(o[0]), p(o[1]) ]);
                     o[0] = b(t.x), o[1] = b(t.y);
-                    const e = this.An([ p(o[2]), p(o[3]) ]);
+                    const e = this.gn([ 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(In, e, t.matrix), i = te(Nn, s), o = this.An([ i[0], i[1] ]);
+                    const e = a || c, s = n.vec3.transformMat4(Nn, e, t.matrix), i = te(En, s), o = this.gn([ 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.sn = !0;
+                e.rn = !0;
             }
-            gn(t) {
+            wn(t) {
                 return void 0 === t.geometricError || !t.boundingVolume;
             }
-            $e(t) {
-                return t.content && t.content.url;
-            }
-            wn(t) {
+            bn(t) {
                 let e = t.parent;
-                for (;e && e._n && !(e.ce <= t.ce && e.tn <= t.tn); ) e.ce = t.ce, e.tn = t.tn, 
+                for (;e && e.pn && !(e.ce <= t.ce && e.Ye <= t.Ye); ) e.ce = t.ce, e.Ye = t.Ye, 
                 e = t.parent;
             }
             onTilesetLoad(t, e, r) {
@@ -5253,54 +5252,55 @@
                     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.Tn(e), e.On = e.content, delete e.content, t.root.content && (e.content = t.root.content), 
-                    e._n = this.gn(e);
+                    this._n(e), e.Tn = e.content, delete e.content, t.root.content && (e.content = t.root.content), 
+                    e.pn = this.wn(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.an(), this.fire("loadtileset", {
+                this.in(), this.fire("loadtileset", {
                     tileset: t,
                     index: e.te,
                     url: r
                 });
             }
-            yn(t, e, n) {
-                if (t.ce = 1 / 0, 0 === t.qe || t._n) return 1;
-                if (t.vn = 1 / 0, !this.Mn(t, e, n)) return -1;
+            mn(t, e, n) {
+                if (t.ce = 1 / 0, 0 === t.qe || t.pn) return 1;
+                if (!this.An(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.Sn(t);
+                let s = this.On(t);
                 return 0 === s && t.parent && (s = .5 * (t.parent.vn || 0)), s >= r ? 1 : 0;
             }
-            ye(t) {
-                const e = this.getMap();
-                return e.getGLZoom ? e.coordToPoint(t, e.getGLZoom()) : e.coordToPointAtRes(t, e.getGLRes());
+            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);
             }
-            Mn(t, e, r) {
+            An(t, e, r) {
                 if (!this.getMap()) return !1;
                 const o = t.id;
-                let a = this.nn[o];
+                let a = this.en[o];
                 const {boundingVolume: f} = t;
                 if (!f) return !1;
                 const {sphere: d, region: m, box: y} = f;
                 if (!a) {
                     let e, r, i;
                     if (m) {
-                        e = new s.Extent(p(m[0]), p(m[1]), p(m[2]), p(m[3]));
-                        const t = e.getCenter(), n = this.xn(t);
-                        e = e.convertTo(t => this.ye(t)), i = m[4], r = m[5], a = this.nn[o] = [ [ e.xmin, e.ymin, i * n[2] ], [ e.xmax, e.ymax, r * n[2] ] ], 
+                        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] ] ], 
                         a.center = t;
                     } else if (d) {
-                        const t = te([], d), e = new s.Coordinate(t), n = this.ye(e).toArray(), r = this.xn(e);
-                        n.push(t[2] * r[2]), a = this.nn[o] = [ n, d[3] * r[2] ], a.center = new s.Coordinate(t);
+                        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;
                     } else if (y) {
-                        const e = te([], y), r = new s.Coordinate(e), i = this.ye(r).toArray(), c = this.xn(r);
+                        const e = te(Nn, y), r = new s.Coordinate(e), i = this.ye(r, Bn).toArray(), c = this.Mn(r);
                         i.push(e[2] * c[2]);
                         const h = y.slice(3);
-                        n.mat4.exactEquals(t.matrix, Ln) || n.mat3.multiply(h, n.mat3.fromMat4([], t.matrix), h);
+                        n.mat4.exactEquals(t.matrix, Rn) || n.mat3.multiply(h, n.mat3.fromMat4(Un, t.matrix), h);
                         for (let t = 0; t < h.length; t++) h[t] *= c[t % 3], y[3 + t] = h[t];
-                        a = this.nn[o] = [ ...i, ...h ], a.center = new s.Coordinate(e);
+                        a = this.en[o] = [ ...i, ...h ], a.center = r;
                     }
                 }
                 if (e) {
@@ -5327,11 +5327,11 @@
                     return !0;
                 }(r, a);
             }
-            xn(t) {
+            Mn(t) {
                 const e = this.getMap(), r = e.distanceToPointAtRes(100, 100, e.getGLRes(), t);
-                return n.vec3.set(En, r.x / 100 * 1.01, r.y / 100 * 1.01, r.y / 100), En;
+                return n.vec3.set(Pn, r.x / 100 * 1.01, r.y / 100 * 1.01, r.y / 100), Pn;
             }
-            An(t) {
+            gn(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 +5340,64 @@
                 }
                 return t;
             }
-            dn(t) {
+            ln(t) {
                 const e = this.options.services[t].maxExtent;
                 if (!e) return null;
-                const n = this.rn[t];
+                const n = this.nn[t];
                 return n.maxExtent || (n.maxExtent = new s.Extent(e).convertTo(t => this.ye(t))), 
                 n.maxExtent;
             }
-            Sn(t) {
-                const e = this.un, r = t.geometricError;
+            On(t) {
+                const e = this.hn, r = t.geometricError;
                 if (0 === r) return 0;
                 const s = this.getMap();
                 let i, o;
                 if (t.boundingVolume.region) {
-                    const e = this.nn[t.id].center, r = (s.getGLZoom ? s.distanceToPoint(100, 0, s.getGLZoom(), e) : s.distanceToPointAtRes(100, 0, s.getGLRes(), e)).x / 100;
+                    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 s = t.boundingVolume.region;
-                        let i = t.In;
-                        i || (i = t.In = [ Dn(s[0], s[1]), Dn(s[0], s[3]), Dn(s[2], s[1]), Dn(s[2], s[3]), Dn(s[0], s[1]), Dn(s[0], s[3]), Dn(s[2], s[1]), Dn(s[2], s[3]) ], 
-                        t.Nn = [ Math.min.apply(Math, i.map(t => t[0])), Math.min.apply(Math, i.map(t => t[1])) ], 
-                        t.En = [ Math.max.apply(Math, i.map(t => t[0])), Math.max.apply(Math, i.map(t => t[1])) ]);
+                        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])) ]);
                         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.Nn, c = t.En, h = e, u = Math.max(a[0] - h[0], 0, h[0] - c[0]), 
+                        const o = (a = t.xn, c = t.In, 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.ln, this.cn, r), o = function(t, e) {
-                        const r = t.boundingVolume.region, s = Kt(Rn, r[0], r[1], r[4]), i = Kt(Fn, r[2], r[3], r[5]), o = n.vec3.scale(s, n.vec3.add(s, s, i), .5);
+                    }(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.hn);
-                } else t.boundingVolume.sphere ? (i = Un(t.boundingVolume, this.hn), o = function(t, 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.hn)) : t.boundingVolume.box && (i = Cn(t.boundingVolume, this.hn), o = function(t, 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.hn));
+                }(t, this.cn));
                 const a = Math.max(Math.abs(i), 1e-7), c = r * s.height / (a * e);
-                return t.ce = i, t.tn = o, t.vn = c, c;
+                return t.ce = i, t.Ye = o, t.vn = c, c;
             }
-            an() {
+            in() {
                 const t = this.getRenderer();
                 t && t.setToRedraw();
             }
             Me(t) {
-                return this.nn[t];
+                return this.en[t];
             }
         }
-        function Un(t, e) {
+        function Dn(t, e) {
             const r = t.sphere, s = n.vec3.dist(r, e), i = t.sphere[3];
             return s < i ? 0 : s - i;
         }
-        function Cn(t, e) {
+        function kn(t, e) {
             const n = t.box;
             return gn(n.slice(0, 3), n.slice(3), e);
         }
-        Bn.mergeOptions({
+        Fn.mergeOptions({
             "maxGPUMemory": 512,
             "retireInterval": 2e3,
             "loadingLimitOnInteracting": 5,
@@ -5413,35 +5413,35 @@
             "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 ]
-        }), Bn.registerRenderer("gl", pn);
-        const Rn = [], Fn = [];
-        function Dn(t, e) {
+        }), 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();
         }
-        const kn = function() {
+        const Gn = function() {
             if ("undefined" != typeof self) return self;
             if ("undefined" != typeof window) return window;
             if ("undefined" != typeof global) return global;
             throw new Error("unable to locate global object");
-        }, zn = kn(), jn = zn.gl_trans__coders = zn.gl_trans__coders || {};
-        jn.inject = function(t) {
-            const e = t.toString(), n = e.indexOf("{") + 1, r = e.substring(0, n), s = zn.gl_trans__coders = zn.gl_trans__coders || {};
-            let i = `${r}\n    const _____getGlobal = ${kn.toString()};\n    const g___lobals = _____getGlobal()\n    const tran_____scoders = g___lobals['gl_trans__coders'] = g___lobals['gl_trans__coders'] || {};`;
+        }, Hn = Gn(), qn = Hn.gl_trans__coders = Hn.gl_trans__coders || {};
+        qn.inject = function(t) {
+            const e = t.toString(), n = e.indexOf("{") + 1, r = e.substring(0, n), s = Hn.gl_trans__coders = Hn.gl_trans__coders || {};
+            let i = `${r}\n    const _____getGlobal = ${Gn.toString()};\n    const g___lobals = _____getGlobal()\n    const tran_____scoders = g___lobals['gl_trans__coders'] = g___lobals['gl_trans__coders'] || {};`;
             for (const t in s) "inject" !== t && "getTranscoder" !== t && "registerTranscoder" !== t && (i += 'tran_____scoders["' + t + '"] =' + s[t].toString() + "\n;");
             return i += "\n" + e.substring(r.length), i;
-        }, jn.registerTranscoder = function(t, e) {
-            jn[t] = e;
-        }, jn.getTranscoder = function(t) {
-            return jn[t];
+        }, qn.registerTranscoder = function(t, e) {
+            qn[t] = e;
+        }, qn.getTranscoder = function(t) {
+            return qn[t];
         };
-        class Vn {
+        class $n {
             constructor(t, e, n) {
                 this.i = t, this.Y = e || Pt, this.o = n, this.tt = {
-                    "image/crn": jn.crn && jn.crn(),
-                    "image/ktx2": jn.ktx2 && jn.ktx2(),
-                    "image/cttf": jn.ktx2 && jn.ktx2(),
-                    "draco": jn.draco && jn.draco()
+                    "image/crn": qn.crn && qn.crn(),
+                    "image/ktx2": qn.ktx2 && qn.ktx2(),
+                    "image/cttf": qn.ktx2 && qn.ktx2(),
+                    "draco": qn.draco && qn.draco()
                 };
             }
             static createEmptyB3DM() {
@@ -5530,13 +5530,13 @@
                 return null;
             }
         }
-        class Gn {
+        class Jn {
             constructor(t, e, n) {
                 this.i = t, this.Y = e || Pt, this.o = n, this.tt = {
-                    "image/crn": jn.crn && jn.crn(),
-                    "image/ktx2": jn.ktx2 && jn.ktx2(),
-                    "image/cttf": jn.ktx2 && jn.ktx2(),
-                    "draco": jn.draco && jn.draco()
+                    "image/crn": qn.crn && qn.crn(),
+                    "image/ktx2": qn.ktx2 && qn.ktx2(),
+                    "image/cttf": qn.ktx2 && qn.ktx2(),
+                    "draco": qn.draco && qn.draco()
                 };
             }
             load(t, e, n = 0, r = 0) {
@@ -5707,7 +5707,7 @@
             }
             ct(t) {
                 const e = t.length / 2, n = new Float32Array(3 * e), r = [];
-                for (let s = 0; s < e; s++) Hn(r, t[2 * s], t[2 * s + 1], 65535), n[3 * s] = r[0], 
+                for (let s = 0; s < e; s++) Kn(r, t[2 * s], t[2 * s + 1], 65535), n[3 * s] = r[0], 
                 n[3 * s + 1] = r[1], n[3 * s + 2] = r[2];
                 return n;
             }
@@ -5718,15 +5718,15 @@
                 return null;
             }
         }
-        function Hn(t, e, n, r) {
-            if (t[0] = qn(e, r), t[1] = qn(n, r), t[2] = 1 - (Math.abs(t[0]) + Math.abs(t[1])), 
+        function Kn(t, e, n, r) {
+            if (t[0] = Xn(e, r), t[1] = Xn(n, r), t[2] = 1 - (Math.abs(t[0]) + Math.abs(t[1])), 
             t[2] < 0) {
                 const e = t[0];
-                t[0] = (1 - Math.abs(t[1])) * $n(e), t[1] = (1 - Math.abs(e)) * $n(t[1]);
+                t[0] = (1 - Math.abs(t[1])) * Wn(e), t[1] = (1 - Math.abs(e)) * Wn(t[1]);
             }
             return D(t, t);
         }
-        function qn(t, e) {
+        function Xn(t, e) {
             return function(t, e, n) {
                 return t < e ? e : t > n ? n : t;
             }(t, 0, e = function(t, e) {
@@ -5734,10 +5734,10 @@
                 return e;
             }(e, 255)) / e * 2 - 1;
         }
-        function $n(t) {
+        function Wn(t) {
             return t < 0 ? -1 : 1;
         }
-        class Jn {
+        class Zn {
             constructor() {}
             load(t, e, n = 0, r = 0) {
                 return e ? (r || (r = e.byteLength), this.et(t, e, n, r)) : ft.getArrayBuffer(t, {}).then(e => {
@@ -5778,7 +5778,7 @@
                         attributes: y.properties,
                         useUniqueIDs: !1
                     };
-                    return this.ut || (this.ut = jn.draco()), this.ut(m, e).then(e => {
+                    return this.ut || (this.ut = qn.draco()), this.ut(m, e).then(e => {
                         const n = e.attributes;
                         !a.POSITION && !a.POSITION_QUANTIZED || n.POSITION || n.POSITION_QUANTIZED || (n.POSITION = a.POSITION, 
                         n.POSITION_QUANTIZED = a.POSITION_QUANTIZED), !(a.RGB || a.RGBA || a.RGB565) || n.RGB || n.RGBA || n.RGB565 || (n.RGB = a.RGB, 
@@ -5796,7 +5796,7 @@
                                 array: t
                             }, o.push(t.buffer);
                         } else if (a.BATCH_ID || Object.keys(h).length) {
-                            a.BATCH_ID ? r.BATCH_ID = de(a.BATCH_ID, t, c.offset, d) : r.BATCH_ID = Kn(d);
+                            a.BATCH_ID ? r.BATCH_ID = de(a.BATCH_ID, t, c.offset, d) : r.BATCH_ID = Qn(d);
                             const e = r.BATCH_ID.array && r.BATCH_ID.array.buffer;
                             e && o.indexOf(e) < 0 && o.push(e);
                         }
@@ -5812,7 +5812,7 @@
                 }
                 const b = this.ft(t, a, c.offset, d, o, f, l);
                 if (a.BATCH_ID || Object.keys(h).length) {
-                    a.BATCH_ID ? b.BATCH_ID = de(a.BATCH_ID, t, c.offset, d) : b.BATCH_ID = Kn(d);
+                    a.BATCH_ID ? b.BATCH_ID = de(a.BATCH_ID, t, c.offset, d) : b.BATCH_ID = Qn(d);
                     const e = b.BATCH_ID.array && b.BATCH_ID.array.buffer;
                     e && o.indexOf(e) < 0 && o.push(e);
                 }
@@ -5947,7 +5947,7 @@
                 return null;
             }
         }
-        function Kn(t) {
+        function Qn(t) {
             const e = v(t), n = new e(t);
             for (let e = 0; e < t; e++) n[e] = e;
             return {
@@ -5959,7 +5959,7 @@
                 array: n
             };
         }
-        class Xn {
+        class Yn {
             constructor(t, e) {
                 this.i = t, this.Y = e || Pt;
             }
@@ -5974,12 +5974,12 @@
                 const s = this.lt(e, t, n, r), i = [];
                 for (let n = 0; n < s.length; n++) {
                     let r;
-                    if ("b3dm" === s[n].magic) r = new Vn(this.i, this.Y); else if ("i3dm" === s[n].magic) r = new Gn(this.i, this.Y); else if ("pnts" === s[n].magic) r = new Jn; else {
+                    if ("b3dm" === s[n].magic) r = new $n(this.i, this.Y); else if ("i3dm" === s[n].magic) r = new Jn(this.i, this.Y); else if ("pnts" === s[n].magic) r = new Zn; else {
                         if ("cmpt" !== s[n].magic) {
                             console.warn("Unsupported magic in CMPT tile:", s[n].magic);
                             continue;
                         }
-                        r = new Xn(this.i, this.Y);
+                        r = new Yn(this.i, this.Y);
                     }
                     i.push(r.load(t, e, s[n].offset, s[n].byteLength).then(t => t));
                 }
@@ -6011,9 +6011,9 @@
                 return o;
             }
         }
-        t.B3DMLoader = Vn, t.CMPTLoader = Xn, t.Geo3DTilesLayer = Bn, t.Geo3DTilesUtil = x, 
+        t.B3DMLoader = $n, t.CMPTLoader = Yn, t.Geo3DTilesLayer = Fn, 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.5");
+    })), i.Map.VERSION, o.GroupGLLayer.VERSION, "undefined" != typeof console && console.log("@maptalks/3dtiles v0.12.6");
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maptalks/3dtiles",
-  "version": "0.12.5",
+  "version": "0.12.6",
   "description": "3d tiles layer for maptalks",
   "main": "dist/maptalks.3dtiles.js",
   "module": "dist/maptalks.3dtiles.es.js",