@maptalks/3dtiles 0.10.0 → 0.10.1

package/dist/maptalks.3dtiles.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/3dtiles v0.10.0
+ * @maptalks/3dtiles v0.10.1
  * LICENSE : UNLICENSED
  * (c) 2016-2021 maptalks.com
  */
@@ -127,10 +127,10 @@
         function v(t) {
             return null == t;
         }
-        function M(t) {
+        function O(t) {
             return !v(t);
         }
-        function O(t) {
+        function M(t) {
             for (let e = 1; e < arguments.length; e++) {
                 const n = arguments[e];
                 for (const e in n) t[e] = n[e];
@@ -172,10 +172,10 @@
             for (let t = 0; t < n; t++) r[t] = e.charCodeAt(t);
             return r.buffer;
         }
-        const N = [], P = [], U = [], C = [ 0, 0, 0 ], L = function(t) {
+        const N = [], E = [], P = [], U = [ 0, 0, 0 ], L = function(t) {
             return t[0] = 0, t[1] = 0, t[2] = 0, t[3] = 1, t;
         }([]), B = [ 1, 1, 1 ];
-        function E(t, e, n, r, s, i, o) {
+        function C(t, e, n, r, s, i, o) {
             const a = S(o);
             if ((0 === s || s === r * a.BYTES_PER_ELEMENT) && i % a.BYTES_PER_ELEMENT == 0) {
                 const s = new a(e, i, n * r);
@@ -302,7 +302,7 @@
                 l.byteOffset = a + (i.byteOffset || 0), i.interleaved && "indices" !== t && "input" !== t && "output" !== t && t.indexOf("morph") < 0 ? l.array = new Uint8Array(n, a, o.byteLength) : l.array = this.p(n, i.count, c, a + (i.byteOffset || 0), u); else if (l.byteStride = 0, 
                 l.byteOffset = 0, i.interleaved) {
                     const t = new u(i.count * c);
-                    l.array = E(t, n, i.count, c, h, a + (i.byteOffset || 0), i.componentType);
+                    l.array = C(t, n, i.count, c, h, a + (i.byteOffset || 0), i.componentType);
                 } else l.array = this.p(n, i.count, c, a + (i.byteOffset || 0), u); else {
                     l.array = new u(i.count);
                     const t = l.min || l.max;
@@ -340,10 +340,10 @@
             }
             createNode(t) {
                 const e = {};
-                if (M(t.name) && (e.name = t.name), M(t.children) && (e.children = t.children), 
-                M(t.jointName) && (e.jointName = t.jointName), M(t.matrix) && (e.matrix = t.matrix), 
-                M(t.rotation) && (e.rotation = t.rotation), M(t.scale) && (e.scale = t.scale), M(t.translation) && (e.translation = t.translation), 
-                M(t.extras) && (e.extras = t.extras), M(t.meshes) && (e.mesh = t.meshes[0]), e.translation || e.rotation || e.scale) {
+                if (O(t.name) && (e.name = t.name), O(t.children) && (e.children = t.children), 
+                O(t.jointName) && (e.jointName = t.jointName), O(t.matrix) && (e.matrix = t.matrix), 
+                O(t.rotation) && (e.rotation = t.rotation), O(t.scale) && (e.scale = t.scale), O(t.translation) && (e.translation = t.translation), 
+                O(t.extras) && (e.extras = t.extras), O(t.meshes) && (e.mesh = t.meshes[0]), e.translation || e.rotation || e.scale) {
                     const t = function(t, e) {
                         if (e.matrix) return e.matrix;
                         if (e.translation || e.scale || e.rotation) {
@@ -351,16 +351,16 @@
                                 return t[0] = 1, t[1] = 0, t[2] = 0, t[3] = 0, t[4] = 0, t[5] = 1, t[6] = 0, t[7] = 0, 
                                 t[8] = 0, t[9] = 0, t[10] = 1, t[11] = 0, t[12] = e[0], t[13] = e[1], t[14] = e[2], 
                                 t[15] = 1, t;
-                            }(N, e.translation || C), s = function(t, e) {
+                            }(N, e.translation || U), s = function(t, e) {
                                 var n = e[0], r = e[1], s = e[2], i = e[3], o = n + n, a = r + r, c = s + s, u = n * o, h = r * o, l = r * a, f = s * o, d = s * a, m = s * c, y = i * o, b = i * a, p = i * c;
                                 return t[0] = 1 - l - m, t[1] = h + p, t[2] = f - b, t[3] = 0, t[4] = h - p, t[5] = 1 - u - m, 
                                 t[6] = d + y, t[7] = 0, t[8] = f + b, t[9] = d - y, t[10] = 1 - u - l, t[11] = 0, 
                                 t[12] = 0, t[13] = 0, t[14] = 0, t[15] = 1, t;
-                            }(P, e.rotation || L), i = function(t, e) {
+                            }(E, e.rotation || L), i = function(t, e) {
                                 return t[0] = e[0], t[1] = 0, t[2] = 0, t[3] = 0, t[4] = 0, t[5] = e[1], t[6] = 0, 
                                 t[7] = 0, t[8] = 0, t[9] = 0, t[10] = e[2], t[11] = 0, t[12] = 0, t[13] = 0, t[14] = 0, 
                                 t[15] = 1, t;
-                            }(U, e.scale || B);
+                            }(P, e.scale || B);
                             return r(i, s, i), r(t, n, i);
                         }
                         return n(t);
@@ -460,7 +460,7 @@
             }
             createNode(t) {
                 const e = {};
-                return O(e, t), !M(t.weights) && this.gltf.meshes && M(e.mesh) ? e.weights = this.gltf.meshes[e.mesh].weights : t.weights && (e.weights = t.weights), 
+                return M(e, t), !O(t.weights) && this.gltf.meshes && O(e.mesh) ? e.weights = this.gltf.meshes[e.mesh].weights : t.weights && (e.weights = t.weights), 
                 e;
             }
             T(t) {
@@ -481,19 +481,19 @@
                             extras: n.extras
                         }
                     };
-                    O(r, e);
-                    const s = M(e.sampler) ? this.gltf.samplers[e.sampler] : void 0;
+                    M(r, e);
+                    const s = O(e.sampler) ? this.gltf.samplers[e.sampler] : void 0;
                     return s && (r.sampler = s), t.format && (r.format = t.format), r;
                 });
             }
             _(t) {
-                if (!M(t.bufferView)) return this.v(t);
+                if (!O(t.bufferView)) return this.v(t);
                 {
                     const e = this.gltf.bufferViews[t.bufferView];
                     if (this.images[t.id]) return Promise.resolve(this.images[t.id]);
                     const n = this.gltf.buffers[e.buffer];
-                    if (n.uri) return this.M(n, e, t);
-                    if (this.glbBuffer) return this.O(e, t);
+                    if (n.uri) return this.O(n, e, t);
+                    if (this.glbBuffer) return this.M(e, t);
                 }
                 return null;
             }
@@ -513,7 +513,7 @@
                     return this.S(e.id, r);
                 }
             }
-            M(t, e, n) {
+            O(t, e, n) {
                 if (this.buffers[t.id]) {
                     const r = this.buffers[t.id], s = this.N(e, r);
                     return this.I(s, n);
@@ -531,7 +531,7 @@
                     return this.I(i, n);
                 });
             }
-            O(t, e) {
+            M(t, e) {
                 const n = this.N(t, this.glbBuffer.buffer, this.glbBuffer.byteOffset);
                 return this.I(n, e);
             }
@@ -565,7 +565,7 @@
             }
             getSamplers(t) {
                 const e = [];
-                for (let n = 0; n < t.length; n++) (M(t[n].input) || M(t[n].output)) && (e.push(this.accessor.u("input", t[n].input)), 
+                for (let n = 0; n < t.length; n++) (O(t[n].input) || O(t[n].output)) && (e.push(this.accessor.u("input", t[n].input)), 
                 e.push(this.accessor.u("output", t[n].output)));
                 return Promise.all(e).then(e => {
                     for (let n = 0; n < e.length / 2; n++) t[n].input = e[2 * n], t[n].output = e[2 * n + 1], 
@@ -656,26 +656,26 @@
             INTERPOLATION: null
         }, X = {
             U(t, e, n, r, s, i, o, a) {
-                const u = M(t) ? e.animations : [ e.animations[0] ], h = {};
+                const u = O(t) ? e.animations : [ e.animations[0] ], h = {};
                 for (let e = 0; e < u.length; e++) {
                     const l = u[e];
-                    if (M(t) && l.name !== t) continue;
+                    if (O(t) && l.name !== t) continue;
                     const f = l.channelsMap[n];
                     if (f) for (let t = 0; t < f.length; t++) {
                         const e = f[t];
-                        "translation" === e.target.path ? (this.C(s, l.samplers[e.sampler], r, 1), h.translation = c($, s)) : "rotation" === e.target.path ? (this.L(i, l.samplers[e.sampler], r, 1), 
-                        h.rotation = T(q, i)) : "scale" === e.target.path ? (this.C(o, l.samplers[e.sampler], r, 1), 
-                        h.scale = c(J, o)) : "weights" === e.target.path && a && (this.C(a, l.samplers[e.sampler], r, a.length), 
+                        "translation" === e.target.path ? (this.L(s, l.samplers[e.sampler], r, 1), h.translation = c($, s)) : "rotation" === e.target.path ? (this.B(i, l.samplers[e.sampler], r, 1), 
+                        h.rotation = T(q, i)) : "scale" === e.target.path ? (this.L(o, l.samplers[e.sampler], r, 1), 
+                        h.scale = c(J, o)) : "weights" === e.target.path && a && (this.L(a, l.samplers[e.sampler], r, a.length), 
                         h.weights = a);
                     }
                 }
                 return h;
             },
-            C(t, e, n, r) {
+            L(t, e, n, r) {
                 switch (e.interpolation) {
                   case "LINEAR":
                     {
-                        const s = this.B(Z, e, n, 1 * r);
+                        const s = this.C(Z, 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;
@@ -685,7 +685,7 @@
 
                   case "STEP":
                     {
-                        const s = this.B(Z, e, n, 1 * r);
+                        const s = this.C(Z, e, n, 1 * r);
                         s && (t = function(t, e) {
                             for (let n = 0; n < t.length; n++) t[n] = e[n];
                             return t;
@@ -695,32 +695,32 @@
 
                   case "CUBICSPLINE":
                     {
-                        const s = this.B(Z, e, n, 3 * r);
+                        const s = this.C(Z, e, n, 3 * r);
                         s && (t = this.R(t, s, e.input.array, 3 * r));
                         break;
                     }
                 }
                 return t;
             },
-            L(t, e, n) {
+            B(t, e, n) {
                 switch (e.interpolation) {
                   case "LINEAR":
                     {
-                        const r = this.B(Z, e, n, 1);
+                        const r = this.C(Z, e, n, 1);
                         r && g(t, r.PREVIOUS, r.NEXT, r.INTERPOLATION);
                         break;
                     }
 
                   case "STEP":
                     {
-                        const r = this.B(Z, e, n, 1);
+                        const r = this.C(Z, e, n, 1);
                         r && (t = p(t, ...r.PREVIOUS));
                         break;
                     }
 
                   case "CUBICSPLINE":
                     {
-                        const r = this.B(Z, e, n, 3);
+                        const r = this.C(Z, 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]);
@@ -749,7 +749,7 @@
                 }
                 return null;
             },
-            B(t, e, n, r) {
+            C(t, e, n, r) {
                 const s = e.input.array, i = e.output.array, o = e.output.itemSize;
                 (n < s[0] || n > s[s.length - 1]) && (n = Math.max(s[0], Math.min(s[s.length - 1], n))), 
                 n === s[s.length - 1] && (n = s[0]);
@@ -793,7 +793,7 @@
             },
             getTimeSpanByName(t, e) {
                 const n = this.getTimeSpan(t);
-                return n ? M(e) ? n[e] : n[Object.keys(n)[0]] : null;
+                return n ? O(e) ? n[e] : n[Object.keys(n)[0]] : null;
             }
         }, Y = "undefined" == typeof document ? null : document.createElement("canvas");
         class Q {
@@ -854,7 +854,7 @@
                 return S(t);
             }
             static readInterleavedArray(t, e, n, r, s, i, o) {
-                return E(t, e, n, r, s, i, o);
+                return C(t, e, n, r, s, i, o);
             }
             D(t, e, n) {
                 this.gltf = e, this.glbBuffer = n, this.version = e.asset ? +e.asset.version : 1, 
@@ -936,7 +936,7 @@
             }
             V() {
                 const t = this.gltf.animations;
-                return M(t) ? this.adapter.getAnimations(t) : null;
+                return O(t) ? this.adapter.getAnimations(t) : null;
             }
             q(t) {
                 this.meshes = {};
@@ -951,7 +951,7 @@
                 const n = t.primitives.map(t => this.X(t, e)).filter(t => !!t);
                 return Promise.all(n).then(e => {
                     const n = {};
-                    return O(n, t), n.primitives = e, n;
+                    return M(n, t), n.primitives = e, n;
                 });
             }
             G() {
@@ -998,11 +998,11 @@
                         const n = this.adapter.accessor.u(t, r[t]);
                         n && e.push(n);
                     }
-                    if (M(t.indices)) {
+                    if (O(t.indices)) {
                         const n = this.adapter.accessor.u("indices", t.indices);
                         n && e.push(n);
                     }
-                    if (M(t.targets)) for (let n = 0; n < t.targets.length; n++) {
+                    if (O(t.targets)) for (let n = 0; n < t.targets.length; n++) {
                         const r = t.targets[n];
                         for (const t in r) {
                             const s = this.adapter.accessor.u(`morphTargets_${t}_${n}`, r[t]);
@@ -1019,8 +1019,8 @@
                         t), {}),
                         material: t.material
                     };
-                    return n && (s.indices = n), r && (s.morphTargets = r), s.mode = M(t.mode) ? t.mode : 4, 
-                    M(t.extras) && (s.extras = t.extras), s;
+                    return n && (s.indices = n), r && (s.morphTargets = r), s.mode = O(t.mode) ? t.mode : 4, 
+                    O(t.extras) && (s.extras = t.extras), s;
                 });
             }
         }
@@ -1184,7 +1184,7 @@
             };
         }
         /*!
-     * @maptalks/gl v0.61.0
+     * @maptalks/gl v0.62.1
      * LICENSE : UNLICENSED
      * (c) 2016-2021 maptalks.com
      */        const yt = function() {
@@ -1562,7 +1562,7 @@
                                 array: t
                             }, o.push(t.buffer);
                         } else if (a.BATCH_ID || Object.keys(u).length) {
-                            a.BATCH_ID ? r.BATCH_ID = ut(a.BATCH_ID, t, c.offset, d) : r.BATCH_ID = Mt(d);
+                            a.BATCH_ID ? r.BATCH_ID = ut(a.BATCH_ID, t, c.offset, d) : r.BATCH_ID = Ot(d);
                             const e = r.BATCH_ID.array && r.BATCH_ID.array.buffer;
                             e && o.indexOf(e) < 0 && o.push(e);
                         }
@@ -1578,7 +1578,7 @@
                 }
                 const b = this.lt(t, a, c.offset, d, o, l, f);
                 if (a.BATCH_ID || Object.keys(u).length) {
-                    a.BATCH_ID ? b.BATCH_ID = ut(a.BATCH_ID, t, c.offset, d) : b.BATCH_ID = Mt(d);
+                    a.BATCH_ID ? b.BATCH_ID = ut(a.BATCH_ID, t, c.offset, d) : b.BATCH_ID = Ot(d);
                     const e = b.BATCH_ID.array && b.BATCH_ID.array.buffer;
                     e && o.indexOf(e) < 0 && o.push(e);
                 }
@@ -1713,7 +1713,7 @@
                 return null;
             }
         }
-        function Mt(t) {
+        function Ot(t) {
             const e = (n = t) < 256 ? Uint8Array : n < 65536 ? Uint16Array : Uint32Array;
             var n;
             const r = new e(t);
@@ -1727,7 +1727,7 @@
                 array: r
             };
         }
-        class Ot {
+        class Mt {
             constructor(t, e) {
                 this.A = t, this.W = e || Q;
             }
@@ -1747,7 +1747,7 @@
                             console.warn("Unsupported magic in CMPT tile:", s[n].magic);
                             continue;
                         }
-                        r = new Ot(this.A, this.W);
+                        r = new Mt(this.A, this.W);
                     }
                     i.push(r.load(t, e, s[n].offset, s[n].byteLength).then(t => t));
                 }
@@ -1786,23 +1786,23 @@
             }
         }
         new Array(3), new Array(3);
-        const St = [ 1 / 6378137, 1 / 6378137, 1 / 6356752.314245179 ], xt = [ 1 / 40680631590769, 1 / 40680631590769, 1 / 40408299984661.445 ], It = new Array(3), Nt = new Array(3), Pt = new Array(3);
-        function Ut(t, e) {
+        const St = [ 1 / 6378137, 1 / 6378137, 1 / 6356752.314245179 ], xt = [ 1 / 40680631590769, 1 / 40680631590769, 1 / 40408299984661.445 ], It = new Array(3), Nt = new Array(3), Et = new Array(3);
+        function Pt(t, e) {
             const n = xt, r = function(t, e, n, r, s) {
                 const i = e[0], o = e[1], a = e[2], c = n[0], u = n[1], h = n[2], l = i * i * c * c, f = o * o * u * u, d = a * a * h * h, m = l + f + d, y = Math.sqrt(1 / m), b = function(t, e, n) {
                     return t[0] = e[0] * n, t[1] = e[1] * n, t[2] = e[2] * n, t;
-                }(Ct, e, y);
+                }(Ut, e, y);
                 if (m < s) return isFinite(y) ? b : void 0;
                 const p = r[0], w = r[1], g = r[2], _ = Lt;
                 _[0] = b[0] * p * 2, _[1] = b[1] * w * 2, _[2] = b[2] * g * 2;
-                let T, A, v, M, O, S, x, I, N, P, U, C = (1 - y) * Bt(e) / (.5 * Bt(_)), L = 0;
+                let T, A, v, O, M, S, x, I, N, E, P, U = (1 - y) * Bt(e) / (.5 * Bt(_)), L = 0;
                 do {
-                    C -= L, v = 1 / (1 + C * p), M = 1 / (1 + C * w), O = 1 / (1 + C * g), S = v * v, 
-                    x = M * M, I = O * O, N = S * v, P = x * M, U = I * O, T = l * S + f * x + d * I - 1, 
-                    A = l * N * p + f * P * w + d * U * g;
+                    U -= L, v = 1 / (1 + U * p), O = 1 / (1 + U * w), M = 1 / (1 + U * g), S = v * v, 
+                    x = O * O, I = M * M, N = S * v, E = x * O, P = I * M, T = l * S + f * x + d * I - 1, 
+                    A = l * N * p + f * E * w + d * P * g;
                     L = T / (-2 * A);
                 } while (Math.abs(T) > 1e-12);
-                return t[0] = i * v, t[1] = o * M, t[2] = a * O, t;
+                return t[0] = i * v, t[1] = o * O, t[2] = a * M, t;
             }(It, e, St, n, .1);
             let s = y(Nt, r, n);
             s = function(t, e) {
@@ -1811,21 +1811,21 @@
                 i > 0 && (i = Math.sqrt(i), t[0] = e[0] / i, t[1] = e[1] / i, t[2] = e[2] / i);
                 return t;
             }(s, s);
-            const i = m(Pt, e, r), o = Math.atan2(s[1], s[0]), a = Math.asin(s[2]), c = function(t) {
+            const i = m(Et, e, r), o = Math.atan2(s[1], s[0]), a = Math.asin(s[2]), c = function(t) {
                 return Math.sign ? Math.sign(t) : 0 === (t = +t) || isNaN(t) ? Number(t) : t > 0 ? 1 : -1;
             }(f(i, e)) * Bt(i);
             return t[0] = tt(o), t[1] = tt(a), t[2] = c, t;
         }
-        const Ct = new Array(3), Lt = new Array(3);
+        const Ut = new Array(3), Lt = new Array(3);
         function Bt(t) {
             return o(t);
         }
-        const Et = Math.PI / 180, Rt = 6378137 * Math.PI / 180;
+        const Ct = Math.PI / 180, Rt = 6378137 * Math.PI / 180;
         function Ft(t, e, n) {
             if ("EPSG:3857" === n) return function(t, e) {
                 const n = 85.0511287798, r = e[0], s = Math.max(Math.min(n, e[1]), -n);
                 let i;
-                i = 0 === s ? 0 : Math.log(Math.tan((90 + s) * Et / 2)) / Et;
+                i = 0 === s ? 0 : Math.log(Math.tan((90 + s) * Ct / 2)) / Ct;
                 return t[0] = r * Rt, t[1] = i * Rt, t;
             }(t, e);
             if ("EPSG:4326" === n || "EPSG:4490" === n || "identity" === n) return Dt(t, e);
@@ -1971,7 +1971,7 @@
                             e(null, r, i);
                         });
                     } else if ("cmpt" === s) {
-                        new Ot(this.dt, Q).load(n, r).then(n => {
+                        new Mt(this.dt, Q).load(n, r).then(n => {
                             const {content: r, transferables: s} = this.At(n, t);
                             e(null, r, s);
                         }).catch(t => {
@@ -2038,7 +2038,7 @@
                 e && d(u, u, e);
                 a = {
                     center: u,
-                    projCenter: this.Mt(u)
+                    projCenter: this.Ot(u)
                 }, this.projVertices({
                     array: i.POSITION.array,
                     itemSize: 3
@@ -2093,23 +2093,23 @@
                 });
                 const c = ie(a);
                 i && d(c, c, i);
-                const u = this.Mt(c);
+                const u = this.Ot(c);
                 t.extensions.MAPTALKS_RTC = {
                     center: c,
                     projCenter: u
                 }, $t(t, e => {
-                    e.attributes && e.attributes.POSITION && (e.attributes.NORMAL && this.Ot(e.attributes.NORMAL, e.matrices, s), 
-                    e.attributes.TANGENT && this.Ot(e.attributes.TANGENT, e.matrices, s), this.projVertices(e.attributes.POSITION, e.matrices, o, t.extensions.MAPTALKS_RTC, s, i));
+                    e.attributes && e.attributes.POSITION && (e.attributes.NORMAL && this.Mt(e.attributes.NORMAL, e.matrices, s), 
+                    e.attributes.TANGENT && this.Mt(e.attributes.TANGENT, e.matrices, s), this.projVertices(e.attributes.POSITION, e.matrices, o, t.extensions.MAPTALKS_RTC, s, i));
                 });
             }
-            Mt(t) {
-                0 === b(t) ? u(ee, 0, 0, -6378137) : Ut(ee, t);
+            Ot(t) {
+                0 === b(t) ? u(ee, 0, 0, -6378137) : Pt(ee, t);
                 const e = this.options.projection;
                 Ft(ne, ee, e);
                 const n = t.length > 2 ? jt(ee, ne, ee[2], e) : 0, r = [];
                 return r[0] = ne[0], r[1] = ne[1], r[2] = n, r;
             }
-            Ot(t, e, n) {
+            Mt(t, e, n) {
                 let i;
                 i = "Y" === n ? Zt : "X" === n ? Xt : Yt;
                 const o = function(t, e) {
@@ -2140,7 +2140,7 @@
                 let w, g = [ 0, 0, 0, 1 ], _ = [ 0, 0, 0 ], T = [ 0, 0 ];
                 const A = o.projCenter, v = c && s(Yt, c);
                 return Jt(t, t => (g[0] = t[0], g[1] = t[1], g[2] = m > 2 ? t[2] : 0, g = d(g, g, l), 
-                p && (g = d(g, g, p)), y && h(g, g, y), c && !v && (g = d(g, g, c)), 0 === b(g) ? u(_, 0, 0, -6378137) : Ut(_, g), 
+                p && (g = d(g, g, p)), y && h(g, g, y), c && !v && (g = d(g, g, c)), 0 === b(g) ? u(_, 0, 0, -6378137) : Pt(_, g), 
                 Ft(T, _, f), w = g[2] ? jt(_, T, _[2], f) : 0, t[0] = T[0] - A[0], t[1] = T[1] - A[1], 
                 m > 2 && (t[2] = w - A[2]), t)), t.projected = !0, {
                     projCenter: A
@@ -2324,10 +2324,10 @@
         function v(t) {
             return t.flat ? t.flat(1 / 0) : t.reduce((t, e) => t.concat(e), []);
         }
-        function M(t) {
+        function O(t) {
             return t < 256 ? Uint8Array : t < 65536 ? Uint16Array : Uint32Array;
         }
-        function O(t) {
+        function M(t) {
             return 0 === t.indexOf("data:");
         }
         function S(t) {
@@ -2347,8 +2347,8 @@
             stringFromUTF8Array: T,
             setColumn3: A,
             flatArr: v,
-            getBatchIdArrayType: M,
-            isBase64: O,
+            getBatchIdArrayType: O,
+            isBase64: M,
             base64URLToArrayBuffer: S
         }), I = "undefined" != typeof Float32Array ? Float32Array : Array;
         function N(t, e, n) {
@@ -2362,15 +2362,15 @@
             _ = n[13], T = n[14], A = n[15], t[12] = g * r + _ * a + T * l + A * y, t[13] = g * s + _ * c + T * f + A * b, 
             t[14] = g * i + _ * u + T * d + A * p, t[15] = g * o + _ * h + T * m + A * w, t;
         }
-        function P() {
+        function E() {
             var t = new I(3);
             return I != Float32Array && (t[0] = 0, t[1] = 0, t[2] = 0), t;
         }
-        function U(t) {
+        function P(t) {
             var e = t[0], n = t[1], r = t[2];
             return Math.sqrt(e * e + n * n + r * r);
         }
-        function C(t, e, n) {
+        function U(t, e, n) {
             var r = new I(3);
             return r[0] = t, r[1] = e, r[2] = n, r;
         }
@@ -2380,7 +2380,7 @@
         function B(t, e, n, r) {
             return t[0] = e, t[1] = n, t[2] = r, t;
         }
-        function E(t, e, n) {
+        function C(t, e, n) {
             return t[0] = e[0] - n[0], t[1] = e[1] - n[1], t[2] = e[2] - n[2], t;
         }
         function R(t, e, n) {
@@ -2397,7 +2397,7 @@
         function j(t, e) {
             return t[0] * e[0] + t[1] * e[1] + t[2] * e[2];
         }
-        var k = E, z = R, V = U;
+        var k = C, z = R, V = P;
         function G(t, e, n, r, s) {
             return t[0] = e, t[1] = n, t[2] = r, t[3] = s, t;
         }
@@ -2412,14 +2412,14 @@
             b = Math.sin(r * f) / m) : (y = 1 - r, b = r), t[0] = y * s + b * c, t[1] = y * i + b * u, 
             t[2] = y * o + b * h, t[3] = y * a + b * l, t;
         }
-        P(), function() {
+        E(), function() {
             var t, e = (t = new I(4), I != Float32Array && (t[0] = 0, t[1] = 0, t[2] = 0, t[3] = 0), 
             t);
         }();
         var q, J = function(t, e) {
             return t[0] = e[0], t[1] = e[1], t[2] = e[2], t[3] = e[3], t;
         };
-        P(), C(1, 0, 0), C(0, 1, 0), H(), H(), q = new I(9), I != Float32Array && (q[1] = 0, 
+        E(), U(1, 0, 0), U(0, 1, 0), H(), H(), q = new I(9), I != Float32Array && (q[1] = 0, 
         q[2] = 0, q[3] = 0, q[5] = 0, q[6] = 0, q[7] = 0), q[0] = 1, q[4] = 1, q[8] = 1;
         /*!
        * @maptalks/gltf-loader v0.21.0
@@ -2799,8 +2799,8 @@
                     const e = this.gltf.bufferViews[t.bufferView];
                     if (this.images[t.id]) return Promise.resolve(this.images[t.id]);
                     const n = this.gltf.buffers[e.buffer];
-                    if (n.uri) return this.M(n, e, t);
-                    if (this.glbBuffer) return this.O(e, t);
+                    if (n.uri) return this.O(n, e, t);
+                    if (this.glbBuffer) return this.M(e, t);
                 }
                 return null;
             }
@@ -2820,7 +2820,7 @@
                     return this.S(e.id, r);
                 }
             }
-            M(t, e, n) {
+            O(t, e, n) {
                 if (this.buffers[t.id]) {
                     const r = this.buffers[t.id], s = this.N(e, r);
                     return this.I(s, n);
@@ -2838,7 +2838,7 @@
                     return this.I(i, n);
                 });
             }
-            O(t, e) {
+            M(t, e) {
                 const n = this.N(t, this.glbBuffer.buffer, this.glbBuffer.byteOffset);
                 return this.I(n, e);
             }
@@ -2970,19 +2970,19 @@
                     const l = h.channelsMap[n];
                     if (l) for (let t = 0; t < l.length; t++) {
                         const e = l[t];
-                        "translation" === e.target.path ? (this.C(s, h.samplers[e.sampler], r, 1), u.translation = L(pt, s)) : "rotation" === e.target.path ? (this.L(i, h.samplers[e.sampler], r, 1), 
-                        u.rotation = J(wt, i)) : "scale" === e.target.path ? (this.C(o, h.samplers[e.sampler], r, 1), 
-                        u.scale = L(gt, o)) : "weights" === e.target.path && a && (this.C(a, h.samplers[e.sampler], r, a.length), 
+                        "translation" === e.target.path ? (this.L(s, h.samplers[e.sampler], r, 1), u.translation = L(pt, s)) : "rotation" === e.target.path ? (this.B(i, h.samplers[e.sampler], r, 1), 
+                        u.rotation = J(wt, i)) : "scale" === e.target.path ? (this.L(o, h.samplers[e.sampler], r, 1), 
+                        u.scale = L(gt, o)) : "weights" === e.target.path && a && (this.L(a, h.samplers[e.sampler], r, a.length), 
                         u.weights = a);
                     }
                 }
                 return u;
             },
-            C(t, e, n, r) {
+            L(t, e, n, r) {
                 switch (e.interpolation) {
                   case "LINEAR":
                     {
-                        const s = this.B(Tt, e, n, 1 * r);
+                        const s = this.C(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;
@@ -2992,7 +2992,7 @@
 
                   case "STEP":
                     {
-                        const s = this.B(Tt, e, n, 1 * r);
+                        const s = this.C(Tt, e, n, 1 * r);
                         s && (t = function(t, e) {
                             for (let n = 0; n < t.length; n++) t[n] = e[n];
                             return t;
@@ -3002,32 +3002,32 @@
 
                   case "CUBICSPLINE":
                     {
-                        const s = this.B(Tt, e, n, 3 * r);
+                        const s = this.C(Tt, e, n, 3 * r);
                         s && (t = this.R(t, s, e.input.array, 3 * r));
                         break;
                     }
                 }
                 return t;
             },
-            L(t, e, n) {
+            B(t, e, n) {
                 switch (e.interpolation) {
                   case "LINEAR":
                     {
-                        const r = this.B(Tt, e, n, 1);
+                        const r = this.C(Tt, e, n, 1);
                         r && $(t, r.PREVIOUS, r.NEXT, r.INTERPOLATION);
                         break;
                     }
 
                   case "STEP":
                     {
-                        const r = this.B(Tt, e, n, 1);
+                        const r = this.C(Tt, e, n, 1);
                         r && (t = G(t, ...r.PREVIOUS));
                         break;
                     }
 
                   case "CUBICSPLINE":
                     {
-                        const r = this.B(Tt, e, n, 3);
+                        const r = this.C(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]);
@@ -3056,7 +3056,7 @@
                 }
                 return null;
             },
-            B(t, e, n, r) {
+            C(t, e, n, r) {
                 const s = e.input.array, i = e.output.array, o = e.output.itemSize;
                 (n < s[0] || n > s[s.length - 1]) && (n = Math.max(s[0], Math.min(s[s.length - 1], n))), 
                 n === s[s.length - 1] && (n = s[0]);
@@ -3103,7 +3103,7 @@
                 return n ? X(e) ? n[e] : n[Object.keys(n)[0]] : null;
             }
         }, vt = "undefined" == typeof document ? null : document.createElement("canvas");
-        class Mt {
+        class Ot {
             constructor(t, e, n) {
                 if (this.options = n || {}, this.options.decoders || (this.options.decoders = {}), 
                 e.buffer instanceof ArrayBuffer) {
@@ -3165,7 +3165,7 @@
             }
             D(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 = this.options.requestImage || Ot, 
+                this.rootPath = t, this.buffers = {}, this.requests = {}, this.options.requestImage = this.options.requestImage || Mt, 
                 this.options.transferable && (this.transferables = []), 2 === this.version ? (this.adapter = new ft(t, e, n, this.options.requestImage, this.options.decoders || {}), 
                 this.adapter.iterate((t, e, n) => {
                     e.id = "buffer_" + n;
@@ -3331,7 +3331,7 @@
                 });
             }
         }
-        function Ot(t, e) {
+        function Mt(t, e) {
             const n = new Image;
             n.crossOrigin = "", n.onload = () => {
                 if (!vt) return void e(new Error("There is no canvas to draw image!"));
@@ -3433,7 +3433,7 @@
         function Nt(t) {
             return Math.pow(2, Math.floor(Math.log(t) / Math.LN2));
         }
-        class Pt {
+        class Et {
             constructor(t, e) {
                 this.max = t, this.currentSize = 0, this.onRemove = e, this.reset();
             }
@@ -3502,17 +3502,17 @@
                 return t;
             }
         }
-        function Ut(t, e) {
+        function Pt(t, e) {
             if (t.scenes && t.scenes.length) for (let n = 0, r = t.scenes.length; n < r; n++) {
                 const r = t.scenes[n].nodes;
                 for (let n = 0, s = r.length; n < s; n++) {
                     const s = [];
-                    Ct(r[n], s, t, e);
+                    Ut(r[n], s, t, e);
                 }
             }
         }
-        function Ct(t, e, n, r) {
-            if (t.matrix && e.push(t.matrix), t.children && t.children.length) for (let s = 0, i = t.children.length; s < i; s++) Ct(t.children[s], e, n, r);
+        function Ut(t, e, n, r) {
+            if (t.matrix && e.push(t.matrix), t.children && t.children.length) for (let s = 0, i = t.children.length; s < i; s++) Ut(t.children[s], e, n, r);
             if (void 0 !== t.mesh) {
                 const s = t.mesh, i = n.meshes[s];
                 if (i) {
@@ -3526,7 +3526,7 @@
         }
         function Lt(t, e, n) {
             let {componentType: r, byteOffset: s, byteStride: i, itemSize: o} = e;
-            const a = e.array.buffer, c = r ? Mt.getTypedArrayCtor(r) : e.array.constructor;
+            const a = e.array.buffer, c = r ? Ot.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;
@@ -3538,14 +3538,14 @@
         function Bt(t, e, n, r) {
             t[4 * e] = n[r], t[4 * e + 1] = n[r + 4], t[4 * e + 2] = n[r + 8], t[4 * e + 3] = n[r + 12];
         }
-        const Et = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], {loginIBLResOnCanvas: Rt, logoutIBLResOnCanvas: Ft, getIBLResOnCanvas: Dt, getPBRUniforms: jt} = n.reshader.pbr.PBRUtils, kt = {
+        const Ct = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], {loginIBLResOnCanvas: Rt, logoutIBLResOnCanvas: Ft, getIBLResOnCanvas: Dt, getPBRUniforms: jt} = n.reshader.pbr.PBRUtils, kt = {
             factor: 0,
             units: 0
         }, zt = [ 1, 1, 1 ], Vt = t => t.material instanceof n.reshader.PhongMaterial, Gt = t => t.material instanceof n.reshader.pbr.StandardMaterial;
         class Ht {
             constructor(t, e) {
-                this.Pt = e, this.Ut = e.getRenderer().canvas, this.Ct = new s.SpatialReference, 
-                this.Lt = t, this.Bt = new n.reshader.Renderer(t), this.Et = {}, this.Rt = {}, this.Ft = {}, 
+                this.Et = e, this.Pt = e.getRenderer().canvas, this.Ut = new s.SpatialReference, 
+                this.Lt = t, this.Bt = new n.reshader.Renderer(t), this.Ct = {}, this.Rt = {}, this.Ft = {}, 
                 this.Dt = {}, this.jt = {}, this.kt = {}, this.zt = {}, this.Vt = new n.reshader.Scene, 
                 this.Gt = new n.reshader.Scene, this.Ht = new n.reshader.Scene, this.$t = new n.reshader.Scene, 
                 this.qt = new n.reshader.ResourceLoader(t.texture(2)), this.Jt = this.Kt.bind(this), 
@@ -3563,12 +3563,12 @@
                 return this.Ft;
             }
             getMap() {
-                return this.Pt.getMap();
+                return this.Et.getMap();
             }
             paint(t, e, n, r) {
                 const s = this.getMap();
                 if (!t.length || !s) return;
-                const i = this.Yt(), o = s.projViewMatrix, a = this.Pt.options.services, u = [];
+                const i = this.Yt(), o = s.projViewMatrix, a = this.Et.options.services, u = [];
                 let h = [];
                 for (let n = 0, r = t.length; n < r; n++) {
                     let r = this.Qt(t[n].data.node);
@@ -3628,9 +3628,9 @@
             le(t) {
                 const e = this.Rt[t];
                 e && (e.geometry.dispose(), e.dispose(), delete this.Rt[t]);
-                let n = this.Ft[t] || this.Dt[t] || this.jt[t] || this.kt[t] || this.Et[t];
+                let n = this.Ft[t] || this.Dt[t] || this.jt[t] || this.kt[t] || this.Ct[t];
                 this.kt[t] ? this.fe(t) : n && (this.de(n), delete this.Ft[t], delete this.Dt[t], 
-                delete this.jt[t], delete this.Et[t]);
+                delete this.jt[t], delete this.Ct[t]);
             }
             fe(t) {
                 let e = this.kt[t];
@@ -3653,7 +3653,7 @@
                 }
             }
             remove() {
-                const t = this.Pt;
+                const t = this.Et;
                 Ft(t.getRenderer().canvas, t.getMap());
                 for (const t in this.kt) this.fe(t);
                 this.kt = {};
@@ -3663,8 +3663,8 @@
                 this.Dt = {};
                 for (const t in this.jt) this.le(t);
                 this.jt = {};
-                for (const t in this.Et) this.le(t);
-                this.Et = {};
+                for (const t in this.Ct) this.le(t);
+                this.Ct = {};
                 for (const t in this.Rt) this.le(t);
                 this.Rt = {}, this.ne && (this.ne.dispose(), delete this.ne), this.re && (this.re.dispose(), 
                 delete this.re), this.ie && (this.ie.dispose(), delete this.ie), this.ue && (this.ue.dispose(), 
@@ -3692,7 +3692,7 @@
                 return this.Ft[t.id];
             }
             has(t) {
-                return this.Qt(t) || this.Dt[t.id] || this.jt[t.id] || this.kt[t.id] || this.Et[t.id];
+                return this.Qt(t) || this.Dt[t.id] || this.jt[t.id] || this.kt[t.id] || this.Ct[t.id];
             }
             createPntsMesh(t, e, r, s) {
                 if (this.Dt[e]) {
@@ -3712,7 +3712,7 @@
                 i.RGB ? h.HAS_RGB = 1 : i.RGBA ? h.HAS_RGBA = 1 : i.RGB565 && (h.HAS_RGB565 = 1), 
                 (i.NORMAL || i.NORMAL_OCT16P) && (h.HAS_NORMAL = 1, i.NORMAL_OCT16P && (h.HAS_NORMAL_OCT16P = 1)), 
                 t.featureTable.CONSTANT_RGBA && (t.featureTable.CONSTANT_RGBA = t.featureTable.CONSTANT_RGBA.map(t => t / 255));
-                const l = this.we(t.rtcCenter.projCenter, a), f = this.Pt.options.services[a], d = new n.reshader.Mesh(u);
+                const l = this.we(t.rtcCenter.projCenter, a), f = this.Et.options.services[a], d = new n.reshader.Mesh(u);
                 return d.properties.magic = "pnts", d.properties.id = e, d.properties.count = c, 
                 d.properties.batchTable = t.batchTable, d.properties.batchTableBin = t.batchTableBin, 
                 d.setDefines(h), Object.defineProperty(d.uniforms, "pointColor", {
@@ -3738,7 +3738,7 @@
             createI3DMMesh(t, e, r, s) {
                 if (this.jt[e]) {
                     const t = this.jt[e];
-                    return console.warn(`i3dm mesh with id(${e}) was already created.`), this.Et[e] || s(null, {
+                    return console.warn(`i3dm mesh with id(${e}) was already created.`), this.Ct[e] || s(null, {
                         id: e,
                         mesh: t
                     }), t;
@@ -3747,10 +3747,10 @@
                     "instance_vectorA": new Float32Array(4 * l),
                     "instance_vectorB": new Float32Array(4 * l),
                     "instance_vectorC": new Float32Array(4 * l)
-                }, _ = new Float32Array(3), T = new Float32Array(3), v = [], M = new Float32Array(1), O = new Float32Array(3), S = [], x = [], I = [], N = [];
+                }, _ = new Float32Array(3), T = new Float32Array(3), v = [], O = new Float32Array(1), M = new Float32Array(3), S = [], x = [], I = [], N = [];
                 !function(t, e) {
                     let {componentType: n, byteOffset: r, byteStride: s, count: i, itemSize: o} = t;
-                    const a = t.array.buffer, c = n ? Mt.getTypedArrayCtor(n) : t.array.constructor;
+                    const a = t.array.buffer, c = n ? Ot.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);
@@ -3768,45 +3768,45 @@
                     }
                 }(m, (t, e) => {
                     y ? (Lt(T, b, e), Lt(_, y, e), n.vec3.cross(v, T, _), n.vec3.normalize(v, v), A(S, T, 0), 
-                    A(S, _, 1), A(S, v, 2), n.quat.fromMat3(x, S)) : n.quat.identity(x), p ? (Lt(M, p, e), 
-                    n.vec3.set(I, M[0], M[0], M[0])) : w ? (Lt(O, w, e), n.vec3.set(I, ...O)) : n.vec3.set(I, 1, 1, 1), 
+                    A(S, _, 1), A(S, v, 2), n.quat.fromMat3(x, S)) : n.quat.identity(x), p ? (Lt(O, p, e), 
+                    n.vec3.set(I, O[0], O[0], O[0])) : w ? (Lt(M, w, e), n.vec3.set(I, ...M)) : n.vec3.set(I, 1, 1, 1), 
                     n.mat4.fromRotationTranslationScale(N, x, t, I), Bt(g.instance_vectorA, e, N, 0), 
                     Bt(g.instance_vectorB, e, N, 1), Bt(g.instance_vectorC, e, N, 2);
                 });
-                const P = {};
-                for (const t in g) P[t] = {
+                const E = {};
+                for (const t in g) E[t] = {
                     buffer: this.Lt.buffer({
                         dimension: g[t].length / l,
                         data: g[t]
                     }),
                     divisor: 1
                 };
-                const U = this.Pt.options.services[r.Wt].shader || "phong";
-                let C = 0, L = !0;
+                const P = this.Et.options.services[r.Wt].shader || "phong";
+                let U = 0, L = !0;
                 const B = [];
-                return Ut(a, (t, s, i, o) => {
-                    let {geometry: a, material: f, attributes: m} = this.ge(t, s, i, o, r, !0, U);
-                    f && !f.isReady() && (L = !1, C++);
-                    const y = new n.reshader.InstancedMesh(P, l, a, f);
+                return Pt(a, (t, s, i, o) => {
+                    let {geometry: a, material: f, attributes: m} = this.ge(t, s, i, o, r, !0, P);
+                    f && !f.isReady() && (L = !1, U++);
+                    const y = new n.reshader.InstancedMesh(E, l, a, f);
                     y.properties.magic = "i3dm", y.properties.id = e, y.properties.count = h, y.properties.batchTable = c, 
                     y.properties.batchTableBin = u;
-                    const b = this._e(t, m, f);
-                    y.setPositionMatrix(Et), y.setLocalTransform(d), y.setDefines(b), y.setUniform("polygonOffset", {
+                    const b = this._e(t, m, a, f, r.Wt);
+                    y.setPositionMatrix(Ct), y.setLocalTransform(d), y.setDefines(b), y.setUniform("polygonOffset", {
                         offset: 0,
                         factor: 0
                     }), B.push(y);
                 }), L ? (this.jt[e] = B, s(null, {
                     id: e,
                     mesh: B
-                })) : (this.Et[e] = {
+                })) : (this.Ct[e] = {
                     meshes: B,
-                    count: C
+                    count: U
                 }, B.Te = s), B;
             }
             createB3DMMesh(t, e, r, i) {
-                if (this.Ft[e] || this.Et[e]) {
+                if (this.Ft[e] || this.Ct[e]) {
                     const t = this.Ft[e];
-                    return console.warn(`mesh with id(${e}) was already created.`), this.Et[e] || i(null, {
+                    return console.warn(`mesh with id(${e}) was already created.`), this.Ct[e] || i(null, {
                         id: e,
                         mesh: t
                     }), t;
@@ -3816,21 +3816,21 @@
                     const t = new s.Extent(r.maxExtent).convertTo(t => this._pointToPrj(t));
                     o = [ t.xmin, t.ymin, t.xmax, t.ymax ];
                 }
-                const a = t.gltf, c = a.extensions.MAPTALKS_RTC.projCenter, u = this.we(c, r.Wt), h = this.Pt.options.services[r.Wt].shader || "phong", l = [];
+                const a = t.gltf, c = a.extensions.MAPTALKS_RTC.projCenter, u = this.we(c, r.Wt), h = this.Et.options.services[r.Wt].shader || "phong", l = [];
                 let f = 0, d = !0;
-                return Ut(a, (s, i, a, m) => {
+                return Pt(a, (s, i, a, m) => {
                     let {geometry: y, material: b, attributes: p} = this.ge(s, i, a, m, r, !1, h);
                     b && !b.isReady() && (d = !1, f++);
                     const w = new n.reshader.Mesh(y, b);
                     w.properties.magic = "b3dm", w.properties.id = e, w.properties.batchTable = t.batchTable, 
                     w.properties.batchTableBin = t.batchTableBin, w.properties.count = t.featureTable.BATCH_LENGTH;
-                    const g = this._e(s, p, b);
+                    const g = this._e(s, p, y, b, r.Wt);
                     w.setDefines(g), o && (g.USE_MAX_EXTENT = 1, w.setUniform("maxPrjExtent", o), w.setUniform("prjCenter", c)), 
                     w.setLocalTransform(u), l.push(w);
                 }), d ? (this.Ft[e] = l, i(null, {
                     id: e,
                     mesh: l
-                })) : (this.Et[e] = {
+                })) : (this.Ct[e] = {
                     meshes: l,
                     count: f
                 }, l.Te = i), l;
@@ -3866,10 +3866,10 @@
                 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());
             }
-            _e(t, e, n) {
-                const r = {};
-                return t.attributes.NORMAL && (r.USE_NORMAL = 1), Array.isArray(n.get("baseColor")) || (r.USE_BASECOLOR_TEXTURE = 1), 
-                e.aTexCoord && (r.HAS_TEX = 1), r;
+            _e(t, e, n, r, s) {
+                const i = ("phong" === (this.Et.options.services[s].shader || "phong") ? this.ne : this.re).getGeometryDefines(n);
+                return t.attributes.NORMAL && (i.USE_NORMAL = 1), Array.isArray(r.get("baseColor")) || (i.USE_BASECOLOR_TEXTURE = 1), 
+                e.aTexCoord && (i.HAS_TEX = 1), i;
             }
             ge(t, e, r, s, i, o, a) {
                 const c = s.url + "-" + e + "-" + r;
@@ -3892,7 +3892,7 @@
                     excludeElementsInVAO: o
                 });
                 let f = this.ve(t.material, s, a);
-                f && !f.isReady() ? f.Me = i.id : f || (f = this.Zt);
+                f && !f.isReady() ? f.Oe = i.id : f || (f = this.Zt);
                 const d = {
                     refCount: 1,
                     geometry: h,
@@ -3902,9 +3902,9 @@
                 return this.zt[c] = d, d;
             }
             we(t, e) {
-                const r = n.mat4.identity([]), i = this.getMap(), o = this._prjToPoint(new s.Coordinate(t)), a = this.Oe(), c = 1 / (i.getGLZoom ? i.getResolution(i.getGLZoom()) : i.getGLRes());
+                const r = n.mat4.identity([]), i = this.getMap(), o = this._prjToPoint(new s.Coordinate(t)), a = this.Me(), c = 1 / (i.getGLZoom ? i.getResolution(i.getGLZoom()) : i.getGLRes());
                 n.mat4.translate(r, r, [ o.x, o.y, c * t[2] ]);
-                const u = this.Pt.options.services[e].heightOffset;
+                const u = this.Et.options.services[e].heightOffset;
                 return u && n.mat4.translate(r, r, [ 0, 0, c * u ]), n.mat4.scale(r, r, n.vec3.scale([], a, c)), 
                 r;
             }
@@ -3912,8 +3912,8 @@
                 const t = {
                     x: 0,
                     y: 0,
-                    width: () => this.Ut ? this.Ut.width : 1,
-                    height: () => this.Ut ? this.Ut.height : 1
+                    width: () => this.Pt ? this.Pt.width : 1,
+                    height: () => this.Pt ? this.Pt.height : 1
                 };
                 this.ue = new n.reshader.MeshShader({
                     vert: "attribute vec3 aPosition;\n\nuniform mat4 projViewModelMatrix;\n\nvoid main() {\n    gl_Position = projViewModelMatrix * vec4(aPosition, 1.0);\n}\n",
@@ -3998,7 +3998,7 @@
                 }), this.re = new n.reshader.pbr.StandardShader({
                     extraCommandProps: s
                 });
-                const i = this.Pt;
+                const i = this.Et;
                 Rt(i.getRenderer().canvas, this.Lt, i.getMap());
             }
             he(t) {
@@ -4016,7 +4016,7 @@
                 };
             }
             Yt() {
-                const t = this.getMap(), e = this.Pt.getRenderer().canvas, {iblTexes: n, dfgLUT: r} = Dt(e), s = jt(t, n, r);
+                const t = this.getMap(), e = this.Et.getRenderer().canvas, {iblTexes: n, dfgLUT: r} = Dt(e), s = jt(t, n, r);
                 return m(s, {
                     lightSpecular: [ 1, 1, 1 ],
                     viewMatrix: t.viewMatrix,
@@ -4093,10 +4093,10 @@
                 return n.createObjectURL(r);
             }
             Kt({target: t}) {
-                const e = t.Me, n = this.Et[e];
+                const e = t.Oe, n = this.Ct[e];
                 if (n.count--, !n.count) {
                     const t = n.meshes;
-                    this.Ft[e] = t, delete this.Et[e];
+                    this.Ft[e] = t, delete this.Ct[e];
                     const r = t.Te;
                     delete t.Te, r(null, {
                         mesh: n.meshes,
@@ -4104,11 +4104,11 @@
                     });
                 }
             }
-            Oe() {
+            Me() {
                 return zt;
             }
             me(t) {
-                return this.Pt.me(t);
+                return this.Et.me(t);
             }
             pe(t, e) {
                 const n = this.getMap();
@@ -4283,7 +4283,7 @@
         }
         class he extends s.renderer.CanvasRenderer {
             constructor(t) {
-                super(t), this.prepareWorker(), this.tilesLoading = {}, this.tileCache = new Pt(1024 * t.options.maxGPUMemory * 1024, this.deleteTile.bind(this)), 
+                super(t), this.prepareWorker(), this.tilesLoading = {}, this.tileCache = new Et(1024 * t.options.maxGPUMemory * 1024, this.deleteTile.bind(this)), 
                 this.gt = {};
             }
             needToRedraw() {
@@ -4302,19 +4302,19 @@
             }
             xe(t, e) {
                 let n = [];
-                const r = this.Pe(), s = this.Ue(), i = {};
+                const r = this.Ee(), s = this.Pe(), i = {};
                 let o = !1, a = !1;
                 for (const t in e) {
                     const r = e[t], s = r.node;
                     if (i[s.id]) continue;
                     i[s.id] = 1;
                     let c = !1;
-                    const u = this.Ce(s.id);
+                    const u = this.Ue(s.id);
                     if (this.Le(s.id) ? (c = a = !0, this.tilesLoading[s.id].current = !0) : u ? (this.getTileOpacity(u) < 1 && (c = a = !0), 
                     o = !0, r.selected = !0, r.data = u) : this.painter.has(s) || (c = a = !0, n.push(s)), 
                     !c) continue;
                     if (this.Be(r)) o = !0; else {
-                        this.Ee(r).length && (o = !0);
+                        this.Ce(r).length && (o = !0);
                     }
                 }
                 let c = [], u = {};
@@ -4369,7 +4369,7 @@
                 }
                 return null;
             }
-            Ee(t) {
+            Ce(t) {
                 const e = [];
                 if (!t.node.children || !t.node.children.length) return e;
                 const n = t.De + 1, r = [ t.node ];
@@ -4419,7 +4419,7 @@
             }
             loadTile(t) {
                 let e = t.content.url;
-                if (O(e)) {
+                if (M(e)) {
                     const n = S(e);
                     return void this.ze(e, n, t);
                 }
@@ -4493,7 +4493,7 @@
                     error: t
                 });
             }
-            Ce(t) {
+            Ue(t) {
                 return this.tileCache.get(t);
             }
             Je(t) {
@@ -4513,7 +4513,7 @@
                 } else this.workerConn.abortTileLoading(this.layer.getId(), e);
                 delete this.gt[e];
             }
-            Pe() {
+            Ee() {
                 let t = 0;
                 if (this.tilesLoading) for (const e in this.tilesLoading) this.tilesLoading[e].current = !1, 
                 t++;
@@ -4535,7 +4535,7 @@
                     gl: this.gl,
                     attributes: e,
                     extensions: [ "OES_element_index_uint", "WEBGL_compressed_texture_s3tc" ],
-                    optionalExtensions: t.options.glExtensions || []
+                    optionalExtensions: t.options.optionalExtensions || []
                 }), this.painter = new Ht(this.regl, t);
             }
             prepareWorker() {
@@ -4585,7 +4585,7 @@
                     }
                 }
             }
-            Ue() {
+            Pe() {
                 return this.getMap().isInteracting() ? this.layer.options.loadingLimitOnInteracting : this.layer.options.loadingLimit;
             }
             Ke(t, e) {
@@ -4638,25 +4638,25 @@
             const n = we, r = function(t, e, n, r, s) {
                 const i = e[0], o = e[1], a = e[2], c = n[0], u = n[1], h = n[2], l = i * i * c * c, f = o * o * u * u, d = a * a * h * h, m = l + f + d, y = Math.sqrt(1 / m), b = F(ve, e, y);
                 if (m < s) return isFinite(y) ? b : void 0;
-                const p = r[0], w = r[1], g = r[2], _ = Me;
+                const p = r[0], w = r[1], g = r[2], _ = Oe;
                 _[0] = b[0] * p * 2, _[1] = b[1] * w * 2, _[2] = b[2] * g * 2;
-                let T, A, v, M, O, S, x, I, N, P, U, C = (1 - y) * Oe(e) / (.5 * Oe(_)), L = 0;
+                let T, A, v, O, M, S, x, I, N, E, P, U = (1 - y) * Me(e) / (.5 * Me(_)), L = 0;
                 do {
-                    C -= L, v = 1 / (1 + C * p), M = 1 / (1 + C * w), O = 1 / (1 + C * g), S = v * v, 
-                    x = M * M, I = O * O, N = S * v, P = x * M, U = I * O, T = l * S + f * x + d * I - 1, 
-                    A = l * N * p + f * P * w + d * U * g;
+                    U -= L, v = 1 / (1 + U * p), O = 1 / (1 + U * w), M = 1 / (1 + U * g), S = v * v, 
+                    x = O * O, I = M * M, N = S * v, E = x * O, P = I * M, T = l * S + f * x + d * I - 1, 
+                    A = l * N * p + f * E * w + d * P * g;
                     L = T / (-2 * A);
                 } while (Math.abs(T) > 1e-12);
-                return t[0] = i * v, t[1] = o * M, t[2] = a * O, t;
+                return t[0] = i * v, t[1] = o * O, t[2] = a * M, t;
             }(ge, e, pe, n, .1);
             let s = z(_e, r, n);
             s = Se(s, s);
-            const i = k(Te, e, r), o = Math.atan2(s[1], s[0]), a = Math.asin(s[2]), c = g(j(i, e)) * Oe(i);
+            const i = k(Te, e, r), o = Math.atan2(s[1], s[0]), a = Math.asin(s[2]), c = g(j(i, e)) * Me(i);
             return t[0] = p(o), t[1] = p(a), t[2] = c, t;
         }
-        const ve = new Array(3), Me = new Array(3);
-        function Oe(t) {
-            return U(t);
+        const ve = new Array(3), Oe = new Array(3);
+        function Me(t) {
+            return P(t);
         }
         function Se(t, e) {
             const n = e[0], r = e[1], s = e[2];
@@ -4675,7 +4675,7 @@
         }
         function Ne(t, e, n) {
             return Math.sqrt(function(t, e, n) {
-                var r = E(Pe, n, t), s = Ie(Ue, e, 0), i = Ie(Ce, e, 1), o = Ie(Le, e, 2), a = V(s), c = V(i), u = V(o);
+                var r = C(Ee, n, t), s = Ie(Pe, e, 0), i = Ie(Ue, e, 1), o = Ie(Le, e, 2), a = V(s), c = V(i), u = V(o);
                 D(s, s), D(i, i), D(o, o);
                 var h = Be;
                 h.x = j(r, s), h.y = j(r, i), h.z = j(r, o);
@@ -4686,8 +4686,8 @@
                 return f;
             }(t, e, n));
         }
-        const Pe = [], Ue = [], Ce = [], Le = [], Be = [];
-        const Ee = s.projection.EPSG3857, Re = new s.Extent(0, 0, 0, 0), Fe = [], De = [], je = new s.Coordinate(0, 0), ke = n.mat4.identity([]);
+        const Ee = [], Pe = [], Ue = [], Le = [], Be = [];
+        const Ce = s.projection.EPSG3857, Re = new s.Extent(0, 0, 0, 0), Fe = [], De = [], je = new s.Coordinate(0, 0), ke = n.mat4.identity([]);
         class ze extends s.Layer {
             constructor(t, e) {
                 super(t, e), this.Ye(), this.gt = {}, this.Qe = {};
@@ -4756,7 +4756,7 @@
                     s = t.pointAtResToDistance(e[2], 0, n), je.set(e[0], e[1]), r = t.pointAtResToCoord(je, n);
                 }
                 this.nn = this.nn || [], n.vec3.set(this.nn, b(r.x), b(r.y), s), this.rn = be(this.rn || [], this.nn[0], this.nn[1], this.nn[2]), 
-                this.sn = 2 * Math.tan(.5 * b(t.getFov())), this.in = Ee.project(r).toArray();
+                this.sn = 2 * Math.tan(.5 * b(t.getFov())), this.in = Ce.project(r).toArray();
                 const i = t.projViewMatrix, o = {
                     children: [],
                     level: -1
@@ -4788,7 +4788,7 @@
                                 if (!u[e].parent) {
                                     u[e].parent = t, u[e].Ve = t.Ve, u[e].baseUrl = t.baseUrl;
                                     const n = u[e].content && (u[e].content.url || u[e].content.uri);
-                                    n && (O(n) ? u[e].baseUrl = t.baseUrl : -1 === n.indexOf("http://") && -1 === n.indexOf("https://") ? u[e].content.url = t.baseUrl + n : u[e].baseUrl = n.substring(0, n.lastIndexOf("/") + 1));
+                                    n && (M(n) ? u[e].baseUrl = t.baseUrl : -1 === n.indexOf("http://") && -1 === n.indexOf("https://") ? u[e].content.url = t.baseUrl + n : u[e].baseUrl = n.substring(0, n.lastIndexOf("/") + 1));
                                 }
                                 n.push(u[e]);
                             }
@@ -4812,7 +4812,7 @@
                     return !1;
                 }
                 /*!
-       * @maptalks/gl v0.61.0
+       * @maptalks/gl v0.62.1
        * LICENSE : UNLICENSED
        * (c) 2016-2021 maptalks.com
        */ (this.nn, this.rn, e.node.viewerRequestVolume) || (t[e.node.id] = e);
@@ -4864,7 +4864,7 @@
                     e.children && e.children.length && (e.bn = e.content, delete e.content, t.root.content && (e.content = t.root.content)), 
                     e.mn = this.yn(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 && !O(i) && -1 === i.indexOf("http://") && -1 === i.indexOf("https://") && (e.content.url = e.baseUrl + i);
+                    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.en(), this.fire("loadtileset", {
                     tileset: t,
@@ -5004,12 +5004,13 @@
             "debug": !1,
             "debugOutline": [ 0, 1, 0 ],
             "antialias": !1,
-            "sRGBTolinear": !1
+            "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_s3tc" ]
         }), ze.registerRenderer("gl", he);
         const He = [], $e = [];
         function qe(t, e) {
             const n = new s.Coordinate(p(t), p(e));
-            return Ee.project(n).toArray();
+            return Ce.project(n).toArray();
         }
         const Je = function() {
             if ("undefined" != typeof self) return self;
@@ -5029,7 +5030,7 @@
         };
         class Xe {
             constructor(t, e) {
-                this.A = t, this.W = e || Mt, this.tt = {
+                this.A = t, this.W = e || Ot, this.tt = {
                     "image/crn": Ze.crn && Ze.crn(),
                     "image/ktx2": Ze.ktx2 && Ze.ktx2(),
                     "image/cttf": Ze.ktx2 && Ze.ktx2(),
@@ -5123,7 +5124,7 @@
         }
         class Ye {
             constructor(t, e) {
-                this.A = t, this.W = e || Mt, this.tt = {
+                this.A = t, this.W = e || Ot, this.tt = {
                     "image/crn": Ze.crn && Ze.crn(),
                     "image/ktx2": Ze.ktx2 && Ze.ktx2(),
                     "image/cttf": Ze.ktx2 && Ze.ktx2(),
@@ -5538,7 +5539,7 @@
             }
         }
         function nn(t) {
-            const e = M(t), n = new e(t);
+            const e = O(t), n = new e(t);
             for (let e = 0; e < t; e++) n[e] = e;
             return {
                 byteStride: 0,
@@ -5551,7 +5552,7 @@
         }
         class rn {
             constructor(t, e) {
-                this.A = t, this.W = e || Mt;
+                this.A = t, this.W = e || Ot;
             }
             load(t, e, n = 0, r = 0) {
                 return e ? this.et(t, e, n, r) : ct.getArrayBuffer(t, {}).then(e => {
@@ -5611,5 +5612,5 @@
         t.Geo3DTransform = xe, Object.defineProperty(t, "t", {
             value: !0
         });
-    })), i.Map.VERSION, o.GroupGLLayer.VERSION, "undefined" != typeof console && console.log("@maptalks/3dtiles v0.10.0");
+    })), i.Map.VERSION, o.GroupGLLayer.VERSION, "undefined" != typeof console && console.log("@maptalks/3dtiles v0.10.1");
 }));

package/package.json

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