@maptalks/3dtiles 0.11.0 → 0.11.1

package/dist/maptalks.3dtiles.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/3dtiles v0.11.0
+ * @maptalks/3dtiles v0.11.1
  * LICENSE : UNLICENSED
  * (c) 2016-2022 maptalks.com
  */
@@ -4073,8 +4073,8 @@
                 let r = new s.Coordinate(p(e[0]), p(e[1])), i = new s.Coordinate(p(e[2]), p(e[3]));
                 r = this.ye(r), i = this.ye(i);
                 const o = r.add(i).be(.5);
-                r.pe(o), i.pe(o);
-                const a = this.we(e[4], e[5]), c = a.x, h = a.y, u = [ r.x, r.y, h, i.x, r.y, h, i.x, i.y, h, r.x, i.y, h, r.x, r.y, c, i.x, r.y, c, i.x, i.y, c, r.x, i.y, c ], f = new n.reshader.Geometry({
+                r._sub(o), i._sub(o);
+                const a = this.pe(e[4], e[5]), c = a.x, h = a.y, u = [ r.x, r.y, h, i.x, r.y, h, i.x, i.y, h, r.x, i.y, h, r.x, r.y, c, i.x, r.y, c, i.x, i.y, c, r.x, i.y, c ], f = new n.reshader.Geometry({
                     aPosition: u
                 }, [ 0, 1, 1, 2, 2, 3, 3, 0, 0, 4, 1, 5, 2, 6, 3, 7, 4, 5, 5, 6, 6, 7, 7, 4 ], 0, {
                     primitive: "lines"
@@ -4108,7 +4108,7 @@
                 i.RGB ? u.HAS_RGB = 1 : i.RGBA ? u.HAS_RGBA = 1 : i.RGB565 && (u.HAS_RGB565 = 1), 
                 (i.NORMAL || i.NORMAL_OCT16P) && (u.HAS_NORMAL = 1, i.NORMAL_OCT16P && (u.HAS_NORMAL_OCT16P = 1)), 
                 t.featureTable.CONSTANT_RGBA && (t.featureTable.CONSTANT_RGBA = t.featureTable.CONSTANT_RGBA.map(t => t / 255));
-                const {rtcCenter: f, rtcCoord: l} = t, d = this._e(l), m = this.ge(r, f, l);
+                const {rtcCenter: f, rtcCoord: l} = t, d = this.we(l), m = this._e(r, f, l);
                 n.mat4.multiply(m, m, d);
                 const y = this.Nt.options.services[a], b = new n.reshader.Mesh(h);
                 return b.properties.magic = "pnts", b.properties.id = e, b.properties.count = c, 
@@ -4141,7 +4141,7 @@
                         mesh: t
                     }), t;
                 }
-                const i = this.Te(r.Ae), {i3dm: o, featureTable: a, gltf: c, batchTable: h, batchTableBin: u, count: f} = t, l = a.INSTANCES_LENGTH, {rtcCenter: d, rtcCoord: m} = t, y = this._e(m), b = this.ge(r, d, m), {POSITION: p, NORMAL_UP: w, NORMAL_RIGHT: _, SCALE: g, SCALE_NON_UNIFORM: T, INSTANCE_ROTATION: O} = o, v = {
+                const i = this.ge(r.Te), {i3dm: o, featureTable: a, gltf: c, batchTable: h, batchTableBin: u, count: f} = t, l = a.INSTANCES_LENGTH, {rtcCenter: d, rtcCoord: m} = t, y = this.we(m), b = this._e(r, d, m), {POSITION: p, NORMAL_UP: w, NORMAL_RIGHT: _, SCALE: g, SCALE_NON_UNIFORM: T, INSTANCE_ROTATION: O} = o, v = {
                     "instance_vectorA": new Float32Array(4 * l),
                     "instance_vectorB": new Float32Array(4 * l),
                     "instance_vectorC": new Float32Array(4 * l)
@@ -4183,12 +4183,12 @@
                 let F = 0, D = !0;
                 const k = [];
                 return Dt(c, (t, s, o, a) => {
-                    let {geometry: c, material: d} = this.Oe(t, s, o, a, r, !0, R);
+                    let {geometry: c, material: d} = this.Ae(t, s, o, a, r, !0, R);
                     d && !d.isReady() && (D = !1, F++);
                     const m = new n.reshader.InstancedMesh(L, l, c, d);
                     m.properties.magic = "i3dm", m.properties.id = e, m.properties.count = f, m.properties.batchTable = h, 
                     m.properties.batchTableBin = u;
-                    const p = this.ve(t, c, d, r.te), w = n.mat4.identity([]);
+                    const p = this.Oe(t, c, d, r.te), w = n.mat4.identity([]);
                     if (t.matrices && t.matrices.length) for (let e = 0; e < t.matrices.length; e++) n.mat4.multiply(w, w, t.matrices[e]);
                     n.mat4.multiply(w, i, w), m.setPositionMatrix(w), n.mat4.multiply(y, b, y), m.setLocalTransform(y), 
                     m.setDefines(p), m.properties.polygonOffset = {
@@ -4201,7 +4201,7 @@
                 })) : (this.Bt[e] = {
                     meshes: k,
                     count: F
-                }, k.Me = s), k;
+                }, k.ve = s), k;
             }
             createB3DMMesh(t, e, r, i) {
                 if (this.Rt[e] || this.Bt[e]) {
@@ -4216,21 +4216,21 @@
                     const t = new s.Extent(r.maxExtent).convertTo(t => this._pointToPrj(t));
                     o = [ t.xmin, t.ymin, t.xmax, t.ymax ];
                 }
-                const a = this.Te(r.Ae), c = t.gltf, {center: h, coord: u} = c.extensions.CESIUM_RTC, f = this.Nt.options.services[r.te].heightOffset || 0;
+                const a = this.ge(r.Te), c = t.gltf, {center: h, coord: u} = c.extensions.CESIUM_RTC, f = this.Nt.options.services[r.te].heightOffset || 0;
                 f && (u[2] += f);
-                const l = this._e(u, r.te), d = this.Nt.options.services[r.te].shader || "phong", m = [];
+                const l = this.we(u, r.te), d = this.Nt.options.services[r.te].shader || "phong", m = [];
                 let y = 0, b = !0;
                 return Dt(c, (s, i, c, f) => {
-                    let {geometry: p, material: w} = this.Oe(s, i, c, f, r, !1, d);
+                    let {geometry: p, material: w} = this.Ae(s, i, c, f, r, !1, d);
                     w && !w.isReady() && (b = !1, y++);
                     const _ = new n.reshader.Mesh(p, w);
                     _.properties.magic = "b3dm", _.properties.id = e, _.properties.batchTable = t.batchTable, 
                     _.properties.batchTableBin = t.batchTableBin, _.properties.count = t.featureTable.BATCH_LENGTH;
-                    const g = this.ve(s, p, w, r.te);
+                    const g = this.Oe(s, p, w, r.te);
                     _.setDefines(g), o && (g.USE_MAX_EXTENT = 1, _.setUniform("maxPrjExtent", o));
                     let T = n.mat4.identity([]);
                     if (s.matrices && s.matrices.length) for (let t = 0; t < s.matrices.length; t++) n.mat4.multiply(T, T, s.matrices[t]);
-                    const A = this.ge(r, h, u);
+                    const A = this._e(r, h, u);
                     n.mat4.multiply(T, a, T), n.mat4.multiply(T, l, T), n.mat4.multiply(T, A, T), _.setLocalTransform(T), 
                     m.push(_);
                 }), b ? (this.Rt[e] = m, i(null, {
@@ -4239,9 +4239,9 @@
                 })) : (this.Bt[e] = {
                     meshes: m,
                     count: y
-                }, m.Me = i), m;
+                }, m.ve = i), m;
             }
-            ge(t, e, r) {
+            _e(t, e, r) {
                 const i = this.getMap(), o = this.Nt.options.services[t.te].heightOffset || 0, a = new s.Coordinate(r), c = i.distanceToPointAtRes(100, 0, i.getGLRes(), a).x / 100;
                 let h = t.matrix ? n.mat4.copy([], t.matrix) : n.mat4.identity([]);
                 if (e) {
@@ -4279,9 +4279,9 @@
                 }(fn, u);
                 let l = this.Nt.options.offset;
                 if (y(l)) {
-                    l = l(this.Nt.Se(t.id).center);
+                    l = l(this.Nt.Me(t.id).center);
                 }
-                return n.vec3.set(un, l[0], l[1], 0), n.vec3.add(f, f, un), ve(u, f, u), u;
+                return n.vec3.set(un, l[0], l[1], 0), n.vec3.sub(f, f, un), ve(u, f, u), u;
             }
             createCMPTMesh(t, e, r, s) {
                 if (this.kt[e]) {
@@ -4296,13 +4296,13 @@
                 for (let t = 0; t < i.length; t++) {
                     const {magic: n} = i[t], s = e + "." + t;
                     "b3dm" === n ? this.createB3DMMesh(i[t], s, r, (t, {mesh: e}) => {
-                        this.xe(a, e), o.push(e);
+                        this.Se(a, e), o.push(e);
                     }) : "i3dm" === n ? this.createI3DMMesh(i[t], s, r, (t, {mesh: e}) => {
                         a = null, o.push(e);
                     }) : "pnts" === n ? this.createPntsMesh(i[t], s, r, (t, {mesh: e}) => {
-                        this.xe(a, e), o.push(e);
+                        this.Se(a, e), o.push(e);
                     }) : "cmpt" === n && this.createCMPTMesh(i[t], s, r, (t, {mesh: e}) => {
-                        e.boundingBox || (a = null), this.xe(a, e), o.push(e);
+                        e.boundingBox || (a = null), this.Se(a, e), o.push(e);
                     });
                 }
                 return a && (o.boundingBox = [ a.min, a.max ]), this.kt[e] = o, s(null, {
@@ -4310,23 +4310,23 @@
                     mesh: o
                 }), o;
             }
-            xe(t, e) {
+            Se(t, e) {
                 if (!t) return null;
                 if (e.boundingBox) t.combine(e.boundingBox); else for (let n = 0; n < e.length; n++) e[n] && t.combine(e[n].getBoundingBox());
             }
-            ve(t, e, n, r) {
+            Oe(t, e, n, r) {
                 return ("phong" === (this.Nt.options.services[r].shader || "phong") ? this.re : this.se).getGeometryDefines(e);
             }
-            Oe(t, e, n, r, s, i, o) {
+            Ae(t, e, n, r, s, i, o) {
                 const a = r.url + "-" + e + "-" + n;
                 if (this.jt[a]) return this.jt[a].refCount++, this.jt[a];
                 let c, h;
                 const u = r.materials[t.material];
                 if (r.extensions && r.extensions.KHR_techniques_webgl && u.extensions && u.extensions.KHR_techniques_webgl) {
-                    const e = this.Ie(t, r, i);
+                    const e = this.xe(t, r, i);
                     c = e.material, h = e.geometry;
-                } else h = this.Ne(t, i, ln), c = this.Pe(t.material, r, o);
-                c && !c.isReady() ? c.Ee = s.id : c || (c = this.Kt);
+                } else h = this.Ie(t, i, ln), c = this.Ne(t.material, r, o);
+                c && !c.isReady() ? c.Pe = s.id : c || (c = this.Kt);
                 const f = {
                     refCount: 1,
                     geometry: h,
@@ -4334,14 +4334,14 @@
                 };
                 return h.properties.url = a, this.jt[a] = f, f;
             }
-            Ie(t, e, n) {
+            xe(t, e, n) {
                 const {geometry: r, material: s} = this.Zt.createMesh(t, e, n);
                 return {
                     geometry: r,
                     material: s
                 };
             }
-            Ne(t, e, r) {
+            Ie(t, e, r) {
                 const s = t.attributes, i = r.COLOR_0;
                 if (s[i] && s[i] instanceof Float32Array) {
                     const t = new Uint8Array(s[i].length);
@@ -4371,8 +4371,8 @@
                     excludeElementsInVAO: e
                 }), a;
             }
-            _e(t) {
-                const e = n.mat4.identity([]), r = this.getMap(), s = this.Ce();
+            we(t) {
+                const e = n.mat4.identity([]), r = this.getMap(), s = this.Ee();
                 hn.x = t[0], hn.y = t[1];
                 const i = r.distanceToPointAtRes(100, 100, r.getGLRes(), hn);
                 return n.vec3.set(s, i.x / 100 * 1.01, i.y / 100 * 1.01, i.y / 100), n.mat4.scale(e, e, s), 
@@ -4506,7 +4506,7 @@
                     polygonOpacity: 1
                 }), s;
             }
-            Pe(t, e, r) {
+            Ne(t, e, r) {
                 const s = e.materials[t];
                 if (!s || !s.baseColorTexture && !s.pbrMetallicRoughness) return null;
                 let i;
@@ -4553,7 +4553,7 @@
                     format: t.format ? $e(t.format) : "rgba",
                     flipY: !1
                 };
-                if (e && e.baseColorTexture) r.url = this.Ue(t); else {
+                if (e && e.baseColorTexture) r.url = this.Ce(t); else {
                     const e = t.image;
                     r.data = e.array, r.width = e.width, r.height = e.height;
                 }
@@ -4561,31 +4561,31 @@
                 return s && (s.magFilter && (r.mag = ze(s.magFilter)), s.minFilter && (r.min = Ve(s.minFilter)), 
                 s.wrapS && (r.wrapS = Ge(s.wrapS)), s.wrapT && (r.wrapT = Ge(s.wrapT))), new n.reshader.Texture2D(r, this.$t);
             }
-            Ue(t) {
+            Ce(t) {
                 const e = t.image, n = window.URL || window.webkitURL, r = new Blob([ e.array ], {
                     type: e.mimeType
                 });
                 return n.createObjectURL(r);
             }
             Jt({target: t}) {
-                const e = t.Ee, n = this.Bt[e];
+                const e = t.Pe, n = this.Bt[e];
                 if (n.count--, !n.count) {
                     const t = n.meshes;
                     this.Rt[e] = t, delete this.Bt[e];
-                    const r = t.Me;
-                    delete t.Me, r(null, {
+                    const r = t.ve;
+                    delete t.ve, r(null, {
                         mesh: n.meshes,
                         id: e
                     });
                 }
             }
-            Ce() {
+            Ee() {
                 return en;
             }
             ye(t) {
                 return this.Nt.ye(t);
             }
-            we(t, e) {
+            pe(t, e) {
                 const n = this.getMap();
                 return n.getGLZoom ? n.distanceToPoint(t, e, n.getGLZoom()) : n.distanceToPointAtRes(t, e, n.getGLRes());
             }
@@ -4597,7 +4597,7 @@
                 const e = this.getMap();
                 return e.getGLZoom ? e._prjToPoint(t, e.getGLZoom()) : e._prjToPointAtRes(t, e.getGLRes());
             }
-            Te(t) {
+            ge(t) {
                 return "Y" === t ? Ke : "X" === t ? Xe : nn;
             }
         }
@@ -4617,30 +4617,30 @@
                 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;
                 if (!s || !i) return void this.completeRender();
-                const {selectedTiles: o, leaves: a, requests: c} = this.Be(r, s);
-                this.Le(o, a, e), this.Re(), c.length ? this.loadTiles(c) : this.completeRender();
+                const {selectedTiles: o, leaves: a, requests: c} = this.Ue(r, s);
+                this.Be(o, a, e), this.Le(), c.length ? this.loadTiles(c) : this.completeRender();
             }
-            Be(t, e) {
+            Ue(t, e) {
                 let n = [];
-                this.Fe();
+                this.Re();
                 let r = 0;
-                const s = this.De(), i = {};
+                const s = this.Fe(), i = {};
                 let o = !1, a = !1;
                 for (const t in e) {
                     const s = e[t], c = s.node;
                     if (i[c.id]) continue;
                     i[c.id] = 1;
                     let h = !1;
-                    const u = this.ke(c.id);
-                    if (this.je(c.id) ? (r++, h = a = !0, this.tilesLoading[c.id].current = !0) : u ? (this.getTileOpacity(u) < 1 && (h = a = !0), 
+                    const u = this.De(c.id);
+                    if (this.ke(c.id) ? (r++, h = a = !0, this.tilesLoading[c.id].current = !0) : u ? (this.getTileOpacity(u) < 1 && (h = a = !0), 
                     o = !0, s.selected = !0, s.data = u) : this.painter.has(c) || (h = a = !0, n.push(c)), 
                     !h) continue;
-                    if (this.ze(s)) o = !0; else {
-                        this.Ve(s).length && (o = !0);
+                    if (this.je(s)) o = !0; else {
+                        this.ze(s).length && (o = !0);
                     }
                 }
                 let c = [], h = {};
-                if (o && ({selectedTiles: c, leaves: h} = this.Ge(t)), n.length > 1 && (n.sort(bn), 
+                if (o && ({selectedTiles: c, leaves: h} = this.Ve(t)), n.length > 1 && (n.sort(bn), 
                 s)) {
                     const t = s - r;
                     n = t > 0 ? n.slice(0, t) : [];
@@ -4652,14 +4652,14 @@
                     leaves: h
                 };
             }
-            Ge(t) {
+            Ve(t) {
                 const e = [], n = {};
                 let r;
                 const s = [ t ], i = [];
                 for (;s.length > 0 || i.length > 0; ) {
                     if (i.length > 0) {
                         const t = i[i.length - 1];
-                        if (t.He === s.length) {
+                        if (t.Ge === s.length) {
                             i.pop(), t === r && (t.leave = !0, n[t.node.id] = 1), e.push(t);
                             continue;
                         }
@@ -4671,7 +4671,7 @@
                             t.leave = !0, n[t.node.id] = 1, e.push(t);
                             continue;
                         }
-                        i.push(t), t.He = s.length;
+                        i.push(t), t.Ge = s.length;
                     }
                     o.length > 1 && o.sort(yn);
                     for (let t = 0; t < o.length; t++) s.push(o[t]);
@@ -4681,7 +4681,7 @@
                     leaves: n
                 };
             }
-            ze(t) {
+            je(t) {
                 if (!t.parent) return null;
                 let e = t.parent;
                 for (;e && e.level >= 0; ) {
@@ -4692,27 +4692,27 @@
                 }
                 return null;
             }
-            Ve(t) {
+            ze(t) {
                 const e = [];
                 if (!t.node.children || !t.node.children.length) return e;
-                const n = t.$e + 1, r = [ t.node ];
+                const n = t.He + 1, r = [ t.node ];
                 for (;r.length > 0; ) {
                     const s = r.pop().children;
                     for (let i = 0, o = s.length; i < o; i++) {
-                        if (!this.layer.qe(s[i]) && s[i].children && s[i].children.length) {
+                        if (!this.layer.$e(s[i]) && 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.qe(s[i], t);
                             n.selected = !0, n.data = this.tileCache.get(o), t.children.push(n), e.push(n);
-                        } else s[i].$e <= n && r.push(s[i]);
+                        } else s[i].He <= n && r.push(s[i]);
                     }
                 }
                 return e;
             }
-            Le(t, e, n) {
+            Be(t, e, n) {
                 this.tileCache.markAll(!1);
                 for (let e = 0, n = t.length; e < n; e++) {
                     const n = t[e].data;
@@ -4746,7 +4746,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];
@@ -4756,53 +4756,53 @@
                     let s = ft.getArrayBuffer(e + (r || ""), n.ajaxOptions);
                     const i = s.xhr;
                     s = s.then(n => {
-                        delete this.gt[e], n ? this.Ke(e, n.data, t) : this.onTileError(null, t);
+                        delete this.gt[e], n ? this.Je(e, n.data, t) : this.onTileError(null, t);
                     }).catch(n => {
                         delete this.gt[e], this.onTileError(n, t);
                     }), this.gt[e] = i;
-                } else this.Ke(e, null, t);
+                } else this.Je(e, null, t);
             }
-            Ke(t, e, n) {
+            Je(t, e, n) {
                 this.workerConn.loadTile(this.layer.getId(), {
                     url: t,
                     arraybuffer: e,
                     rootIdx: n.te,
-                    upAxis: n.Ae,
+                    upAxis: n.Te,
                     transform: n.matrix
                 }, (e, r) => {
                     if (e) return void this.onTileError(e, n);
                     const {magic: s} = r;
                     "b3dm" === s ? this.painter.createB3DMMesh(r, n.id, n, (t, {mesh: e}) => {
-                        n.Xe = this.Ze(e), this.We(r, n, t, e);
+                        n.Ke = this.Xe(e), this.Ze(r, n, t, e);
                     }) : "pnts" === s ? this.painter.createPntsMesh(r, n.id, n, (t, {mesh: e}) => {
-                        n.Xe = this.Ze(e), this.We(r, n, t, e);
+                        n.Ke = this.Xe(e), this.Ze(r, n, t, e);
                     }) : "i3dm" === s ? this.painter.createI3DMMesh(r, n.id, n, (t, {mesh: e}) => {
-                        this.We(r, n, t, e);
+                        this.Ze(r, n, t, e);
                     }) : "cmpt" === s ? this.painter.createCMPTMesh(r, n.id, n, (t, {mesh: e}) => {
-                        e.boundingBox && (n.Xe = e.boundingBox), this.We(r, n, t, e);
+                        e.boundingBox && (n.Ke = e.boundingBox), this.Ze(r, n, t, e);
                     }) : this.onTilesetLoad(r, n, t);
                 });
             }
-            Ze(t) {
+            Xe(t) {
                 if (1 === t.length) return t[0].getBoundingBox();
                 if (!n.reshader.BoundingBox) return null;
                 const e = new n.reshader.BoundingBox;
                 for (let n = 0; n < t.length; n++) t[n] && e.combine(t[n].getBoundingBox());
                 return [ e.min, e.max ];
             }
-            We(t, e, n, r) {
+            Ze(t, e, n, r) {
                 if (n) this.onTileError(n, e); else {
-                    const n = this.Ye(r);
+                    const n = this.We(r);
                     e.memorySize = n, this.onTileLoad(t, e);
                 }
             }
-            Ye(t) {
+            We(t) {
                 let e = 0;
-                if (Array.isArray(t)) for (let n = 0; n < t.length; n++) t[n] && (e += this.Ye(t[n])); else t && (e += t.getMemorySize());
+                if (Array.isArray(t)) for (let n = 0; n < t.length; n++) t[n] && (e += this.We(t[n])); else t && (e += t.getMemorySize());
                 return e;
             }
             onTileLoad(t, e) {
-                this.layer && (delete this.tilesLoading[e.id], this.Qe(e), this.setToRedraw(), this.layer.fire("tileload", {
+                this.layer && (delete this.tilesLoading[e.id], this.Ye(e), this.setToRedraw(), this.layer.fire("tileload", {
                     node: e
                 }));
             }
@@ -4813,15 +4813,15 @@
                 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.Qe(e), this.setToRedraw(), this.layer.fire("tileerror", {
+                this.Ye(e), this.setToRedraw(), this.layer.fire("tileerror", {
                     node: e,
                     error: t
                 });
             }
-            ke(t) {
+            De(t) {
                 return this.tileCache.get(t);
             }
-            Qe(t) {
+            Ye(t) {
                 const e = {
                     loadTime: s.Util.now(),
                     current: !0,
@@ -4838,7 +4838,7 @@
                 } else this.workerConn.abortTileLoading(this.layer.getId(), e);
                 delete this.gt[e];
             }
-            Fe() {
+            Re() {
                 if (this.tilesLoading) for (const t in this.tilesLoading) this.tilesLoading[t].current = !1;
             }
             deleteTile(t) {
@@ -4853,7 +4853,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.tn(this.canvas, e)), this.regl = this.regl || n.createREGL({
+                this.gl = this.Qe(this.canvas, e)), this.regl = this.regl || n.createREGL({
                     gl: this.gl,
                     attributes: e,
                     extensions: [ "OES_element_index_uint", "WEBGL_compressed_texture_s3tc" ],
@@ -4880,7 +4880,7 @@
                 super.onRemove();
             }
             clear() {
-                this.Re(!0), this.tileCache.reset(), this.tilesLoading = {}, super.clear();
+                this.Le(!0), this.tileCache.reset(), this.tilesLoading = {}, super.clear();
             }
             clearCanvas() {
                 this.regl && this.regl.clear({
@@ -4895,11 +4895,11 @@
             getStencilValue() {
                 return 0;
             }
-            Re(t) {
-                this.en || (this.en = Date.now());
+            Le(t) {
+                this.tn || (this.tn = Date.now());
                 const e = Date.now();
-                if (t || !(e - this.en < this.layer.options.retireInterval)) {
-                    this.en = e;
+                if (t || !(e - this.tn < this.layer.options.retireInterval)) {
+                    this.tn = e;
                     for (const e in this.tilesLoading) {
                         const n = this.tilesLoading[e];
                         !t && n.current || (this.abortTileLoading(n), this.painter.has(n) && this.painter.deleteTile(n), 
@@ -4907,10 +4907,10 @@
                     }
                 }
             }
-            De() {
+            Fe() {
                 return this.getMap().isInteracting() ? this.layer.options.loadingLimitOnInteracting : this.layer.options.loadingLimit;
             }
-            tn(t, e) {
+            Qe(t, e) {
                 const n = [ "webgl", "experimental-webgl" ];
                 let r = null;
                 for (let s = 0; s < n.length; ++s) {
@@ -4921,7 +4921,7 @@
                 }
                 return r;
             }
-            je(t) {
+            ke(t) {
                 return !!this.tilesLoading[t];
             }
             getI3DMMeshes() {
@@ -4938,10 +4938,10 @@
             }
         }
         function yn(t, e) {
-            return 0 === t.node.ce && 0 === e.node.ce ? e.node.nn - t.node.nn : e.node.ce - t.node.ce;
+            return 0 === t.node.ce && 0 === e.node.ce ? e.node.en - t.node.en : e.node.ce - t.node.ce;
         }
         function bn(t, e) {
-            return 0 === t.ce && 0 === e.ce ? t.nn - e.nn : t.ce - e.ce;
+            return 0 === t.ce && 0 === e.ce ? t.en - e.en : t.ce - e.ce;
         }
         function pn(t, e, n) {
             return t[0] = e[n], t[1] = e[n + 3], t[2] = e[n + 6], t;
@@ -4963,11 +4963,11 @@
         const vn = s.projection.EPSG3857, Mn = new s.Extent(0, 0, 0, 0), Sn = [], xn = [], In = new s.Coordinate(0, 0), Nn = n.mat4.identity([]);
         class Pn extends s.Layer {
             constructor(t, e) {
-                super(t, e), this.rn(), this.gt = {}, this.sn = {};
+                super(t, e), this.nn(), this.gt = {}, this.rn = {};
             }
-            rn() {
+            nn() {
                 let t = this.options.services.map(t => t.url);
-                this.in = t.map((t, e) => function(t, e) {
+                this.sn = t.map((t, e) => function(t, e) {
                     t = w(t);
                     return {
                         baseUrl: t.substring(0, t.lastIndexOf("/")) + "/",
@@ -4977,25 +4977,25 @@
                         refine: "replace",
                         matrix: n.mat4.identity([]),
                         te: e,
-                        $e: 0
+                        He: 0
                     };
                 }(t, e)), this.fire("rootready", {
-                    roots: this.in.slice(0)
+                    roots: this.sn.slice(0)
                 });
             }
             getExtent(t) {
                 if (!t && 0 !== t) {
                     const t = new s.Extent;
-                    for (let e = 0; e < this.in.length; e++) if (this.in[e].boundingVolume) {
-                        const n = this.boundingVolumeToExtent(this.in[e]);
+                    for (let e = 0; e < this.sn.length; e++) if (this.sn[e].boundingVolume) {
+                        const n = this.boundingVolumeToExtent(this.sn[e]);
                         t._combine(n);
                     }
                     return t;
                 }
-                return this.in[t] && this.in[t].boundingVolume ? this.boundingVolumeToExtent(this.in[t]) : null;
+                return this.sn[t] && this.sn[t].boundingVolume ? this.boundingVolumeToExtent(this.sn[t]) : null;
             }
             boundingVolumeToExtent(t) {
-                const e = t.boundingVolume.an ? Nn : t.matrix, r = this.getMap();
+                const e = t.boundingVolume.in ? Nn : 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]));
@@ -5013,14 +5013,14 @@
                 return null;
             }
             getRootTiles() {
-                return this.in;
+                return this.sn;
             }
             getTiles() {
-                return this.getRenderer().ready ? this.cn() : (this.hn(), {
+                return this.getRenderer().ready ? this.an() : (this.cn(), {
                     tiles: null
                 });
             }
-            cn() {
+            an() {
                 const t = this.getMap(), e = t.cameraPosition;
                 let r, s;
                 if (t.getGLZoom) s = t.pointToDistance(e[2], 0, t.getGLZoom()), In.set(e[0], e[1]), 
@@ -5028,38 +5028,38 @@
                     const n = t.getGLRes();
                     s = t.pointAtResToDistance(e[2], 0, n), In.set(e[0], e[1]), r = t.pointAtResToCoord(In, n);
                 }
-                this.un = this.un || [], n.vec3.set(this.un, b(r.x), b(r.y), s), this.ln = $t(this.ln || [], this.un[0], this.un[1], this.un[2]), 
-                this.dn = 2 * Math.tan(.5 * b(t.getFov())), this.mn = vn.project(r).toArray();
+                this.hn = this.hn || [], n.vec3.set(this.hn, b(r.x), b(r.y), s), this.un = $t(this.un || [], this.hn[0], this.hn[1], this.hn[2]), 
+                this.ln = 2 * Math.tan(.5 * b(t.getFov())), this.dn = vn.project(r).toArray();
                 const i = t.projViewMatrix, o = {
                     children: [],
                     level: -1
                 };
                 let a = o;
                 const c = {};
-                for (let t = 0; t < this.in.length; t++) {
+                for (let t = 0; t < this.sn.length; t++) {
                     let e = 1 / 0;
-                    const n = [ this.in[t] ], r = this.yn(t);
+                    const n = [ this.sn[t] ], r = this.mn(t);
                     for (;n.length > 0; ) {
                         const t = n.pop();
-                        for (this.bn(t); a.level >= t.$e; ) a = a.parent;
-                        const s = this.pn(t, r, i);
+                        for (this.yn(t); a.level >= t.He; ) a = a.parent;
+                        const s = this.bn(t, r, i);
                         if (s < 1) {
                             let n = a;
                             for (;n && !n.content; ) n = n.parent;
-                            n && n.content && (t.wn = n, this._n(c, n));
+                            n && n.content && (t.pn = n, this.wn(c, n));
                             if (!1 === this.options.services[t.te].alwaysShow) continue;
-                            if (!(0 === s && t.$e <= e)) continue;
-                            t.content && (e = t.$e);
+                            if (!(0 === s && t.He <= e)) continue;
+                            t.content && (e = t.He);
                         }
-                        t.ce < 1 / 0 && this.gn(t);
-                        const o = this.Je(t, a);
+                        t.ce < 1 / 0 && this._n(t);
+                        const o = this.qe(t, a);
                         a.children.push(o);
                         const h = t.children, u = h && h.length, f = o.content;
-                        if (!u && f && this._n(c, o), u) {
-                            f && "add" === t.refine && this._n(c, o), a = o;
+                        if (!u && f && this.wn(c, o), u) {
+                            f && "add" === t.refine && this.wn(c, o), a = o;
                             for (let e = 0, r = h.length; e < r; e++) {
                                 if (!h[e].parent) {
-                                    h[e].parent = t, h[e].Ae = t.Ae, h[e].baseUrl = t.baseUrl;
+                                    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));
                                 }
@@ -5073,7 +5073,7 @@
                     tiles: c
                 };
             }
-            _n(t, e) {
+            wn(t, e) {
                 e.node.viewerRequestVolume && !function(t, e, n) {
                     if (n.region) {
                         const e = n.region;
@@ -5088,89 +5088,89 @@
        * @maptalks/gl v0.64.0
        * LICENSE : UNLICENSED
        * (c) 2016-2022 maptalks.com
-       */ (this.un, this.ln, e.node.viewerRequestVolume) || (t[e.node.id] = e);
+       */ (this.hn, this.un, e.node.viewerRequestVolume) || (t[e.node.id] = e);
             }
-            Je(t, e) {
+            qe(t, e) {
                 return {
                     id: t.id,
                     node: t,
                     children: [],
-                    level: t.$e,
+                    level: t.He,
                     parent: e,
-                    content: this.qe(t)
+                    content: this.$e(t)
                 };
             }
-            bn(t) {
+            yn(t) {
                 void 0 === t.id && (t.id = s.Util.GUID(), t.matrix = t.transform || n.mat4.identity([]), 
-                t.Tn = this.An(t), t.parent && (t.matrix = n.mat4.multiply(t.matrix, t.parent.matrix, t.matrix), 
-                t.te = t.parent.te, void 0 === t.$e && (t.$e = t.parent.$e + 1), t.maxExtent = t.parent.maxExtent), 
+                t.gn = this.Tn(t), t.parent && (t.matrix = n.mat4.multiply(t.matrix, t.parent.matrix, t.matrix), 
+                t.te = t.parent.te, void 0 === t.He && (t.He = t.parent.He + 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.On(t));
+                this.An(t));
             }
-            On(t) {
+            An(t) {
                 const e = this.options.services[t.te].heightOffset || 0, r = this.options.offset, s = y(r) || r[0] || r[1];
                 if (!t.boundingVolume || !e && n.mat4.exactEquals(t.matrix, Nn) && !s) return;
                 const i = t.boundingVolume, {region: o, box: a, sphere: c} = i;
                 if (o) {
-                    const t = this.vn([ p(o[0]), p(o[1]) ]);
+                    const t = this.On([ p(o[0]), p(o[1]) ]);
                     o[0] = b(t.x), o[1] = b(t.y);
-                    const n = this.vn([ p(o[2]), p(o[3]) ]);
+                    const n = this.On([ p(o[2]), p(o[3]) ]);
                     o[2] = b(n.x), o[3] = b(n.y), o[4] += e, o[5] += e;
                 } else if (a || c) {
-                    const r = a || c, s = n.vec3.transformMat4(Sn, r, t.matrix), i = Wt(xn, s), o = this.vn([ i[0], i[1] ]);
+                    const r = a || c, s = n.vec3.transformMat4(Sn, r, t.matrix), i = Wt(xn, s), o = this.On([ i[0], i[1] ]);
                     i[0] = o.x, i[1] = o.y, i[2] += e, $t(r, b(i[0]), b(i[1]), i[2]);
                 }
-                i.an = !0;
+                i.in = !0;
             }
-            An(t) {
+            Tn(t) {
                 return void 0 === t.geometricError || !t.boundingVolume;
             }
-            qe(t) {
+            $e(t) {
                 return t.content && t.content.url;
             }
-            gn(t) {
+            _n(t) {
                 let e = t.parent;
-                for (;e && e.Tn && !(e.ce <= t.ce && e.nn <= t.nn); ) e.ce = t.ce, e.nn = t.nn, 
+                for (;e && e.gn && !(e.ce <= t.ce && e.en <= t.en); ) e.ce = t.ce, e.en = t.en, 
                 e = t.parent;
             }
             onTilesetLoad(t, e, r) {
                 if (!t) return void console.warn("invalid tileset at : " + r);
-                const s = (t.asset && t.asset.gltfUpAxis || e && e.Ae || this.options.services[e.te].upAxis || "Y").toUpperCase();
-                if (t.root.baseUrl = r.substring(0, r.lastIndexOf("/") + 1), t.root.Ae = s, e) {
+                const s = (t.asset && t.asset.gltfUpAxis || e && e.Te || this.options.services[e.te].upAxis || "Y").toUpperCase();
+                if (t.root.baseUrl = r.substring(0, r.lastIndexOf("/") + 1), t.root.Te = s, e) {
                     const r = e.boundingVolume;
                     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.On(e), e.children && e.children.length && (e.Mn = e.content, delete e.content, 
-                    t.root.content && (e.content = t.root.content)), e.Tn = this.An(e);
+                    this.An(e), e.children && e.children.length && (e.vn = e.content, delete e.content, 
+                    t.root.content && (e.content = t.root.content)), e.gn = this.Tn(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.hn(), this.fire("loadtileset", {
+                this.cn(), this.fire("loadtileset", {
                     tileset: t,
                     index: e.te,
                     url: r
                 });
             }
-            pn(t, e, n) {
-                if (t.ce = 1 / 0, 0 === t.$e || t.Tn) return 1;
-                if (t.Sn = 1 / 0, !this.xn(t, e, n)) return -1;
+            bn(t, e, n) {
+                if (t.ce = 1 / 0, 0 === t.He || t.gn) return 1;
+                if (t.Mn = 1 / 0, !this.Sn(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.In(t);
-                return 0 === s && t.parent && (s = .5 * (t.parent.Sn || 0)), s >= r ? 1 : 0;
+                let s = this.xn(t);
+                return 0 === s && t.parent && (s = .5 * (t.parent.Mn || 0)), s >= r ? 1 : 0;
             }
             ye(t) {
                 const e = this.getMap();
                 return e.getGLZoom ? e.coordToPoint(t, e.getGLZoom()) : e.coordToPointAtRes(t, e.getGLRes());
             }
-            xn(t, e, r) {
+            Sn(t, e, r) {
                 const o = this.getMap();
                 if (!o) return !1;
-                if (t.Xe) return c(r, t.Xe);
+                if (t.Ke) return c(r, t.Ke);
                 const a = t.id;
-                let f = this.sn[a];
+                let f = this.rn[a];
                 if (!t.boundingVolume) return !1;
                 if (!f && t.boundingVolume && !f) {
                     let e, r, i;
@@ -5179,18 +5179,18 @@
                         const n = t.boundingVolume.region;
                         e = new s.Extent(p(n[0]), p(n[1]), p(n[2]), p(n[3]));
                         const o = e.getCenter();
-                        e = e.convertTo(t => this.ye(t)), i = n[4], r = n[5], f = this.sn[a] = [ [ e.xmin, e.ymin, i * c ], [ e.xmax, e.ymax, r * c ] ], 
+                        e = e.convertTo(t => this.ye(t)), i = n[4], r = n[5], f = this.rn[a] = [ [ e.xmin, e.ymin, i * c ], [ e.xmax, e.ymax, r * c ] ], 
                         f.center = o;
                     } else if (t.boundingVolume.sphere) {
                         const e = t.boundingVolume.sphere, n = Wt([], e), r = this.ye(new s.Coordinate(n)).toArray();
-                        r.push(n[2] * c), f = this.sn[a] = [ r, e[3] * c ], f.center = new s.Coordinate(n);
+                        r.push(n[2] * c), f = this.rn[a] = [ r, e[3] * c ], f.center = new s.Coordinate(n);
                     } else if (t.boundingVolume.box) {
                         const e = t.boundingVolume.box, r = Wt([], e), i = this.ye(new s.Coordinate(r)).toArray();
                         i.push(r[2] * c);
                         const o = e.slice(3);
                         n.mat4.exactEquals(t.matrix, Nn) || n.mat3.multiply(o, n.mat3.fromMat4([], t.matrix), o);
                         for (let t = 0; t < o.length; t++) o[t] *= c, e[3 + t] = o[t];
-                        f = this.sn[a] = [ ...i, ...o ], f.center = new s.Coordinate(r);
+                        f = this.rn[a] = [ ...i, ...o ], f.center = new s.Coordinate(r);
                     }
                 }
                 if (e) {
@@ -5218,62 +5218,62 @@
                     return !0;
                 }(r, f);
             }
-            vn(t) {
+            On(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]) {
                     const n = this.getMap(), r = n.getGLRes(), s = n.coordToPointAtRes(t, r);
-                    return s._add(e), n.pointAtResToCoord(s, r);
+                    return s._sub(e), n.pointAtResToCoord(s, r);
                 }
                 return t;
             }
-            yn(t) {
+            mn(t) {
                 const e = this.options.services[t].maxExtent;
                 if (!e) return null;
-                const n = this.in[t];
+                const n = this.sn[t];
                 return n.maxExtent || (n.maxExtent = new s.Extent(e).convertTo(t => this.ye(t))), 
                 n.maxExtent;
             }
-            In(t) {
-                const e = this.dn, r = t.geometricError;
+            xn(t) {
+                const e = this.ln, r = t.geometricError;
                 if (0 === r) return 0;
                 const s = this.getMap();
                 let i, o;
                 if (t.boundingVolume.region) {
-                    const e = this.sn[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.rn[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.Nn;
-                        i || (i = t.Nn = [ Ln(s[0], s[1]), Ln(s[0], s[3]), Ln(s[2], s[1]), Ln(s[2], s[3]), Ln(s[0], s[1]), Ln(s[0], s[3]), Ln(s[2], s[1]), Ln(s[2], s[3]) ], 
-                        t.Pn = [ 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.In;
+                        i || (i = t.In = [ Ln(s[0], s[1]), Ln(s[0], s[3]), Ln(s[2], s[1]), Ln(s[2], s[3]), Ln(s[0], s[1]), Ln(s[0], s[3]), Ln(s[2], s[1]), Ln(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.Pn = [ 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.Pn, c = t.En, h = e, u = Math.max(a[0] - h[0], 0, h[0] - c[0]), 
+                        const o = (a = t.Nn, c = t.Pn, 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.mn, this.un, r), o = function(t, e) {
+                    }(t, this.dn, this.hn, r), o = function(t, e) {
                         const r = t.boundingVolume.region, s = $t(Un, r[0], r[1], r[4]), i = $t(Bn, 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.ln);
-                } else t.boundingVolume.sphere ? (i = En(t.boundingVolume, this.ln), o = function(t, e) {
+                    }(t, this.un);
+                } else t.boundingVolume.sphere ? (i = En(t.boundingVolume, this.un), o = function(t, e) {
                     const r = t.boundingVolume.sphere;
                     return n.vec3.dist(r, e);
-                }(t, this.ln)) : t.boundingVolume.box && (i = Cn(t.boundingVolume, this.ln), o = function(t, e) {
+                }(t, this.un)) : t.boundingVolume.box && (i = Cn(t.boundingVolume, this.un), o = function(t, e) {
                     const r = t.boundingVolume.box;
                     return n.vec3.dist(r, e);
-                }(t, this.ln));
+                }(t, this.un));
                 const a = Math.max(Math.abs(i), 1e-7), c = r * s.height / (a * e);
-                return t.ce = i, t.nn = o, t.Sn = c, c;
+                return t.ce = i, t.en = o, t.Mn = c, c;
             }
-            hn() {
+            cn() {
                 const t = this.getRenderer();
                 t && t.setToRedraw();
             }
-            Se(t) {
-                return this.sn[t];
+            Me(t) {
+                return this.rn[t];
             }
         }
         function En(t, e) {
@@ -5903,5 +5903,5 @@
         t.Geo3DTransform = re, Object.defineProperty(t, "t", {
             value: !0
         });
-    })), i.Map.VERSION, o.GroupGLLayer.VERSION, "undefined" != typeof console && console.log("@maptalks/3dtiles v0.11.0");
+    })), i.Map.VERSION, o.GroupGLLayer.VERSION, "undefined" != typeof console && console.log("@maptalks/3dtiles v0.11.1");
 }));

package/package.json

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