@maptalks/vt 0.63.5 → 0.63.8

package/dist/maptalks.vt.mjs

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/vt v0.63.5
+ * @maptalks/vt v0.63.8
  * LICENSE : undefined
  * (c) 2016-2022 maptalks.org
  */
@@ -11,7 +11,7 @@ import { reshader as n, vec3 as i, mat4 as r, GroundPainter as s, createREGL as
 
 import { compileStyle as d, createFilter as p } from "@maptalks/feature-filter";
 
-import { loadFunctionTypes as m, isFunctionDefinition as y, interpolated as g, piecewiseConstant as v } from "@maptalks/function-type";
+import { loadFunctionTypes as y, isFunctionDefinition as m, interpolated as g, piecewiseConstant as v } from "@maptalks/function-type";
 
 import { IconRequestor as x, GlyphRequestor as b, PointPack as A, VectorPack as w, StyledPoint as _, LinePack as S, StyledVector as M, SYMBOLS_NEED_REBUILD_IN_VECTOR as P, PolygonPack as T, SYMBOLS_NEED_REBUILD_IN_VT as k } from "@maptalks/vector-packer";
 
@@ -999,6 +999,9 @@ class nt extends t.renderer.TileLayerCanvasRenderer {
                 dataConfig: {
                     type: "fill",
                     only2D: !0
+                },
+                sceneConfig: {
+                    antialias: !0
                 }
             };
             break;
@@ -1428,14 +1431,14 @@ class ct extends t.TileLayer {
             pt(this.Bt, e, i), o = this.Bt[e].style[i].Yt;
             const t = r[o].renderPlugin;
             t.sceneConfig || (t.sceneConfig = {}), s = t.sceneConfig;
-        } else mt(r, e), s = r[e].renderPlugin.sceneConfig;
+        } else yt(r, e), s = r[e].renderPlugin.sceneConfig;
         if (R(s, n), Array.isArray(this.options.style)) {
             const t = this.options.style[e].renderPlugin;
             t.sceneConfig || (t.sceneConfig = {}), R(t.sceneConfig, n);
         } else {
             const r = this.Z(t, this.options.style);
             let s;
-            void 0 !== i ? (pt(r, e, i), s = r[e].style[i].renderPlugin) : (mt(r, e), s = r[e].renderPlugin), 
+            void 0 !== i ? (pt(r, e, i), s = r[e].style[i].renderPlugin) : (yt(r, e), s = r[e].renderPlugin), 
             s.sceneConfig || (s.sceneConfig = {}), R(s.sceneConfig, n);
         }
         const a = this.getRenderer();
@@ -1458,13 +1461,13 @@ class ct extends t.TileLayer {
         const r = this.Z(t);
         if (!r) return this;
         let s, o = e;
-        void 0 !== i ? (pt(this.Bt, e, i), o = this.Bt[e].style[i].Yt, s = r[o].renderPlugin.dataConfig) : (mt(r, e), 
+        void 0 !== i ? (pt(this.Bt, e, i), o = this.Bt[e].style[i].Yt, s = r[o].renderPlugin.dataConfig) : (yt(r, e), 
         s = r[e].renderPlugin.dataConfig);
         const a = R({}, s);
         if (R(s, n), Array.isArray(this.options.style)) R(this.options.style[e].renderPlugin.dataConfig, n); else {
             const r = this.Z(t, this.options.style);
             let s;
-            void 0 !== i ? (pt(r, e, i), s = r[e].style[i].renderPlugin) : (mt(r, e), s = r[e].renderPlugin), 
+            void 0 !== i ? (pt(r, e, i), s = r[e].style[i].renderPlugin) : (yt(r, e), s = r[e].renderPlugin), 
             s.dataConfig || (s.dataConfig = {}), R(s.dataConfig, n);
         }
         const l = this.getRenderer();
@@ -1508,7 +1511,7 @@ class ct extends t.TileLayer {
             let f = l.options.style;
             Array.isArray(f) || (f = l.Z(e, l.options.style));
             const u = JSON.parse(JSON.stringify(s));
-            return void 0 !== r ? (pt(f, n, r), void 0 === o ? f[n].style[r].symbol = u : f[n].style[r].symbol[o] = u) : (mt(f, n), 
+            return void 0 !== r ? (pt(f, n, r), void 0 === o ? f[n].style[r].symbol = u : f[n].style[r].symbol[o] = u) : (yt(f, n), 
             void 0 === o ? f[n].symbol = u : f[n].symbol[o] = u), c;
         }
         const f = this.getRenderer();
@@ -1661,7 +1664,7 @@ function pt(t, e, n) {
     if (!t[e] || !t[e].style || !t[e].style[n]) throw new Error(`No plugin defined at feature style of ${e} - ${n}`);
 }
 
-function mt(t, e) {
+function yt(t, e) {
     if (!t[e]) throw new Error("No plugin defined at style of " + e);
 }
 
@@ -1670,7 +1673,7 @@ ct.prototype._getTileZoom = function(e) {
 }, ct.registerJSONType("VectorTileLayer"), ct.mergeOptions(ht), ct.registerRenderer("gl", nt), 
 ct.registerRenderer("canvas", null);
 
-class yt extends ct {
+class mt extends ct {
     getTileUrl(t, e, n) {
         const i = this.getMap().getResolution(n);
         return super.getTileUrl(t, e, function(t) {
@@ -1678,11 +1681,11 @@ class yt extends ct {
         }(i));
     }
     static fromJSON(t) {
-        return t && "MapboxVectorTileLayer" === t.type ? new yt(t.id, t.options) : null;
+        return t && "MapboxVectorTileLayer" === t.type ? new mt(t.id, t.options) : null;
     }
 }
 
-yt.registerJSONType("MapboxVectorTileLayer");
+mt.registerJSONType("MapboxVectorTileLayer");
 
 const gt = 12756274 * Math.PI / (256 * Math.pow(2, 20));
 
@@ -1733,7 +1736,7 @@ class vt extends ct {
     de(e) {
         this.ue = new t.Extent(...e);
     }
-    me(t, e) {
+    ye(t, e) {
         N(t) ? lt.getJSON(t, e) : lt.getJSON(t.url, t, e);
     }
     getData() {
@@ -2269,7 +2272,7 @@ let Ct = new Float32Array(1);
 
 class Ft extends t.renderer.CanvasRenderer {
     constructor(...t) {
-        super(...t), this.features = {}, this.ye = {}, this.F = 1, this.ge = {}, this.ve = {}, 
+        super(...t), this.features = {}, this.me = {}, this.F = 1, this.ge = {}, this.ve = {}, 
         this.xe = {}, this.be = {}, this.Ae = {}, this.we = !0, this._e = {
             id: 0,
             pickingId: 0
@@ -2512,7 +2515,7 @@ class Ft extends t.renderer.CanvasRenderer {
         Array.isArray(r) || (r = [ r ]);
         const s = [], o = [], a = this.getMap().getZoom();
         let l, h;
-        l = Array.isArray(e) ? e.map(t => t ? m(t, () => a) : t) : m(e, () => a), h = Array.isArray(e) ? e.map(t => t ? w.genFnTypes(t) : t) : w.genFnTypes(e);
+        l = Array.isArray(e) ? e.map(t => t ? y(t, () => a) : t) : y(e, () => a), h = Array.isArray(e) ? e.map(t => t ? w.genFnTypes(t) : t) : w.genFnTypes(e);
         for (let t = 0; t < r.length; t++) {
             if (!r[t]) continue;
             const i = Array.isArray(e) ? e[t] : e, s = Array.isArray(l) ? l[t] : l, o = Array.isArray(h) ? h[t] : h, a = new _(r, i, s, o, n).getIconAndGlyph();
@@ -2565,8 +2568,8 @@ class Ft extends t.renderer.CanvasRenderer {
             if (n[0].geometry.properties.aFeaIds.indexOf(d) < 0) return this.tn(), this.setToRedraw(), 
             !1;
         }
-        const m = R({}, o), y = p.map(t => this.createVectorPacks(r, s, m, t, n[0], i));
-        return Promise.all(y).then(t => {
+        const y = R({}, o), m = p.map(t => this.createVectorPacks(r, s, y, t, n[0], i));
+        return Promise.all(m).then(t => {
             for (let n = 0; n < t.length; n++) {
                 let i;
                 if (Array.isArray(e)) {
@@ -2651,7 +2654,7 @@ class Ft extends t.renderer.CanvasRenderer {
         const e = t[_t];
         this.features[e] && this.hn(e), this.features[e] = St(t, this._e, this.features[e]);
         const n = this.features[e];
-        return this.cn(n), this.features[e][_t] = e, this.ye[e] = t, e;
+        return this.cn(n), this.features[e][_t] = e, this.me[e] = t, e;
     }
     cn(t) {
         if (!t) return;
@@ -2690,7 +2693,7 @@ class Ft extends t.renderer.CanvasRenderer {
             const s = r.pick(t, e, n.tolerance);
             if (s && s.data && s.data.feature) {
                 const t = s.data.feature;
-                i.push(this.ye[t[_t]]);
+                i.push(this.me[t[_t]]);
             }
         }), i;
     }
@@ -2727,7 +2730,7 @@ class Ft extends t.renderer.CanvasRenderer {
         if (t && t.length) {
             for (let e = 0; e < t.length; e++) {
                 const n = t[e][_t];
-                void 0 !== n && (delete this.ye[n], this.hn(n), delete this.features[n]);
+                void 0 !== n && (delete this.me[n], this.hn(n), delete this.features[n]);
             }
             this.tn(), Et(this);
         }
@@ -2767,12 +2770,12 @@ class Ft extends t.renderer.CanvasRenderer {
         this.tn();
     }
     onGeometryShow(t) {
-        this.mn(t);
+        this.yn(t);
     }
     onGeometryHide(t) {
-        this.mn(t);
+        this.yn(t);
     }
-    mn(t) {
+    yn(t) {
         const e = t.target, n = e[_t], i = this.features[n];
         if (i) {
             const t = e.isVisible();
@@ -2783,10 +2786,10 @@ class Ft extends t.renderer.CanvasRenderer {
                 if (t === i.visible) return;
                 i.visible = t;
             }
-            this.yn(), Et(this);
+            this.mn(), Et(this);
         }
     }
-    yn() {
+    mn() {
         this.Le = !0;
     }
     onGeometryPropertiesChange(t) {
@@ -2804,7 +2807,9 @@ class Ft extends t.renderer.CanvasRenderer {
         this.prepareRequestors(), this.pickingFBO = this.canvas.pickingFBO || this.regl.framebuffer(this.canvas.width, this.canvas.height), 
         this.painter = this.createPainter();
         const e = At.get3DPainterClass("icon"), n = R({}, Mt, Pt);
-        this.Pe = new e(this.regl, this.layer, n, this.layer.options.sceneConfig, 0);
+        this.Pe = new e(this.regl, this.layer, n, this.layer.options.sceneConfig, 0), this.Pe.setTextShaderDefines({
+            REVERSE_MAP_ROTATION_ON_PITCH: 1
+        });
         const i = At.get3DPainterClass("line"), r = R({}, Tt);
         this.Te = new i(this.regl, this.layer, r, this.layer.options.sceneConfig, 0), this.layer.getGeometries() && this.onGeometryAdd(this.layer.getGeometries());
     }
@@ -2920,7 +2925,7 @@ function zt(t, e) {
     if (Object.keys(t).sort().join() !== Object.keys(e.properties || {}).filter(t => 0 === t.indexOf(It)).map(t => t.substring(It.length)).sort().join()) return !1;
     for (const n in t) if (B(t, n)) {
         const i = (It + n).trim();
-        if (y(t[n]) !== y(e.properties[i])) return !1;
+        if (m(t[n]) !== m(e.properties[i])) return !1;
     }
     return !0;
 }
@@ -3366,7 +3371,7 @@ function ee(t, e, n, i, r, s) {
     Object.defineProperty(t, e, {
         enumerable: !0,
         get: function() {
-            const t = Qt(n[i]) || y(n[i]) ? r : n[i];
+            const t = Qt(n[i]) || m(n[i]) ? r : n[i];
             return s ? s(t) : t;
         }
     });
@@ -3444,20 +3449,20 @@ function pe(t, e, n) {
     let h = t.data[s];
     if (!h) {
         if (_e(e[o])) {
-            h = t.data[s] = new n.type(n.width * r.length), me(t, e, n);
+            h = t.data[s] = new n.type(n.width * r.length), ye(t, e, n);
             return Ae(s, t, t.properties[l], a), h;
         }
         return null;
     }
-    return _e(e[o]) ? (me(t, e, n), h) : (h && h.buffer && h.buffer.destroy && h.buffer.destroy(), 
-    delete t.data[s], ye(t, s), null);
+    return _e(e[o]) ? (ye(t, e, n), h) : (h && h.buffer && h.buffer.destroy && h.buffer.destroy(), 
+    delete t.data[s], me(t, s), null);
 }
 
-function me(t, e, n) {
+function ye(t, e, n) {
     const {attrName: i, symbolName: r} = n, s = function(t) {
         if (!t) return be;
         const e = [];
-        for (let n = 0; n < t.length; n++) y(t[n][1]) && !g(t[n][1]).isZoomConstant && e.push(t[n][0]);
+        for (let n = 0; n < t.length; n++) m(t[n][1]) && !g(t[n][1]).isZoomConstant && e.push(t[n][0]);
         return e;
     }(e[r].stops), o = "identity" === e[r].type && function(t, e, n) {
         let {features: i} = n.properties;
@@ -3470,11 +3475,11 @@ function me(t, e, n) {
             const e = i[t] && i[t].feature;
             if (!e) continue;
             const n = e.properties && e.properties[s];
-            if (n && (y(n) && !g(n).isZoomConstant)) return !0;
+            if (n && (m(n) && !g(n).isZoomConstant)) return !0;
         }
         return !1;
     }(n, e[r], t);
-    if (!o && !s.length) return void ye(t, i);
+    if (!o && !s.length) return void me(t, i);
     const a = t.properties, {features: l, aPickingId: h} = a, c = function(t, e, n, i, r) {
         const s = [];
         let o = 0, a = e[0];
@@ -3482,12 +3487,12 @@ function me(t, e, n) {
         a = e[l], o = l);
         return s;
     }(l, h, e[r].property, s, o);
-    if (!c.length) return void ye(t, i);
+    if (!c.length) return void me(t, i);
     const f = t.data[i], u = (fe + i + "Index").trim(), d = (fe + i).trim();
     a[u] = c, a[d] = f.BYTES_PER_ELEMENT ? new f.constructor(f) : new n.type(f.length);
 }
 
-function ye(t, e) {
+function me(t, e) {
     const n = t.properties, i = (fe + e + "Index").trim(), r = (fe + e).trim();
     delete n[i], delete n[r];
 }
@@ -3582,7 +3587,7 @@ function we(t, e, n, i, r, s, o) {
 }
 
 function _e(t) {
-    return t && y(t) && t.property;
+    return t && m(t) && t.property;
 }
 
 const {loginIBLResOnCanvas: Se, logoutIBLResOnCanvas: Me, getIBLResOnCanvas: Pe} = n.pbr.PBRUtils, Te = [], ke = [], Ie = t => 0 === t.getUniform("level"), Oe = t => t.getUniform("level") > 0;
@@ -3844,7 +3849,7 @@ class Ce {
         this.symbolDef[t] = te(n);
         const r = this.Bn[t];
         for (const t in r) delete r[t];
-        const s = this.getMap(), o = m(this.symbolDef[t], () => [ s.getZoom() ]);
+        const s = this.getMap(), o = y(this.symbolDef[t], () => [ s.getZoom() ]);
         for (const t in o) {
             const e = Object.getOwnPropertyDescriptor(o, t);
             e.get ? Object.defineProperty(r, t, {
@@ -3854,7 +3859,7 @@ class Ce {
                 enumerable: !0
             }) : r[t] = o[t];
         }
-        return y(n.visible) && (this.Ln[t] = g(n.visible)), i;
+        return m(n.visible) && (this.Ln[t] = g(n.visible)), i;
     }
     getSymbolDef(t) {
         return this.symbolDef[t.index];
@@ -3869,8 +3874,8 @@ class Ce {
     Dn() {
         const t = this.getMap(), e = () => [ t.getZoom() ];
         this.Bn = [], this.Ln = [];
-        for (let t = 0; t < this.symbolDef.length; t++) this.Bn[t] = m(Zt({}, this.symbolDef[t]), e), 
-        this.symbolDef[t] && y(this.symbolDef[t].visible) && (this.Ln[t] = g(this.symbolDef[t].visible));
+        for (let t = 0; t < this.symbolDef.length; t++) this.Bn[t] = y(Zt({}, this.symbolDef[t]), e), 
+        this.symbolDef[t] && m(this.symbolDef[t].visible) && (this.Ln[t] = g(this.symbolDef[t].visible));
     }
     getFnTypeConfig(t) {
         this.Gn || (this.Gn = []);
@@ -4218,7 +4223,7 @@ class Ne extends He {
             define: "HAS_COLOR",
             evaluate: (e, i, r) => {
                 let s = n(t.getZoom(), e);
-                return y(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e, !0)), Array.isArray(s) || (s = this.colorCache[s] = this.colorCache[s] || O(s).unitArray()), 
+                return m(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e, !0)), Array.isArray(s) || (s = this.colorCache[s] = this.colorCache[s] || O(s).unitArray()), 
                 s = ie(s), s;
             }
         }, {
@@ -4229,7 +4234,7 @@ class Ne extends He {
             define: "HAS_OPACITY",
             evaluate: (e, n, r) => {
                 let s = i(t.getZoom(), e);
-                return y(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e)), o[0] = 255 * s, o[0];
+                return m(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e)), o[0] = 255 * s, o[0];
             }
         }, {
             attrName: "aUVScale",
@@ -4446,7 +4451,7 @@ class Ve extends He {
             define: "HAS_COLOR",
             evaluate: (e, i, r) => {
                 let s = n(t.getZoom(), e);
-                return y(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e, !0)), Array.isArray(s) || (s = this.colorCache[s] = this.colorCache[s] || O(s).unitArray()), 
+                return m(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e, !0)), Array.isArray(s) || (s = this.colorCache[s] = this.colorCache[s] || O(s).unitArray()), 
                 s = ie(s), s;
             }
         }, {
@@ -4482,7 +4487,7 @@ class Ve extends He {
             define: "HAS_LINE_WIDTH",
             evaluate: (e, i, r) => {
                 let s = n(t.getZoom(), e);
-                return y(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e)), a[0] = Math.round(2 * s), 
+                return m(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e)), a[0] = Math.round(2 * s), 
                 a[0];
             }
         }, {
@@ -4523,7 +4528,7 @@ class Ve extends He {
             define: "HAS_OPACITY",
             evaluate: (e, n, r) => {
                 let s = i(t.getZoom(), e);
-                return y(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e)), a[0] = 255 * s, a[0];
+                return m(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e)), a[0] = 255 * s, a[0];
             }
         } ];
     }
@@ -4747,18 +4752,18 @@ class $e extends He {
         const e = this.di.tags[t];
         if (this.hi && e && this.fi) {
             const t = this.getMap();
-            e.anchor0 = t.containerPointToCoord(this.pi), e.anchor1 = t.containerPointToCoord(this.mi), 
+            e.anchor0 = t.containerPointToCoord(this.pi), e.anchor1 = t.containerPointToCoord(this.yi), 
             e.anchor0.z = t.getZoom(), e.anchor0.width = t.width, e.anchor0.height = t.height;
         }
         this.getMap().collisionFrameTime += performance.now() - this.li;
     }
     ui(t) {
-        const e = this.getMap(), n = e.getZoom(), [i, r] = this.yi(t);
-        return !i || !r || i.z !== n || i.width !== e.width || i.height !== e.height || i.distanceTo(this.pi) > 2 || r.distanceTo(this.mi) > 2;
+        const e = this.getMap(), n = e.getZoom(), [i, r] = this.mi(t);
+        return !i || !r || i.z !== n || i.width !== e.width || i.height !== e.height || i.distanceTo(this.pi) > 2 || r.distanceTo(this.yi) > 2;
     }
     gi() {
         const e = this.getMap();
-        this.vi = {}, this.pi = new t.Point(e.width / 2, e.height / 3), this.mi = new t.Point(e.width / 2, 2 * e.height / 3), 
+        this.vi = {}, this.pi = new t.Point(e.width / 2, e.height / 3), this.yi = new t.Point(e.width / 2, 2 * e.height / 3), 
         delete this.hi, this.di || (this.di = {
             tags: {}
         }), this.ai = {
@@ -4788,7 +4793,7 @@ class $e extends He {
         const e = this.layer.options.collisionFrameLimit;
         return t.collisionFrameTime <= e;
     }
-    yi(t) {
+    mi(t) {
         const e = "__meshAnchorKey".trim(), n = this.di.tags[t];
         if (n && n.anchor0) {
             const {anchor0: t, anchor1: i} = n, r = t[e] = t[e] || t.x + "," + t.y, s = i[e] = i[e] || i.x + "," + i.y;
@@ -4807,9 +4812,9 @@ class $e extends He {
         if (h && this._i(c, r)) return !1;
         const u = n.length;
         let d = l[c] && l[c][r];
-        const p = d, m = this.Si && d;
-        if (!(m && 0 !== d.collides) && t) {
-            const t = m && 0 === d.collides;
+        const p = d, y = this.Si && d;
+        if (!(y && 0 !== d.collides) && t) {
+            const t = y && 0 === d.collides;
             if (this.hi || t) if ((this.fi || d && d.z !== a) && (d = null), d) {
                 if (d.boxes && d.boxes.length) {
                     const {boxes: t, isAllowOverlap: e} = d;
@@ -4840,12 +4845,12 @@ class $e extends He {
                 d.collides = t, this.wi(c, r, d);
             }
         }
-        let y = t && d && 0 === d.collides, g = 1, v = !1;
+        let m = t && d && 0 === d.collides, g = 1, v = !1;
         if (this.sceneConfig.fading) {
             const t = this.Pi(e);
-            if (this.Ti) t[r] = y ? 1 : -1; else if (f && delete e.ki, g = this.Ii(f, y, t, r), 
-            f ? (g > 0 && (y = !0), v = this.isBoxFading(e, r), v && this.setToRedraw()) : y || (this.Oi(t, r), 
-            g = 0), y) {
+            if (this.Ti) t[r] = m ? 1 : -1; else if (f && delete e.ki, g = this.Ii(f, m, t, r), 
+            f ? (g > 0 && (m = !0), v = this.isBoxFading(e, r), v && this.setToRedraw()) : m || (this.Oi(t, r), 
+            g = 0), m) {
                 const n = e.ki;
                 if (n && 1 === g && t[r] > 0) {
                     let {fadeOutDelay: t, fadingDuration: e} = this.sceneConfig;
@@ -4856,18 +4861,18 @@ class $e extends He {
             }
         }
         if (d && s.options.debugCollision && this.addCollisionDebugBox(d.boxes, d.collides ? 0 : 1), 
-        y || v) {
+        m || v) {
             const {mesh: t, start: e} = n[0], i = this.getSymbol(t.properties.symbolIndex);
             !this.Ci(i, t, e) && d && d.boxes && this.Fi(d.boxes, t);
         }
-        if (y) {
+        if (m) {
             const t = qe[0] = 255 * g;
             for (let e = 0; e < u; e++) {
                 const {mesh: i, allElements: r, start: s, end: o, boxIndex: a} = n[e];
                 this.setCollisionOpacity(i, r, t, s, o, a);
             }
         }
-        return y && g > 0;
+        return m && g > 0;
     }
     isMeshIterable() {
         return !0;
@@ -5221,7 +5226,7 @@ function rn(t, e, n, i, r) {
 const sn = [], on = [], an = [], ln = [], hn = [], cn = [];
 
 function fn(t, e, n, r, s, o, l, c, f, u, d, p) {
-    const {tileRatio: m, tileResolution: y} = f, g = m / (y / u.getResolution()) * (d / u.cameraToCenterDistance) * p;
+    const {tileRatio: y, tileResolution: m} = f, g = y / (m / u.getResolution()) * (d / u.cameraToCenterDistance) * p;
     h.scale(n, n, g), h.scale(r, r, g), h.scale(s, s, g), h.scale(o, o, g), i.set(sn, n[0], n[1], 0), 
     i.set(on, r[0], r[1], 0), i.set(an, s[0], s[1], 0), i.set(ln, o[0], o[1], 0), i.add(sn, sn, e), 
     i.add(on, on, e), i.add(an, an, e), i.add(ln, ln, e), rn(n, sn, l, u.width, u.height), 
@@ -5242,15 +5247,15 @@ function dn(t, e, n, i, r) {
     return l.set(t, o, -s, s, o);
 }
 
-const pn = [], mn = [], yn = [], gn = [], vn = [], xn = [], bn = [], An = [], wn = [ 1, -1 ], _n = [ 1, 1 ];
+const pn = [], yn = [], mn = [], gn = [], vn = [], xn = [], bn = [], An = [], wn = [ 1, -1 ], _n = [ 1, 1 ];
 
 function Sn(t, e, n, r, s) {
     const o = e.material.uniforms, a = s.cameraToCenterDistance, l = e.geometry.properties, c = this.getSymbol(l.symbolIndex), f = e.geometry.desc.positionSize, u = l.aAnchor, d = i.set(pn, u[n * f], u[n * f + 1], 2 === f ? 0 : u[n * f + 2]);
-    let p = rn(mn, d, r, s.width, s.height);
-    const m = p[2];
-    let y = 1;
+    let p = rn(yn, d, r, s.width, s.height);
+    const y = p[2];
+    let m = 1;
     if (o.markerPerspectiveRatio) {
-        y = Kt(.5 + .5 * (1 - (1 - a / m) * o.markerPerspectiveRatio), 0, 4);
+        m = Kt(.5 + .5 * (1 - (1 - a / y) * o.markerPerspectiveRatio), 0, 4);
     }
     const {aShape: g, aMarkerDx: v, aMarkerDy: x, aMarkerWidth: b, aMarkerHeight: A, aPitchAlign: w, aRotationAlign: _, aRotation: S} = l, M = v ? v[n] : c.markerDx, P = x ? x[n] : c.markerDy, T = w ? w[n] : o.pitchWithMap, k = _ ? _[n] : o.rotateWithMap, I = h.set(An, M || 0, -(P || 0));
     let O = h.set(gn, g[2 * n] / 10, g[2 * n + 1] / 10), C = h.set(vn, g[2 * n + 2] / 10, g[2 * n + 3] / 10), F = h.set(xn, g[2 * n + 4] / 10, g[2 * n + 5] / 10), E = h.set(bn, g[2 * n + 6] / 10, g[2 * n + 7] / 10);
@@ -5265,29 +5270,29 @@ function Sn(t, e, n, r, s) {
     let R = S ? S[n] / 9362 : -(c.markerRotation || 0) * Math.PI / 180;
     const N = s.getBearing() * Math.PI / 180;
     if (N * k || R) {
-        const t = dn(yn, R, N, k, T);
+        const t = dn(mn, R, N, k, T);
         O = h.transformMat2(O, O, t), C = h.transformMat2(C, C, t), F = h.transformMat2(F, F, t), 
         E = h.transformMat2(E, E, t);
     }
-    return 1 === T ? fn(t, d, O, C, F, E, r, I, o, s, m, y) : (h.multiply(O, O, wn), 
-    h.multiply(C, C, wn), h.multiply(F, F, wn), h.multiply(E, E, wn), un(t, p, O, C, F, E, I, y)), 
+    return 1 === T ? fn(t, d, O, C, F, E, r, I, o, s, y, m) : (h.multiply(O, O, wn), 
+    h.multiply(C, C, wn), h.multiply(F, F, wn), h.multiply(E, E, wn), un(t, p, O, C, F, E, I, m)), 
     t;
 }
 
 const Mn = [], Pn = [], Tn = [], kn = [], In = [], On = [], Cn = [ 1, -1 ];
 
 function Fn(t, e, n, i, r, s, o, a, l) {
-    const c = i.material.uniforms, f = l.cameraToCenterDistance, u = i.geometry.properties, d = this.getSymbol(u.symbolIndex), p = "line" === d.textPlacement && !le(d), m = n[2];
-    let y = 1;
+    const c = i.material.uniforms, f = l.cameraToCenterDistance, u = i.geometry.properties, d = this.getSymbol(u.symbolIndex), p = "line" === d.textPlacement && !le(d), y = n[2];
+    let m = 1;
     if (c.textPerspectiveRatio) {
-        y = Kt(.5 + .5 * (1 - (1 - f / m) * c.textPerspectiveRatio), 0, 4);
+        m = Kt(.5 + .5 * (1 - (1 - f / y) * c.textPerspectiveRatio), 0, 4);
     }
     const {aTextDx: g, aTextDy: v, aPitchAlign: x, aRotationAlign: b, aRotation: A} = i.geometry.properties, w = g ? g[o] : d.textDx, _ = v ? v[o] : d.textDy, S = x ? x[o] : c.pitchWithMap, M = b ? b[o] : c.rotateWithMap, P = h.set(On, w || 0, -(_ || 0));
     if (p) {
         const {aOffset: i} = u;
         let r = h.set(Pn, i[2 * o] / 10, i[2 * o + 1] / 10), s = h.set(Tn, i[2 * o + 2] / 10, i[2 * o + 3] / 10), f = h.set(kn, i[2 * o + 4] / 10, i[2 * o + 5] / 10), d = h.set(In, i[2 * o + 6] / 10, i[2 * o + 7] / 10);
-        1 === S ? fn(t, e, r, s, f, d, a, P, c, l, m, y) : (h.multiply(r, r, Cn), h.multiply(s, s, Cn), 
-        h.multiply(f, f, Cn), h.multiply(d, d, Cn), un(t, n, r, s, f, d, P, y));
+        1 === S ? fn(t, e, r, s, f, d, a, P, c, l, y, m) : (h.multiply(r, r, Cn), h.multiply(s, s, Cn), 
+        h.multiply(f, f, Cn), h.multiply(d, d, Cn), un(t, n, r, s, f, d, P, m));
     } else {
         const {aShape: i} = u;
         let s = h.set(Pn, i[2 * o] / 10, i[2 * o + 1] / 10), f = h.set(Tn, i[2 * o + 2] / 10, i[2 * o + 3] / 10), g = h.set(kn, i[2 * o + 4] / 10, i[2 * o + 5] / 10), v = h.set(In, i[2 * o + 6] / 10, i[2 * o + 7] / 10);
@@ -5301,7 +5306,7 @@ function Fn(t, e, n, i, r, s, o, a, l) {
             v = h.transformMat2(v, v, t);
         }
         const w = r / 24;
-        h.scale(s, s, w), h.scale(f, f, w), h.scale(g, g, w), h.scale(v, v, w), 1 === S ? fn(t, e, s, f, g, v, a, P, c, l, m, y) : un(t, n, s, f, g, v, P, y);
+        h.scale(s, s, w), h.scale(f, f, w), h.scale(g, g, w), h.scale(v, v, w), 1 === S ? fn(t, e, s, f, g, v, a, P, c, l, y, m) : un(t, n, s, f, g, v, P, m);
     }
     return s = s || 0, t[0] -= s + 1, t[1] -= s + 1, t[2] += s + 1, t[3] += s + 1, t;
 }
@@ -5377,15 +5382,15 @@ function Dn(t, e, i, r, s, o, a, l, h) {
     s.textOpacity < 1 && (p = !0), e.properties.memorySize = e.getMemorySize(), e.generateBuffers(t, {
         excludeElementsInVAO: !0
     });
-    const m = new n.Material(d, Hn), y = new n.Mesh(e, m, {
+    const y = new n.Material(d, Hn), m = new n.Mesh(e, y, {
         disableVAO: !0,
         transparent: p,
         castShadow: !1,
         picking: !0
     });
-    if (y.setLocalTransform(i), d.isHalo && (y.properties.isHalo = !0), a && y.setDefines({
+    if (m.setLocalTransform(i), d.isHalo && (m.properties.isHalo = !0), a && m.setDefines({
         ENABLE_COLLISION: 1
-    }), c.push(y), d.isHalo) {
+    }), c.push(m), d.isHalo) {
         const t = {
             flipY: 0,
             tileResolution: e.properties.tileResolution,
@@ -5463,19 +5468,19 @@ function Rn(t, e, n) {
 function Nn(t, e) {
     const n = t.getRenderer().canvas;
     return {
-        uniforms: [ "flipY", "textSize", "textDx", "textDy", "textRotation", "cameraToCenterDistance", {
+        uniforms: [ {
             name: "projViewModelMatrix",
             type: "function",
             fn: function(t, e) {
                 return r.multiply([], e.projViewMatrix, e.modelMatrix);
             }
-        }, "textPerspectiveRatio", "texSize", "canvasSize", "glyphSize", "pitchWithMap", "mapPitch", "texture", "gammaScale", "textFill", "textOpacity", "textHaloRadius", "textHaloFill", "textHaloBlur", "textHaloOpacity", "isHalo", {
+        }, {
             name: "zoomScale",
             type: "function",
             fn: function(t, e) {
                 return e.tileResolution / e.resolution;
             }
-        }, "rotateWithMap", "mapRotation", "tileRatio" ],
+        } ],
         extraCommandProps: {
             viewport: {
                 x: 0,
@@ -5520,7 +5525,7 @@ function Nn(t, e) {
 }
 
 function zn(t, e) {
-    const n = g(e.textFill), i = g(e.textSize), r = g(e.textHaloFill), s = g(e.textHaloRadius), o = g(e.textHaloOpacity), a = g(e.textDx), l = g(e.textDy), h = g(e.textOpacity), c = v(e.textPitchAlignment), f = v(e.textRotationAlignment), u = g(e.textRotation), d = v(e.textAllowOverlapFn), p = v(e.textIgnorePlacement), m = {}, x = new Int16Array(1), b = new Uint16Array(1);
+    const n = g(e.textFill), i = g(e.textSize), r = g(e.textHaloFill), s = g(e.textHaloRadius), o = g(e.textHaloOpacity), a = g(e.textDx), l = g(e.textDy), h = g(e.textOpacity), c = v(e.textPitchAlignment), f = v(e.textRotationAlignment), u = g(e.textRotation), d = v(e.textAllowOverlapFn), p = v(e.textIgnorePlacement), y = {}, x = new Int16Array(1), b = new Uint16Array(1);
     return [ {
         attrName: "aTextFill",
         symbolName: "textFill",
@@ -5529,7 +5534,7 @@ function zn(t, e) {
         width: 4,
         evaluate: (e, i, r) => {
             let s = n(t.getZoom(), e);
-            return y(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e, !0)), Array.isArray(s) || (s = m[s] = m[s] || O(s).unitArray()), 
+            return m(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e, !0)), Array.isArray(s) || (s = y[s] = y[s] || O(s).unitArray()), 
             s = ie(s), s;
         }
     }, {
@@ -5540,7 +5545,7 @@ function zn(t, e) {
         width: 1,
         evaluate: (e, n, r) => {
             let s = i(t.getZoom(), e) || Hn.textSize;
-            return y(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e)), x[0] = s, x[0];
+            return m(s) && (s = this.evaluateInFnTypeConfig(s, r, t, e)), x[0] = s, x[0];
         }
     }, {
         attrName: "aTextHaloFill",
@@ -5550,7 +5555,7 @@ function zn(t, e) {
         width: 4,
         evaluate: e => {
             let n = r(t.getZoom(), e);
-            return Array.isArray(n) || (n = m[n] = m[n] || O(n).array()), n = ie(n), n;
+            return Array.isArray(n) || (n = y[n] = y[n] || O(n).array()), n = ie(n), n;
         }
     }, {
         attrName: "aTextHaloRadius",
@@ -5600,7 +5605,7 @@ function zn(t, e) {
         width: 1,
         evaluate: (e, n, i) => {
             let r = h(t.getZoom(), e);
-            return y(r) && (r = this.evaluateInFnTypeConfig(r, i, t, e)), x[0] = 255 * r, x[0];
+            return m(r) && (r = this.evaluateInFnTypeConfig(r, i, t, e)), x[0] = 255 * r, x[0];
         }
     }, {
         attrName: "aPitchAlign",
@@ -5654,14 +5659,14 @@ function Wn(t, e, n, i, r, s, o) {
     const a = this.getMap(), l = e.geometry.properties, h = this.getSymbol(l.symbolIndex), c = "line" === h.textPlacement && !le(h), {aTextSize: f, aTextHaloRadius: u, aShape: d} = l;
     let p = f ? f[n[r]] : e.properties.textSize;
     null == p && (p = Hn.textSize);
-    const m = u ? u[n[r]] : e.properties.textHaloRadius, y = En(Un, e, n[r]), g = rn(Gn, y, o, a.width, a.height), v = i, {boxes: x, collision: b} = this.rr(e, r);
+    const y = u ? u[n[r]] : e.properties.textHaloRadius, m = En(Un, e, n[r]), g = rn(Gn, m, o, a.width, a.height), v = i, {boxes: x, collision: b} = this.rr(e, r);
     let A = 0;
     if (c || 1 === e.material.uniforms.rotateWithMap || h.textRotation) {
         let i = 0;
         for (let s = r; s < r + 6 * v; s += 6) {
             const r = x[A] = x[A] || [];
             A++;
-            const l = Fn.call(this, r, y, g, e, p, m, n[s], o, a);
+            const l = Fn.call(this, r, m, g, e, p, y, n[s], o, a);
             if (!t) {
                 const e = this.isCollides(l);
                 1 === e ? t = 1 : -1 === e && i++;
@@ -5673,7 +5678,7 @@ function Wn(t, e, n, i, r, s, o) {
         for (let h = r; h < s; h += 6) {
             const r = d[2 * n[h] + 1];
             if (l !== r || h === s - 6) {
-                const c = n[h === s - 6 ? h : h - 6], f = Fn.call(this, Vn, y, g, e, p, m, i, o, a), u = Fn.call(this, jn, y, g, e, p, m, c, o, a), d = x[A] = x[A] || [];
+                const c = n[h === s - 6 ? h : h - 6], f = Fn.call(this, Vn, m, g, e, p, y, i, o, a), u = Fn.call(this, jn, m, g, e, p, y, c, o, a), d = x[A] = x[A] || [];
                 A++, d[0] = Math.min(f[0], u[0]), d[1] = Math.min(f[1], u[1]), d[2] = Math.max(f[2], u[2]), 
                 d[3] = Math.max(f[3], u[3]), i = n[h], l = r, !t && this.isCollides(d) && (t = 1);
             }
@@ -5700,7 +5705,7 @@ function Bn(t, e) {
 
 const Xn = [], Yn = [];
 
-var Jn = "#define SHADER_NAME TEXT\n#define RAD 0.0174532925\nattribute vec3 aPosition;\nattribute vec2 aShape;\nattribute vec2 aTexCoord;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nattribute float aRotationAlign;\n#else\nuniform float rotateWithMap;\n#endif\nuniform float flipY;\n#if defined(HAS_ROTATION)\nattribute float aRotation;\n#else\nuniform float textRotation;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float glyphSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vSize;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nattribute vec4 aTextFill;\nvarying vec4 vTextFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nattribute vec4 aTextHaloFill;\nvarying vec4 vTextHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nattribute float aTextHaloRadius;\nvarying float vTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nattribute float aTextHaloOpacity;\nvarying float vTextHaloOpacity;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\nvoid main() {\n  vec3 c = aPosition;\n#ifdef HAS_TEXT_SIZE\nfloat d = aTextSize * layerScale;\n#else\nfloat d = textSize * layerScale;\n#endif\n#ifdef HAS_TEXT_DX\nfloat e = aTextDx;\n#else\nfloat e = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat f = aTextDy;\n#else\nfloat f = textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nfloat h = aPitchAlign;\n#else\nfloat h = pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nfloat i = aRotationAlign;\n#else\nfloat i = rotateWithMap;\n#endif\nvec2 j = aShape / 10.0;\n  if(h == 1. && flipY == .0) {\n    j = j * vec2(1., -1.);\n  }\n  vec2 k = aTexCoord;\n  gl_Position = projViewModelMatrix * vec4(c, 1.);\n  float l = gl_Position.w;\n  float m = (1. - cameraToCenterDistance / l) * textPerspectiveRatio;\n  float n = clamp(.5 + .5 * (1. - m), .0, 4.);\n#ifdef HAS_ROTATION\nfloat o = aRotation / 9362. - mapRotation * i;\n#else\nfloat o = textRotation - mapRotation * i;\n#endif\nif(h == 1.) {\n    o += mapRotation;\n  }\n  float u = sin(o);\n  float v = cos(o);\n  mat2 A = mat2(v, -1. * u, u, v);\n  j = A * (j / glyphSize * d);\n  float B = l / cameraToCenterDistance;\n  if(h == .0) {\n    vec2 C = j * 2. / canvasSize;\n    gl_Position.xy += C * n * l;\n  } else {\n    vec2 C = j;\n    gl_Position = projViewModelMatrix * vec4(c + vec3(C, .0) * tileRatio / zoomScale * B * n, 1.);\n  }\n  gl_Position.xy += vec2(e, -f) * 2. / canvasSize * l;\n#ifndef PICKING_MODE\nif(h == .0) {\n    vGammaScale = mix(1., B, textPerspectiveRatio);\n  } else {\n    vGammaScale = B + mapPitch / 4.;\n  }\n  vTexCoord = k / texSize;\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vSize = d;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\n#endif\n#ifdef HAS_TEXT_FILL\nvTextFill = aTextFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvTextHaloFill = aTextHaloFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvTextHaloRadius = aTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nvTextHaloOpacity = aTextHaloOpacity;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool D = aOpacity == 255.;\n#else\nbool D = true;\n#endif\nfbo_picking_setData(gl_Position.w, D);\n#endif\n}", qn = "#define SHADER_NAME TEXT\n#define SDF_PX 8.0\n#define DEVICE_PIXEL_RATIO 1.0\n#define EDGE_GAMMA 0.105 / DEVICE_PIXEL_RATIO\nprecision mediump float;\nuniform sampler2D texture;\nuniform float textOpacity;\nuniform highp float gammaScale;\nuniform int isHalo;\nuniform highp float textHaloBlur;\n#ifdef HAS_TEXT_HALO_OPACITY\nvarying float vTextHaloOpacity;\n#else\nuniform float textHaloOpacity;\n#endif\nvarying vec2 vTexCoord;\nvarying float vSize;\nvarying float vGammaScale;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nvarying vec4 vTextFill;\n#else\nuniform vec4 textFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvarying vec4 vTextHaloFill;\n#else\nuniform vec4 textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvarying float vTextHaloRadius;\n#else\nuniform highp float textHaloRadius;\n#endif\nvoid main() {\n  \n#ifdef HAS_TEXT_FILL\nvec4 c = vTextFill;\n#else\nvec4 c = textFill;\n#endif\nfloat d = vSize / 24.;\n  lowp vec4 e = c;\n  highp float f = EDGE_GAMMA / (d * gammaScale);\n  lowp float h = 185. / 256.;\n  if(isHalo == 1) {\n    \n#ifdef HAS_TEXT_HALO_FILL\nvec4 i = vTextHaloFill;\n#else\nvec4 i = textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nfloat j = vTextHaloRadius;\n#else\nfloat j = textHaloRadius;\n#endif\ne = i;\n    f = (textHaloBlur * 1.19 / SDF_PX + EDGE_GAMMA) / (d * gammaScale);\n    h = (6. - j / d) / SDF_PX;\n#ifdef HAS_TEXT_HALO_OPACITY\nfloat k = vTextHaloOpacity / 255.;\n#else\nfloat k = textHaloOpacity;\n#endif\ne *= k * 1.25;\n  }\n  float l = texture2D(texture, vTexCoord).a;\n  highp float m = f * vGammaScale * .7;\n  float n = clamp(smoothstep(h - m, h + m, l), .0, 1.);\n  gl_FragColor = e * (n * textOpacity * vOpacity);\n}";
+var Jn = "#define SHADER_NAME TEXT\n#define RAD 0.0174532925\nattribute vec3 aPosition;\nattribute vec2 aShape;\nattribute vec2 aTexCoord;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nattribute float aRotationAlign;\n#else\nuniform float rotateWithMap;\n#endif\nuniform float flipY;\n#if defined(HAS_ROTATION)\nattribute float aRotation;\n#else\nuniform float textRotation;\n#endif\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float glyphSize;\nuniform float mapPitch;\nuniform float mapRotation;\nuniform float zoomScale;\nuniform float tileRatio;\nuniform float layerScale;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vSize;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nattribute vec4 aTextFill;\nvarying vec4 vTextFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nattribute vec4 aTextHaloFill;\nvarying vec4 vTextHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nattribute float aTextHaloRadius;\nvarying float vTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nattribute float aTextHaloOpacity;\nvarying float vTextHaloOpacity;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\nvoid main() {\n  vec3 c = aPosition;\n#ifdef HAS_TEXT_SIZE\nfloat d = aTextSize * layerScale;\n#else\nfloat d = textSize * layerScale;\n#endif\n#ifdef HAS_TEXT_DX\nfloat e = aTextDx;\n#else\nfloat e = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat f = aTextDy;\n#else\nfloat f = textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nfloat h = aPitchAlign;\n#else\nfloat h = pitchWithMap;\n#endif\n#if defined(HAS_ROTATION_ALIGN)\nfloat i = aRotationAlign;\n#else\nfloat i = rotateWithMap;\n#endif\nvec2 j = aShape / 10.0;\n  if(h == 1. && flipY == .0) {\n    j = j * vec2(1., -1.);\n  }\n  vec2 k = aTexCoord;\n  gl_Position = projViewModelMatrix * vec4(c, 1.);\n  float l = gl_Position.w;\n  float m = (1. - cameraToCenterDistance / l) * textPerspectiveRatio;\n  float n = clamp(.5 + .5 * (1. - m), .0, 4.);\n#ifdef HAS_ROTATION\nfloat o = aRotation / 9362. - mapRotation * i;\n#else\nfloat o = textRotation - mapRotation * i;\n#endif\nif(h == 1.) {\n    \n#ifdef REVERSE_MAP_ROTATION_ON_PITCH\no += mapRotation;\n#else\no -= mapRotation;\n#endif\n  }\n  float u = sin(o);\n  float v = cos(o);\n  mat2 A = mat2(v, -1. * u, u, v);\n  j = A * (j / glyphSize * d);\n  float B = l / cameraToCenterDistance;\n  if(h == .0) {\n    vec2 C = j * 2. / canvasSize;\n    gl_Position.xy += C * n * l;\n  } else {\n    vec2 C = j;\n    gl_Position = projViewModelMatrix * vec4(c + vec3(C, .0) * tileRatio / zoomScale * B * n, 1.);\n  }\n  gl_Position.xy += vec2(e, -f) * 2. / canvasSize * l;\n#ifndef PICKING_MODE\nif(h == .0) {\n    vGammaScale = mix(1., B, textPerspectiveRatio);\n  } else {\n    vGammaScale = B + mapPitch / 4.;\n  }\n  vTexCoord = k / texSize;\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vSize = d;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\n#endif\n#ifdef HAS_TEXT_FILL\nvTextFill = aTextFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvTextHaloFill = aTextHaloFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvTextHaloRadius = aTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nvTextHaloOpacity = aTextHaloOpacity;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool D = aOpacity == 255.;\n#else\nbool D = true;\n#endif\nfbo_picking_setData(gl_Position.w, D);\n#endif\n}", qn = "#define SHADER_NAME TEXT\n#define SDF_PX 8.0\n#define DEVICE_PIXEL_RATIO 1.0\n#define EDGE_GAMMA 0.105 / DEVICE_PIXEL_RATIO\nprecision mediump float;\nuniform sampler2D texture;\nuniform float textOpacity;\nuniform highp float gammaScale;\nuniform int isHalo;\nuniform highp float textHaloBlur;\n#ifdef HAS_TEXT_HALO_OPACITY\nvarying float vTextHaloOpacity;\n#else\nuniform float textHaloOpacity;\n#endif\nvarying vec2 vTexCoord;\nvarying float vSize;\nvarying float vGammaScale;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nvarying vec4 vTextFill;\n#else\nuniform vec4 textFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvarying vec4 vTextHaloFill;\n#else\nuniform vec4 textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvarying float vTextHaloRadius;\n#else\nuniform highp float textHaloRadius;\n#endif\nvoid main() {\n  \n#ifdef HAS_TEXT_FILL\nvec4 c = vTextFill;\n#else\nvec4 c = textFill;\n#endif\nfloat d = vSize / 24.;\n  lowp vec4 e = c;\n  highp float f = EDGE_GAMMA / (d * gammaScale);\n  lowp float h = 185. / 256.;\n  if(isHalo == 1) {\n    \n#ifdef HAS_TEXT_HALO_FILL\nvec4 i = vTextHaloFill;\n#else\nvec4 i = textHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nfloat j = vTextHaloRadius;\n#else\nfloat j = textHaloRadius;\n#endif\ne = i;\n    f = (textHaloBlur * 1.19 / SDF_PX + EDGE_GAMMA) / (d * gammaScale);\n    h = (6. - j / d) / SDF_PX;\n#ifdef HAS_TEXT_HALO_OPACITY\nfloat k = vTextHaloOpacity / 255.;\n#else\nfloat k = textHaloOpacity;\n#endif\ne *= k * 1.25;\n  }\n  float l = texture2D(texture, vTexCoord).a;\n  highp float m = f * vGammaScale * .7;\n  float n = clamp(smoothstep(h - m, h + m, l), .0, 1.);\n  gl_FragColor = e * (n * textOpacity * vOpacity);\n}";
 
 const Zn = new Uint16Array(1), Kn = new Int8Array(1);
 
@@ -5754,7 +5759,7 @@ function Qn(t, e) {
             const o = e.markerTextFit, l = a ? a(t.getZoom(), i) : o;
             if ("both" === l || "width" === l) return r;
             let h = n(t.getZoom(), i);
-            return y(h) && (h = this.evaluateInFnTypeConfig(h, s, t, i)), d[0] = h, d[0];
+            return m(h) && (h = this.evaluateInFnTypeConfig(h, s, t, i)), d[0] = h, d[0];
         }
     }, {
         attrName: "aMarkerHeight",
@@ -5766,7 +5771,7 @@ function Qn(t, e) {
             const o = e.markerTextFit, l = a ? a(t.getZoom(), n) : o;
             if ("both" === l || "height" === l) return r;
             let h = i(t.getZoom(), n);
-            return y(h) && (h = this.evaluateInFnTypeConfig(h, s, t, n)), d[0] = h, d[0];
+            return m(h) && (h = this.evaluateInFnTypeConfig(h, s, t, n)), d[0] = h, d[0];
         }
     }, {
         attrName: "aMarkerDx",
@@ -5776,7 +5781,7 @@ function Qn(t, e) {
         define: "HAS_MARKER_DX",
         evaluate: (e, n, i) => {
             let s = r(t.getZoom(), e);
-            return y(s) && (s = this.evaluateInFnTypeConfig(s, i, t, e)), d[0] = s, d[0];
+            return m(s) && (s = this.evaluateInFnTypeConfig(s, i, t, e)), d[0] = s, d[0];
         }
     }, {
         attrName: "aMarkerDy",
@@ -5786,7 +5791,7 @@ function Qn(t, e) {
         define: "HAS_MARKER_DY",
         evaluate: (e, n, i) => {
             let r = s(t.getZoom(), e);
-            return y(r) && (r = this.evaluateInFnTypeConfig(r, i, t, e)), d[0] = r, d[0];
+            return m(r) && (r = this.evaluateInFnTypeConfig(r, i, t, e)), d[0] = r, d[0];
         }
     }, {
         attrName: "aColorOpacity",
@@ -5796,7 +5801,7 @@ function Qn(t, e) {
         define: "HAS_OPACITY",
         evaluate: (e, n, i) => {
             let r = o(t.getZoom(), e);
-            return y(r) && (r = this.evaluateInFnTypeConfig(r, i, t, e)), d[0] = 255 * r, d[0];
+            return m(r) && (r = this.evaluateInFnTypeConfig(r, i, t, e)), d[0] = 255 * r, d[0];
         }
     }, {
         attrName: "aPitchAlign",
@@ -5847,7 +5852,7 @@ function ti(t, e, n, i) {
     if (!n || !i || "none" === i) return;
     const r = function(t, e, n) {
         let i = t.properties.textFitFn;
-        y(n) && (i = t.properties.textFitFn = v(n));
+        m(n) && (i = t.properties.textFitFn = v(n));
         const r = "none" !== n, s = [], o = t.getElements(), a = t.data.aPickingId;
         let l, h, c;
         e && (l = e.getElements(), h = e.data.aPickingId, c = e.data.aCount);
@@ -5861,27 +5866,27 @@ function ti(t, e, n, i) {
                 end: 6 * c[t]
             };
         }
-        let d = !1, p = !1, m = 0;
+        let d = !1, p = !1, y = 0;
         const g = [];
         for (let t = 0; t < o.length; t += 6) {
-            const e = o[t], y = a[e];
-            if (!d && u) for (;u.pickingId < y && u.end < l.length; ) {
+            const e = o[t], m = a[e];
+            if (!d && u) for (;u.pickingId < m && u.end < l.length; ) {
                 const t = u.end, e = l[t];
                 u.start = t, u.end = t + 6 * c[e], u.pickingId = h[e];
             }
-            if (!d && u && u.pickingId < y && (d = !0, !r)) {
+            if (!d && u && u.pickingId < m && (d = !0, !r)) {
                 if (!p) return [];
-                for (let e = t; e < o.length; e += 6) s[m++] = [ -1, -1 ];
+                for (let e = t; e < o.length; e += 6) s[y++] = [ -1, -1 ];
                 return s;
             }
-            const v = f[y] && f[y].feature, x = v && v.properties || {};
+            const v = f[m] && f[m].feature, x = v && v.properties || {};
             x.$layer = v && v.layer, x.$type = v && v.type;
             const b = i ? i(null, x) : n;
-            if (delete x.$layer, delete x.$type, u && y === u.pickingId) {
-                s[m++] = [ u.start, u.end ];
+            if (delete x.$layer, delete x.$type, u && m === u.pickingId) {
+                s[y++] = [ u.start, u.end ];
                 const t = u.end, e = l[t];
                 u.start = t, u.end = t + 6 * c[e], u.pickingId = h[e], p = !0;
-            } else if (b && "none" !== b) for (let e = t; e < t + 6; e++) g.push(e); else s[m++] = [ -1, -1 ];
+            } else if (b && "none" !== b) for (let e = t; e < t + 6; e++) g.push(e); else s[y++] = [ -1, -1 ];
         }
         if (g.length) if (g.length === o.length) t.setElements([]); else {
             const e = [];
@@ -5922,7 +5927,7 @@ function ti(t, e, n, i) {
 function ei(t, e) {
     const n = this.getSymbolDef(e.properties.symbolIndex), i = n.markerTextFit, r = e.properties;
     let s = "both" === i || "width" === i, o = "both" === i || "height" === i;
-    if (y(n.markerTextFit)) {
+    if (m(n.markerTextFit)) {
         let t = e.properties.textFitFn;
         t || (t = e.properties.textFitFn = g(n.markerTextFit));
         const {features: i} = e.properties, a = e.properties.elements || e.elements, {aPickingId: l} = e.data, h = [], c = [];
@@ -5931,7 +5936,7 @@ function ei(t, e) {
             const n = i[l[a[e]]], r = n && n.feature || {}, s = r.properties || {};
             s.$layer = r.layer, s.$type = r.type;
             let o = t(null, s);
-            if (y(o)) {
+            if (m(o)) {
                 o = (s.textFitFn = s.textFitFn || g(o))(null, s);
             }
             delete s.$layer, delete s.$type, "both" === o ? (h.push(e / 6), c.push(e / 6)) : "width" === o ? (f = !1, 
@@ -5963,7 +5968,7 @@ function ei(t, e) {
         e.data.aMarkerHeight = new Uint16Array(c);
     }
     const f = this.getSymbolDef(e.properties.textGeo.properties.symbolIndex), u = g(f.textSize);
-    ni.call(this, t, e), (!y(f.textSize) || u.isZoomConstant && u.isFeatureConstant) && (r.isFitConstant = !0);
+    ni.call(this, t, e), (!m(f.textSize) || u.isZoomConstant && u.isFeatureConstant) && (r.isFitConstant = !0);
 }
 
 function ni(t, e) {
@@ -5973,22 +5978,22 @@ function ni(t, e) {
     if (r.isFitConstant || !r.labelShape || !r.labelShape.length) return;
     const s = this.getSymbolDef(e.properties.symbolIndex), o = this.getSymbolDef(n.properties.symbolIndex).textSize;
     let a;
-    y(o) && (a = i.lr ? i.lr : i.lr = g(o));
+    m(o) && (a = i.lr ? i.lr : i.lr = g(o));
     const l = s.markerTextFitPadding || [ 0, 0, 0, 0 ];
     let h;
-    y(l) && (h = r.hr ? r.hr : r.hr = v(l));
-    const c = t.getZoom(), {fitIcons: f, fitWidthIcons: u, fitHeightIcons: d} = r, {aMarkerWidth: p, aMarkerHeight: m, labelShape: x} = r, b = r.elements || e.elements, {features: A, aPickingId: w} = r, _ = (t, e, n, i) => {
+    m(l) && (h = r.hr ? r.hr : r.hr = v(l));
+    const c = t.getZoom(), {fitIcons: f, fitWidthIcons: u, fitHeightIcons: d} = r, {aMarkerWidth: p, aMarkerHeight: y, labelShape: x} = r, b = r.elements || e.elements, {features: A, aPickingId: w} = r, _ = (t, e, n, i) => {
         const s = x[4 * e], f = x[4 * e + 1], u = x[4 * e + 2], d = x[4 * e + 3];
         if (!(s || f || u || d)) return;
         const b = w[t], _ = A[b] && A[b].feature, S = _ && _.properties || {};
         S.$layer = _ && _.layer, S.$type = _ && _.type;
         let M = a ? a(c, S) : o;
-        if (y(M)) {
+        if (m(M)) {
             M = (S.textSizeFn = S.textSizeFn || g(M))(c, S);
         }
         M /= 24;
         let P, T, k = h ? h(c, S) : l;
-        if (y(k)) {
+        if (m(k)) {
             k = (S.fitPaddingFn = S.fitPaddingFn || v(k))(c, S);
         }
         if (k[0] === k[2] && k[1] === k[3] || (P = r.aPadOffsetX, T = r.aPadOffsetY, P || (P = r.aPadOffsetX = new Int8Array(p.length), 
@@ -6000,9 +6005,9 @@ function ni(t, e) {
                 Kn[0] = e, P[t] !== Kn[0] && (oe(P, e, t, t + 4), P.dirty = !0);
             }
         }
-        if (m && i) {
+        if (y && i) {
             const e = Math.abs((d - f) / 10 * M) + (k[0] + k[2] || 0);
-            if (Zn[0] = e, m[t] !== Zn[0] && (oe(m, Zn[0], t, t + 4), m.dirty = !0), T) {
+            if (Zn[0] = e, y[t] !== Zn[0] && (oe(y, Zn[0], t, t + 4), y.dirty = !0), T) {
                 const e = k[0] - (k[0] + k[2]) / 2;
                 Kn[0] = e, T[t] !== Kn[0] && (oe(T, e, t, t + 4), T.dirty = !0);
             }
@@ -6050,7 +6055,10 @@ class hi extends $e {
     constructor(t, e, n, i, r) {
         super(t, e, n, i, r), this.propAllowOverlap = "markerAllowOverlap", this.propIgnorePlacement = "markerIgnorePlacement", 
         this.Gn = {}, this.isLabelCollides = Wn.bind(this), this.cr = ii.bind(this), this.ur = ri.bind(this), 
-        this.dr = si.bind(this), this.pr = oi.bind(this), this.mr = [];
+        this.dr = si.bind(this), this.pr = oi.bind(this), this.yr = [];
+    }
+    setTextShaderDefines(t) {
+        this.mr = t;
     }
     createFnTypeConfig(t, e) {
         return {
@@ -6059,7 +6067,7 @@ class hi extends $e {
         };
     }
     startFrame(...t) {
-        return this.mr.length = 0, super.startFrame(...t);
+        return this.yr.length = 0, super.startFrame(...t);
     }
     createGeometry(t, e) {
         return t && t.empty && (t.data = {
@@ -6069,8 +6077,8 @@ class hi extends $e {
     }
     postCreateGeometry(t, e) {
         const {geometry: n, symbolIndex: i} = t, r = this.getSymbolDef(i), s = this.getFnTypeConfig(i);
-        if (this.yr(n)) n.properties.iconAtlas ? this.drawDebugAtlas(n.properties.iconAtlas) : n.properties.isEmpty = !0, 
-        $n(n, r, s.icon); else if (this.gr(n) && le(r)) {
+        if (this.gr(n)) n.properties.iconAtlas ? this.drawDebugAtlas(n.properties.iconAtlas) : n.properties.isEmpty = !0, 
+        $n(n, r, s.icon); else if (this.vr(n) && le(r)) {
             const t = e[e.length - 1];
             if (t) {
                 const {geometry: e, symbolIndex: s} = t;
@@ -6081,7 +6089,7 @@ class hi extends $e {
             }
         }
     }
-    vr(t) {
+    xr(t) {
         if (!this.layer.options.collision) return;
         const {collideIds: e, elements: n, aCount: i} = t.properties, r = e, s = {};
         if (!n) return void (t.properties.collideBoxIndex = s);
@@ -6095,7 +6103,7 @@ class hi extends $e {
         const s = this.isEnableCollision(), o = this.layer, {geometry: a, symbolIndex: l} = t;
         a.properties.symbolIndex = l;
         const h = this.getSymbolDef(l), c = this.getSymbol(l), f = this.getFnTypeConfig(l), u = [];
-        if (this.yr(a)) {
+        if (this.gr(a)) {
             const t = function(t, e, i, r, s, o, a, l, h) {
                 if (e.isDisposed() || 0 === e.data.aPosition.length) return null;
                 const c = e.properties.iconAtlas;
@@ -6138,25 +6146,25 @@ class hi extends $e {
                 d;
             }(this.regl, a, e, 0, c, f.icon, o.options.collision, !s, this.isEnableUniquePlacement());
             t && (delete t.geometry.properties.glyphAtlas, u.push(t));
-        } else if (this.gr(a)) {
+        } else if (this.vr(a)) {
             const t = Dn.call(this, this.regl, a, e, h, c, f.text, o.options.collision, !s, this.isEnableUniquePlacement());
             t.length && (t.forEach(t => {
                 delete t.geometry.properties.iconAtlas;
             }), u.push(...t));
         }
-        return "line" === h.markerPlacement && this.xr(a, r), "line" !== h.markerPlacement && "line" !== h.textPlacement || u.forEach(t => t.properties.isLinePlacement = !0), 
-        this.vr(a), u;
+        return "line" === h.markerPlacement && this.br(a, r), "line" !== h.markerPlacement && "line" !== h.textPlacement || u.forEach(t => t.properties.isLinePlacement = !0), 
+        this.xr(a), u;
     }
-    xr(t, e) {
+    br(t, e) {
         const {collideIds: n} = t.properties, i = new Uint16Array(n.length);
-        if (this.yr(t)) {
+        if (this.gr(t)) {
             let r = 0;
             for (let t = 0; t < n.length; t += 4) i.fill(r++, t, t + 4);
             t.properties.collideIds = i, t.properties.uniqueCollideIds = ce(i), e.markerCollideMap = {
                 old: n,
                 new: i
             };
-        } else if (this.gr(t)) {
+        } else if (this.vr(t)) {
             const {collideIds: n, aCount: i} = t.properties;
             if (!i) return;
             if (e.markerCollideMap) {
@@ -6183,7 +6191,7 @@ class hi extends $e {
         if (this.Gi() && t.length > 0) {
             const e = new Be(t);
             e.properties.uniqueCollideIds = t[0].geometry.properties.uniqueCollideIds, e.properties.meshKey = t[0].properties.meshKey, 
-            e.properties.level = t[0].properties.level, this.mr.push(e);
+            e.properties.level = t[0].properties.level, this.yr.push(e);
         }
         for (let e = 0; e < t.length; e++) {
             if (!this.isMeshIterable(t[e])) continue;
@@ -6206,31 +6214,31 @@ class hi extends $e {
         if (!this.Gi()) return;
         super.updateCollision(t);
         const e = this.scene.getMeshes();
-        e && e.length ? (this.br(t.timestamp), this.mr = [], this.xi()) : this.xi();
+        e && e.length ? (this.Ar(t.timestamp), this.yr = [], this.xi()) : this.xi();
     }
     callCurrentTileShader(t, e) {
         this.shader.filter = e.sceneFilter ? [ this.cr, e.sceneFilter ] : this.cr, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
-        this.Ar.filter = e.sceneFilter ? [ this.dr, e.sceneFilter ] : this.dr, this.renderer.render(this.Ar, t, this.scene, this.getRenderFBO(e));
+        this.wr.filter = e.sceneFilter ? [ this.dr, e.sceneFilter ] : this.dr, this.renderer.render(this.wr, t, this.scene, this.getRenderFBO(e));
     }
     callBackgroundTileShader(t, e) {
         this.shader.filter = e.sceneFilter ? [ this.ur, e.sceneFilter ] : this.ur, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
-        this.Ar.filter = e.sceneFilter ? [ this.pr, e.sceneFilter ] : this.pr, this.renderer.render(this.Ar, t, this.scene, this.getRenderFBO(e));
+        this.wr.filter = e.sceneFilter ? [ this.pr, e.sceneFilter ] : this.pr, this.renderer.render(this.wr, t, this.scene, this.getRenderFBO(e));
     }
     isMeshIterable(t) {
         return t && t.geometry && !t.geometry.properties.isEmpty && t.material && !t.material.get("isHalo") && this.isMeshVisible(t) && !(this.shouldIgnoreBackground() && !this.layer.getRenderer().isForeground(t));
     }
-    br() {
+    Ar() {
         if (!this.Gi()) return;
-        let t = this.mr;
-        t && t.length && this.wr(t);
+        let t = this.yr;
+        t && t.length && this._r(t);
     }
-    _r(t, e, n, i) {
+    Sr(t, e, n, i) {
         return this.updateBoxCollisionFading(!0, t, e, n, i);
     }
     isEnableUniquePlacement() {
         return this.isEnableCollision() && !0 === this.sceneConfig.uniquePlacement;
     }
-    wr(t) {
+    _r(t) {
         const e = this.layer.getRenderer();
         t = t.sort(ci);
         for (let n = 0; n < t.length; n++) {
@@ -6245,12 +6253,12 @@ class hi extends $e {
             const s = e.isForeground(i.meshes[0]);
             if (this.shouldIgnoreBackground() && !s) continue;
             const o = i.properties.meshKey;
-            this.startMeshCollision(i), this.Sr(i), this.forEachBox(i, this._r), this.Mr(i), 
+            this.startMeshCollision(i), this.Mr(i), this.forEachBox(i, this.Sr), this.Pr(i), 
             this.endMeshCollision(o);
-            for (let t = 0; t < i.meshes.length; t++) this.Pr(i.meshes[t]);
+            for (let t = 0; t < i.meshes.length; t++) this.Tr(i.meshes[t]);
         }
     }
-    Pr(t) {
+    Tr(t) {
         const e = t && t.geometry && t.geometry.properties.aOpacity;
         e && e.dirty && (t.geometry.updateData("aOpacity", e), e.dirty = !1);
     }
@@ -6260,11 +6268,11 @@ class hi extends $e {
         const i = {
             boxIndex: 0
         }, r = n.length;
-        for (let s = 0; s < r; s++) this.Tr(t, n[s], e, i);
+        for (let s = 0; s < r; s++) this.kr(t, n[s], e, i);
     }
-    Tr(t, e, n, i) {
+    kr(t, e, n, i) {
         const s = this.getMap(), {collideBoxIndex: o} = t.meshes[0].geometry.properties;
-        if (!o[e]) return !1;
+        if (!(o && o[e])) return !1;
         const a = r.multiply(ai, s.projViewMatrix, t.meshes[0].localTransform);
         let l, h = !1;
         const c = t.meshes;
@@ -6286,21 +6294,21 @@ class hi extends $e {
             const [a, f, d] = o;
             let p = 1;
             r && (p = r[i[a]]);
-            const m = a + 0 * p * 6;
-            l[u].mesh = c[t], l[u].start = m, l[u].end = f, l[u].boxCount = d, l[u].allElements = i, 
+            const y = a + 0 * p * 6;
+            l[u].mesh = c[t], l[u].start = y, l[u].end = f, l[u].boxCount = d, l[u].allElements = i, 
             u++;
         }
         if (!h) return !1;
-        return n.call(this, t, l, a, i.boxIndex++) && this.kr(t, e), !0;
+        return n.call(this, t, l, a, i.boxIndex++) && this.Ir(t, e), !0;
     }
-    Sr(t) {
+    Mr(t) {
         const e = t.meshes;
         for (let t = 0; t < e.length; t++) {
             const n = e[t], i = n && n.geometry;
             i && (i.properties.visElemts.count = 0);
         }
     }
-    kr(t, e) {
+    Ir(t, e) {
         const n = t.meshes;
         for (let t = 0; t < n.length; t++) {
             const i = n[t];
@@ -6315,7 +6323,7 @@ class hi extends $e {
             a.count = f;
         }
     }
-    Mr(t) {
+    Pr(t) {
         const e = t.meshes;
         for (let t = 0; t < e.length; t++) {
             const n = e[t], i = n && n.geometry;
@@ -6325,7 +6333,7 @@ class hi extends $e {
         }
     }
     isBoxCollides(t, e, n, i, r, s) {
-        if (this.gr(t.geometry)) return Wn.call(this, 0, t, e, n, i, r, s);
+        if (this.vr(t.geometry)) return Wn.call(this, 0, t, e, n, i, r, s);
         if (t.geometry.properties.isEmpty) return li;
         const o = this.getMap(), {boxes: a, collision: l} = this.rr(t, i);
         let h = 0, c = 0, f = 0;
@@ -6361,13 +6369,13 @@ class hi extends $e {
         this.shader = new n.MeshShader({
             vert: en,
             frag: "#define SHADER_NAME MARKER\nprecision mediump float;\nuniform sampler2D texture;\nuniform lowp float markerOpacity;\nuniform lowp float blendSrcIsOne;\nvarying vec2 vTexCoord;\nvarying float vOpacity;\nvoid main() {\n  gl_FragColor = texture2D(texture, vTexCoord) * markerOpacity * vOpacity;\n  if(blendSrcIsOne == 1.) {\n    gl_FragColor *= gl_FragColor.a;\n  }\n}",
-            uniforms: [ "flipY", "markerWidth", "markerHeight", "markerDx", "markerDy", "markerRotation", "cameraToCenterDistance", {
+            uniforms: [ {
                 name: "projViewModelMatrix",
                 type: "function",
                 fn: function(t, e) {
                     return r.multiply([], e.projViewMatrix, e.modelMatrix);
                 }
-            }, "texSize", "canvasSize", "iconSize", "pitchWithMap", "mapPitch", "markerPerspectiveRatio", "texture", "rotateWithMap", "mapRotation", "tileRatio", {
+            }, {
                 name: "zoomScale",
                 type: "function",
                 fn: function(t, e) {
@@ -6393,22 +6401,23 @@ class hi extends $e {
                 }
             }
         });
-        const {uniforms: s, extraCommandProps: o} = Nn.call(this, this.layer, this.sceneConfig);
-        if (this.Ar = new n.MeshShader({
+        const {uniforms: s, extraCommandProps: o} = Nn.call(this, this.layer, this.sceneConfig), a = this.mr || {};
+        if (this.wr = new n.MeshShader({
             vert: Jn,
             frag: qn,
             uniforms: s,
-            extraCommandProps: o
+            extraCommandProps: o,
+            defines: a
         }), this.pickingFBO) {
             const t = new n.FBORayPicking(this.renderer, {
                 vert: "#define PICKING_MODE 1\n" + en,
-                uniforms: [ "flipY", "markerWidth", "markerHeight", "markerDx", "markerDy", "markerRotation", "cameraToCenterDistance", {
+                uniforms: [ {
                     name: "projViewModelMatrix",
                     type: "function",
                     fn: function(t, e) {
                         return r.multiply([], e.projViewMatrix, e.modelMatrix);
                     }
-                }, "canvasSize", "iconSize", "pitchWithMap", "mapPitch", "markerPerspectiveRatio", "rotateWithMap", "mapRotation", "tileRatio", {
+                }, {
                     name: "zoomScale",
                     type: "function",
                     fn: function(t, e) {
@@ -6447,15 +6456,15 @@ class hi extends $e {
         };
     }
     getUniqueEntryKey(t, e) {
-        if (!this.gr(t.geometry)) return null;
+        if (!this.vr(t.geometry)) return null;
         const {elements: n} = t.geometry.properties;
         return Bn(t, n[e]);
     }
-    yr(t) {
+    gr(t) {
         const {symbolIndex: e} = t.properties;
         return 0 === e.type;
     }
-    gr(t) {
+    vr(t) {
         const {symbolIndex: e} = t.properties;
         return 1 === e.type;
     }
@@ -6468,37 +6477,37 @@ function ci(t, e) {
 const fi = [], ui = [], di = [];
 
 function pi(t, e, n, r, s, o, a, l) {
-    const {aGlyphOffset: c, aSegment: f, aTextDx: u, aTextDy: d, symbolIndex: p} = e.geometry.properties, m = this.getSymbol(p), y = u ? u[s] : m.textDx, g = d ? d[s] : m.textDy, v = h.set(di, y || 0, g || 0), x = h.set(fi, c[2 * s], c[2 * s + 1]), b = i.set(ui, f[3 * s], f[3 * s + 1], f[3 * s + 2]);
+    const {aGlyphOffset: c, aSegment: f, aTextDx: u, aTextDy: d, symbolIndex: p} = e.geometry.properties, y = this.getSymbol(p), m = u ? u[s] : y.textDx, g = d ? d[s] : y.textDy, v = h.set(di, m || 0, g || 0), x = h.set(fi, c[2 * s], c[2 * s + 1]), b = i.set(ui, f[3 * s], f[3 * s + 1], f[3 * s + 2]);
     return function(t, e, n, i, r, s, o, a, l, h, c, f) {
         const u = i[0] * h, d = c ? u - r : u + r;
-        let p = d > 0 ? 1 : -1, m = 0;
-        c && (p *= -1, m = Math.PI), p < 0 && (m += Math.PI);
-        const y = a + l, g = Math.abs(d);
+        let p = d > 0 ? 1 : -1, y = 0;
+        c && (p *= -1, y = Math.PI), p < 0 && (y += Math.PI);
+        const m = a + l, g = Math.abs(d);
         let v = p > 0 ? o : o + 1, x = E.convert(n), b = E.convert(n), A = 0, w = 0;
         for (;A + w <= g; ) {
-            if (v += p, v < a || v >= y) return null;
+            if (v += p, v < a || v >= m) return null;
             b.x = x.x, b.y = x.y, x.x = e[3 * v], x.y = e[3 * v + 1], A += w, w = b.dist(x) / f;
         }
-        const _ = (g - A) / w, S = x.sub(b), M = S.mult(_).Ir(b);
-        M.Ir(S.Fr().Cr().Or(s * p));
-        const P = m + Math.atan2(x.y - b.y, x.x - b.x);
+        const _ = (g - A) / w, S = x.sub(b), M = S.mult(_).Or(b);
+        M.Or(S.Er().Fr().Cr(s * p));
+        const P = y + Math.atan2(x.y - b.y, x.x - b.x);
         return t[0] = (M.x - n[0]) / f, t[1] = (M.y - n[1]) / f, t[2] = P, t;
     }(t, r, o, x, v[0], v[1], b[0], b[1], b[2], n / 24, l, a);
 }
 
-const mi = [], yi = [];
+const yi = [], mi = [];
 
 function gi(t, e, n, r, s, o, a, l, c, f, u) {
     const {aVertical: d} = n.geometry.properties, p = d[o];
-    let m, y, g = pi.call(this, mi, n, r, s, o, l, c, !1);
+    let y, m, g = pi.call(this, yi, n, r, s, o, l, c, !1);
     if (!g) return null;
-    if (i.copy(t, g), g = pi.call(this, yi, n, r, s, a, l, c, !1), !g) return null;
-    if (i.copy(e, g), u && (h.transformMat2(mi, mi, u), h.transformMat2(yi, yi, u)), 
+    if (i.copy(t, g), g = pi.call(this, mi, n, r, s, a, l, c, !1), !g) return null;
+    if (i.copy(e, g), u && (h.transformMat2(yi, yi, u), h.transformMat2(mi, mi, u)), 
     p) {
-        const t = Math.abs(yi[1] - mi[1]), e = Math.abs(yi[0] - mi[0]) * f;
-        y = mi[0] > yi[0] ? 1 : 0, t > e ? (m = 1, y = mi[1] < yi[1] ? 0 : 1) : m = 0;
-    } else m = 0, y = mi[0] > yi[0] ? 1 : 0;
-    return 2 * y + m;
+        const t = Math.abs(mi[1] - yi[1]), e = Math.abs(mi[0] - yi[0]) * f;
+        m = yi[0] > mi[0] ? 1 : 0, t > e ? (y = 1, m = yi[1] < mi[1] ? 0 : 1) : y = 0;
+    } else y = 0, m = yi[0] > mi[0] ? 1 : 0;
+    return 2 * m + y;
 }
 
 var vi = "#define SHADER_NAME TEXT_LINE\nattribute vec3 aPosition;\nattribute vec2 aTexCoord;\nattribute vec2 aOffset;\n#ifdef ENABLE_COLLISION\nattribute float aOpacity;\n#endif\n#ifdef HAS_OPACITY\nattribute float aColorOpacity;\n#endif\n#ifdef HAS_TEXT_SIZE\nattribute float aTextSize;\n#else\nuniform float textSize;\n#endif\n#ifdef HAS_TEXT_DX\nattribute float aTextDx;\n#else\nuniform float textDx;\n#endif\n#ifdef HAS_TEXT_DY\nattribute float aTextDy;\n#else\nuniform float textDy;\n#endif\n#if defined(HAS_PITCH_ALIGN)\nattribute float aPitchAlign;\n#else\nuniform float pitchWithMap;\n#endif\nuniform float zoomScale;\nuniform float cameraToCenterDistance;\nuniform mat4 projViewModelMatrix;\nuniform float textPerspectiveRatio;\nuniform float mapPitch;\nuniform vec2 texSize;\nuniform vec2 canvasSize;\nuniform float tileRatio;\nuniform float layerScale;\n#ifndef PICKING_MODE\nvarying vec2 vTexCoord;\nvarying float vGammaScale;\nvarying float vSize;\nvarying float vOpacity;\n#ifdef HAS_TEXT_FILL\nattribute vec4 aTextFill;\nvarying vec4 vTextFill;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nattribute vec4 aTextHaloFill;\nvarying vec4 vTextHaloFill;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nattribute float aTextHaloRadius;\nvarying float vTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nattribute float aTextHaloOpacity;\nvarying float vTextHaloOpacity;\n#endif\n#else\n#include <fbo_picking_vert>\n#endif\nvoid main() {\n  vec3 c = aPosition;\n#ifdef HAS_TEXT_DX\nfloat d = aTextDx;\n#else\nfloat d = textDx;\n#endif\n#ifdef HAS_TEXT_DY\nfloat e = aTextDy;\n#else\nfloat e = textDy;\n#endif\n#ifdef HAS_TEXT_SIZE\nfloat f = aTextSize * layerScale;\n#else\nfloat f = textSize * layerScale;\n#endif\n#ifdef HAS_PITCH_ALIGN\nfloat h = aPitchAlign;\n#else\nfloat h = pitchWithMap;\n#endif\ngl_Position = projViewModelMatrix * vec4(c, 1.);\n  float i = gl_Position.w;\n  float j = i / cameraToCenterDistance;\n  float k = (1. - cameraToCenterDistance / i) * textPerspectiveRatio;\n  float l = clamp(.5 + .5 * (1. - k), .0, 4.);\n  vec2 m = aOffset / 10.0;\n  vec2 n = aTexCoord;\n  if(h == 1.) {\n    gl_Position = projViewModelMatrix * vec4(c + vec3(m, .0) * tileRatio / zoomScale * j * l, 1.);\n  } else {\n    gl_Position.xy += m * 2. / canvasSize * l * i;\n  }\n  gl_Position.xy += vec2(d, -e) * 2. / canvasSize * i;\n#ifndef PICKING_MODE\nif(h == 1.) {\n    vGammaScale = j + mapPitch / 4.;\n  } else {\n    vGammaScale = mix(1., j, textPerspectiveRatio);\n  }\n  vGammaScale = clamp(vGammaScale, .0, 1.);\n  vTexCoord = n / texSize;\n  vSize = f;\n#ifdef ENABLE_COLLISION\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity *= aColorOpacity / 255.;\n#endif\n#ifdef HAS_TEXT_FILL\nvTextFill = aTextFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_FILL\nvTextHaloFill = aTextHaloFill / 255.;\n#endif\n#ifdef HAS_TEXT_HALO_RADIUS\nvTextHaloRadius = aTextHaloRadius;\n#endif\n#ifdef HAS_TEXT_HALO_OPACITY\nvTextHaloOpacity = aTextHaloOpacity;\n#endif\n#else\n#ifdef ENABLE_COLLISION\nbool o = aOpacity == 255.;\n#else\nbool o = true;\n#endif\nfbo_picking_setData(gl_Position.w, o);\n#endif\n}";
@@ -6520,19 +6529,19 @@ const xi = function(t) {
 class Li extends $e {
     constructor(t, e, n, i, r) {
         super(t, e, n, i, r), this.propAllowOverlap = "textAllowOverlap", this.propIgnorePlacement = "textIgnorePlacement", 
-        this.colorCache = {}, this.Er = xi.bind(this), this.Hr = bi.bind(this), this.Dr = Ai.bind(this), 
-        this.Lr = wi.bind(this), this.isLabelCollides = Wn.bind(this), this.Rr();
+        this.colorCache = {}, this.Hr = xi.bind(this), this.Dr = bi.bind(this), this.Lr = Ai.bind(this), 
+        this.Rr = wi.bind(this), this.isLabelCollides = Wn.bind(this), this.Nr();
     }
-    Rr() {
-        this.Nr = [];
+    Nr() {
+        this.zr = [];
         for (let t = 0; t < this.symbolDef.length; t++) {
             const e = this.symbolDef[t];
-            y(e.textName) && (this.Nr[t] = g(e.textName));
+            m(e.textName) && (this.zr[t] = g(e.textName));
         }
     }
     updateSymbol(...t) {
         const e = super.updateSymbol(...t);
-        return this.Rr(), e;
+        return this.Nr(), e;
     }
     shouldDeleteMeshOnUpdateSymbol(t) {
         if (!Array.isArray(t)) return (0 === t.textHaloRadius || 0 === this.symbolDef[0].textHaloRadius) && t.textHaloRadius !== this.symbolDef[0].textHaloRadius;
@@ -6560,24 +6569,24 @@ class Li extends $e {
         r.properties.symbolIndex = s;
         const o = this.getSymbol(s), a = this.getSymbolDef(s), l = this.getFnTypeConfig(s), h = Dn.call(this, this.regl, r, e, a, o, l, this.layer.options.collision, !n, i);
         if (h.length) {
-            "line" === o.textPlacement ? this.zr = !0 : this.Vr = !0;
+            "line" === o.textPlacement ? this.Vr = !0 : this.jr = !0;
         }
         return h;
     }
     updateCollision(t) {
         super.updateCollision(t);
         const e = this.scene.getMeshes();
-        e && e.length ? (this.jr = {}, this.Ur(t.timestamp), this.xi()) : this.xi();
+        e && e.length ? (this.Ur = {}, this.Gr(t.timestamp), this.xi()) : this.xi();
     }
     callCurrentTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.Er, e.sceneFilter ] : this.Er, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
-        this.Gr.filter = e.sceneFilter ? [ this.Dr, e.sceneFilter ] : this.Dr, this.renderer.render(this.Gr, t, this.scene, this.getRenderFBO(e));
+        this.shader.filter = e.sceneFilter ? [ this.Hr, e.sceneFilter ] : this.Hr, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
+        this.Wr.filter = e.sceneFilter ? [ this.Lr, e.sceneFilter ] : this.Lr, this.renderer.render(this.Wr, t, this.scene, this.getRenderFBO(e));
     }
     callBackgroundTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.Hr, e.sceneFilter ] : this.Hr, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
-        this.Gr.filter = e.sceneFilter ? [ this.Lr, e.sceneFilter ] : this.Lr, this.renderer.render(this.Gr, t, this.scene, this.getRenderFBO(e));
+        this.shader.filter = e.sceneFilter ? [ this.Dr, e.sceneFilter ] : this.Dr, this.renderer.render(this.shader, t, this.scene, this.getRenderFBO(e)), 
+        this.Wr.filter = e.sceneFilter ? [ this.Rr, e.sceneFilter ] : this.Rr, this.renderer.render(this.Wr, t, this.scene, this.getRenderFBO(e));
     }
-    Ur() {
+    Gr() {
         let t = this.scene.getMeshes();
         if (!t || !t.length) return;
         const e = -this.getMap().getBearing() * Math.PI / 180, n = l.fromRotation(Mi, e), i = (t, e, n, i) => {
@@ -6599,7 +6608,7 @@ class Li extends $e {
             const c = o.properties.meshKey;
             if ("line" === h.textPlacement) {
                 if (!l.properties.line) continue;
-                r && this.startMeshCollision(o), this.Wr(o, n);
+                r && this.startMeshCollision(o), this.Br(o, n);
                 const {aOffset: t, aOpacity: e} = l.properties;
                 t.dirty && (l.updateData("aOffset", t), t.dirty = !1), e && e.dirty && (l.updateData("aOpacity", e), 
                 e.dirty = !1), r && this.endMeshCollision(c);
@@ -6624,7 +6633,7 @@ class Li extends $e {
     getUniqueEntryKey(t, e) {
         return Bn(t, e);
     }
-    Wr(t, e) {
+    Br(t, e) {
         const n = this.getMap(), i = t.geometry, s = i.properties, o = this.layer.getRenderer().isForeground(t);
         if (this.shouldIgnoreBackground() && !o) return;
         let a = s.line;
@@ -6632,12 +6641,12 @@ class Li extends $e {
         const l = 1 === t.material.uniforms.pitchWithMap, h = s.elements;
         if (!l) {
             const e = r.multiply(_i, n.projViewMatrix, t.localTransform), i = new Array(a.length);
-            a = this.Br(i, a, e, n.width, n.height);
+            a = this.Xr(i, a, e, n.width, n.height);
         }
         const c = this.Gi(), f = i.properties.visElemts = i.properties.visElemts || new h.constructor(h.length);
         c && (f.count = 0), this.forEachBox(t, (t, n, i, r) => {
             const {start: s, end: o} = n[0];
-            let u = this.Xr(t, h, s, o, a, i, l ? e : null, r);
+            let u = this.Yr(t, h, s, o, a, i, l ? e : null, r);
             if (c && (u = this.updateBoxCollisionFading(u, t, n, i, r), u)) {
                 let t = f.count;
                 for (let e = s; e < o; e++) f[t++] = h[e];
@@ -6645,53 +6654,53 @@ class Li extends $e {
             }
         }), !c || f.count === h.length && i.count === f.count || i.setElements(f, f.count);
     }
-    Br(t, e, n, i, r) {
+    Xr(t, e, n, i, r) {
         const s = e.id + "-" + n.join();
-        if (this.jr[s]) return this.jr[s];
+        if (this.Ur[s]) return this.Ur[s];
         const o = function(t, e, n, i, r) {
             const s = [];
             for (let o = 0; o < e.length; o += 3) a.set(s, e[o], e[o + 1], e[o + 2], 1), rn(s, s, n, i, r), 
             t[o] = s[0], t[o + 1] = s[1], t[o + 2] = e[o + 2];
             return t;
         }(t, e, n, i, r);
-        return this.jr[s] = o, o;
+        return this.Ur[s] = o, o;
     }
     forEachBox(t, e) {
         const n = this.getMap(), i = r.multiply(_i, n.projViewMatrix, t.localTransform), {collideIds: s, aCount: o, features: a, elements: l} = t.geometry.properties, h = s, c = this.isEnableUniquePlacement(), f = this.sr(1);
         f[0].allElements = l, f[0].mesh = t;
-        let u = 0, d = l[0], p = 0, m = h[d];
-        for (let n = 0; n <= l.length; n += 6) if (d = l[n], h[d] !== m || n === l.length) {
-            const r = a[m] && a[m].feature;
+        let u = 0, d = l[0], p = 0, y = h[d];
+        for (let n = 0; n <= l.length; n += 6) if (d = l[n], h[d] !== y || n === l.length) {
+            const r = a[y] && a[y].feature;
             if (c && this.isMeshUniquePlaced(t) && r && !r.label) {
                 const e = r.properties || {};
                 e.$layer = r.layer, e.$type = r.type;
-                const i = Ni(this.Nr[n] ? this.Nr[n](null, e) : this.getSymbol(t.properties.symbolIndex).textName, e);
+                const i = Ni(this.zr[n] ? this.zr[n](null, e) : this.getSymbol(t.properties.symbolIndex).textName, e);
                 delete e.$layer, delete e.$type, r.label = i;
             }
-            const s = n, y = o[l[p]];
-            for (let n = p; n < s; n += 6 * y) f[0].start = n, f[0].end = n + 6 * y, f[0].boxCount = y, 
+            const s = n, m = o[l[p]];
+            for (let n = p; n < s; n += 6 * m) f[0].start = n, f[0].end = n + 6 * m, f[0].boxCount = m, 
             e.call(this, t, f, i, u++);
-            m = h[d], p = n;
+            y = h[d], p = n;
         }
     }
-    Xr(t, e, n, r, s, o, l) {
-        const c = this.Gi(), f = this.getMap(), u = t.geometry, d = u.desc.positionSize, {aShape: p, aOffset: m, aAnchor: y} = u.properties, g = u.properties.aTextSize, v = !l, x = e[n] * d;
-        let b = i.set(Pi, y[x], y[x + 1], 2 === d ? 0 : y[x + 2]);
+    Yr(t, e, n, r, s, o, l) {
+        const c = this.Gi(), f = this.getMap(), u = t.geometry, d = u.desc.positionSize, {aShape: p, aOffset: y, aAnchor: m} = u.properties, g = u.properties.aTextSize, v = !l, x = e[n] * d;
+        let b = i.set(Pi, m[x], m[x + 1], 2 === d ? 0 : m[x + 2]);
         const A = rn(Ti, b, o, f.width, f.height);
-        if (a.set(ki, A[0], A[1], A[0], A[1]), f.isOffscreen(ki)) return c || zi(m, e, n, r), 
+        if (a.set(ki, A[0], A[1], A[0], A[1]), f.isOffscreen(ki)) return c || zi(y, e, n, r), 
         !1;
         v && (b = A);
         const w = v ? 1 : u.properties.tileExtent / this.layer.options.tileSize[0];
         let _ = !0;
-        const S = e[n], M = e[r - 1], P = g ? g[S] : t.properties.textSize, T = this.Yr(t, P, s, S, M, b, w, l);
-        if (null === T) return zi(m, e, n, r), !1;
+        const S = e[n], M = e[r - 1], P = g ? g[S] : t.properties.textSize, T = this.Jr(t, P, s, S, M, b, w, l);
+        if (null === T) return zi(y, e, n, r), !1;
         const k = M - S <= 3, I = t.material.uniforms, O = 1 === I.pitchWithMap, C = Math.floor(T / 2), F = T % 2;
         for (let i = n; i < r; i += 6) {
             const o = e[i];
             let a;
             if (a = C || i !== n || k ? C || i !== r - 6 || k ? pi.call(this, Si, t, P, s, o, b, w, C) : Di : Hi, 
             !a) {
-                _ = !1, c || zi(m, e, n, r);
+                _ = !1, c || zi(y, e, n, r);
                 break;
             }
             let l = a[2];
@@ -6700,12 +6709,12 @@ class Li extends $e {
             for (let t = 0; t < 4; t++) h.set(Oi, p[2 * (o + t)] / 10, p[2 * (o + t) + 1] / 10), 
             h.scale(Oi, Oi, P / 24), h.transformMat2(Oi, Oi, f), O ? (h.multiply(Oi, Oi, Fi), 
             h.add(Ci, Oi, a)) : (h.multiply(Ci, a, Fi), h.add(Ci, Oi, Ci)), Ei[0] = 10 * Ci[0], 
-            Ei[1] = 10 * Ci[1], m[2 * (o + t)] === Ei[0] && m[2 * (o + t) + 1] === Ei[1] || (m.dirty = !0, 
-            m[2 * (o + t)] = Ei[0], m[2 * (o + t) + 1] = Ei[1]);
+            Ei[1] = 10 * Ci[1], y[2 * (o + t)] === Ei[0] && y[2 * (o + t) + 1] === Ei[1] || (y.dirty = !0, 
+            y[2 * (o + t)] = Ei[0], y[2 * (o + t) + 1] = Ei[1]);
         }
         return _;
     }
-    Yr(t, e, n, i, r, s, o, a) {
+    Jr(t, e, n, i, r, s, o, a) {
         const l = r - i <= 3, h = this.getMap();
         return l ? 0 : gi.call(this, Hi, Di, t, e, n, i, r, s, o, h.width / h.height, a);
     }
@@ -6718,7 +6727,7 @@ class Li extends $e {
         }) : t.material && delete t.material.uniforms.texture), super.deleteMesh(t, e));
     }
     delete() {
-        super.delete(), this.Gr.dispose(), delete this.jr, this.Jr && this.Jr.dispose();
+        super.delete(), this.Wr.dispose(), delete this.Ur, this.qr && this.qr.dispose();
     }
     needClearStencil() {
         return !0;
@@ -6735,7 +6744,7 @@ class Li extends $e {
         });
         let r = i;
         if (this.layer.getRenderer().isEnableWorkAround("win-intel-gpu-crash") && (r = Zt({}, i), 
-        r.stencil = Zt({}, i.stencil), r.stencil.enable = !0), this.Gr = new n.MeshShader({
+        r.stencil = Zt({}, i.stencil), r.stencil.enable = !0), this.Wr = new n.MeshShader({
             vert: vi,
             frag: qn,
             uniforms: e,
@@ -6908,7 +6917,7 @@ var Wi = "#define SHADER_NAME NATIVE_LINE\nattribute vec3 aPosition;\nuniform ma
 
 class Bi extends He {
     constructor(t, e, n, i, r) {
-        if (super(t, e, n, i, r), this.primitive = "lines", y(this.symbolDef.lineColor)) {
+        if (super(t, e, n, i, r), this.primitive = "lines", m(this.symbolDef.lineColor)) {
             const t = e.getMap(), n = v(this.symbolDef.lineColor);
             this.colorSymbol = e => n(t.getZoom(), e);
         }
@@ -7048,7 +7057,7 @@ class qi extends Ce {
         }
         o.generateBuffers(this.regl), l.setDefines(u), l.setLocalTransform(e), (o.properties.maxAltitude <= 0 || l.getUniform("level") >= 3) && (l.castShadow = !1), 
         l.setUniform("maxAltitude", l.geometry.properties.maxAltitude);
-        const p = this.getMap(), m = p.getGLRes(), y = this.layer.getSpatialReference && this.layer.getSpatialReference(), g = (y ? y.getResolution(s) : p.getResolution(s)) / m;
+        const p = this.getMap(), y = p.getGLRes(), m = this.layer.getSpatialReference && this.layer.getSpatialReference(), g = (m ? m.getResolution(s) : p.getResolution(s)) / y;
         return Object.defineProperty(l.uniforms, "uvOrigin", {
             enumerable: !0,
             get: () => {
@@ -7065,7 +7074,7 @@ class qi extends Ce {
             enumerable: !0,
             get: () => {
                 const t = this.getSymbol(a);
-                return o.properties.hasAlpha || t.polygonOpacity < 1;
+                return o.properties.hasAlpha || t.polygonOpacity < 1 || t.lineOpacity < 1;
             }
         }), l.properties.symbolIndex = a, l;
     }
@@ -7079,10 +7088,10 @@ class qi extends Ce {
         r;
     }
     needPolygonOffset() {
-        return this.qr;
+        return this.Zr;
     }
     startFrame(...t) {
-        return delete this.qr, super.startFrame(...t);
+        return delete this.Zr, super.startFrame(...t);
     }
     addMesh(t, e) {
         t.forEach(t => {
@@ -7095,7 +7104,7 @@ class qi extends Ce {
             0 === e && (e = .01), Xi[2] = e, r.fromScaling(n, Xi), r.multiply(n, t.properties.tileTransform, n), 
             t.setLocalTransform(n);
         } else t.setLocalTransform(t.properties.tileTransform);
-        t.material !== this.material && t.setMaterial(this.material), t.geometry.properties.maxAltitude <= 0 && (this.qr = !0), 
+        t.material !== this.material && t.setMaterial(this.material), t.geometry.properties.maxAltitude <= 0 && (this.Zr = !0), 
         this.getSymbol(t.properties.symbolIndex).ssr ? t.ssr = 1 : t.ssr = 0;
     }
     deleteMesh(t, e) {
@@ -7147,7 +7156,7 @@ class qi extends Ce {
     }
     updateSymbol(t, e) {
         const n = super.updateSymbol(t, e);
-        return t.material && this.Zr(t.material), n;
+        return t.material && this.Kr(t.material), n;
     }
     Wn(t, e) {
         return Zi(t) !== Zi(e);
@@ -7189,14 +7198,14 @@ class Ki extends qi {
         return this.shader;
     }
     delete(t) {
-        this.getMap().off("updatelights", this.Kr, this), super.delete(t), this.material.dispose();
+        this.getMap().off("updatelights", this.$r, this), super.delete(t), this.material.dispose();
     }
     init() {
-        this.getMap().on("updatelights", this.Kr, this);
+        this.getMap().on("updatelights", this.$r, this);
         const t = this.regl;
         this.renderer = new n.Renderer(t);
         const e = this.getShaderConfig();
-        this.shader = new n.PhongShader(e), this.Zr();
+        this.shader = new n.PhongShader(e), this.Kr();
         const i = {
             vert: this.getPickingVert(),
             uniforms: [ "projViewMatrix", "modelMatrix", "positionMatrix", {
@@ -7212,7 +7221,7 @@ class Ki extends qi {
         };
         this.picking = [ new n.FBORayPicking(this.renderer, i, this.layer.getRenderer().pickingFBO) ];
     }
-    Kr() {
+    $r() {
         this.setToRedraw();
     }
     getShaderConfig() {
@@ -7261,14 +7270,14 @@ class Ki extends qi {
             }
         };
     }
-    Zr() {
+    Kr() {
         this.material && this.material.dispose();
         const t = this.getSymbols()[0].material, e = {};
         for (const n in t) he(t, n) && (e[n] = t[n]);
         this.material = new n.PhongMaterial(e);
     }
     getUniformValues(t, e) {
-        const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, s = this.$r(), o = Zt({
+        const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, s = this.Qr(), o = Zt({
             viewMatrix: n,
             projMatrix: i,
             cameraPosition: r,
@@ -7281,7 +7290,7 @@ class Ki extends qi {
     getPickingVert() {
         return "\n            attribute vec3 aPosition;\n            uniform mat4 projViewModelMatrix;\n            uniform mat4 modelMatrix;\n            uniform mat4 positionMatrix;\n            //引入fbo picking的vert相关函数\n            #include <fbo_picking_vert>\n            #include <get_output>\n            void main()\n            {\n                mat4 localPositionMatrix = getPositionMatrix();\n                vec4 localPosition = getPosition(aPosition);\n\n                gl_Position = projViewModelMatrix * localPositionMatrix * localPosition;\n                //传入gl_Position的depth值\n                fbo_picking_setData(gl_Position.w, true);\n            }\n        ";
     }
-    $r() {
+    Qr() {
         const t = this.getMap().getLightManager(), e = t && t.getAmbientLight() || {}, n = t && t.getDirectionalLight() || {};
         return {
             ambientColor: e.color || [ .2, .2, .2 ],
@@ -7296,7 +7305,7 @@ const $i = [ 1, 1, 1 ];
 
 class Qi extends Ce {
     constructor(t, e, n, i, r) {
-        if (super(t, e, n, i, r), y(this.symbolDef[0].lineColor)) {
+        if (super(t, e, n, i, r), m(this.symbolDef[0].lineColor)) {
             const t = e.getMap(), n = v(this.symbolDef.lineColor);
             this.colorSymbol = e => n(t.getZoom(), e);
         } else this.colorSymbol = this.getSymbol({
@@ -7351,7 +7360,7 @@ class Qi extends Ce {
                     const n = [];
                     return r.multiply(n, e.projViewMatrix, e.modelMatrix), n;
                 }
-            }, "outSize", "opacity" ],
+            } ],
             extraCommandProps: {
                 stencil: {
                     enable: !0,
@@ -7389,20 +7398,20 @@ const {getPBRUniforms: tr} = n.pbr.PBRUtils, er = [];
 
 class nr extends qi {
     constructor(...t) {
-        super(...t), this.Qr = new n.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
+        super(...t), this.ts = new n.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
     }
     supportRenderMode(t) {
         return this.getSymbols()[0].ssr ? "fxaa" === t || "fxaaAfterTaa" === t : super.supportRenderMode(t);
     }
     isAnimating() {
-        const t = this.ts();
+        const t = this.es();
         if (t && (t[0] || t[1])) return !0;
     }
     needToRedraw() {
-        const t = this.ts();
+        const t = this.es();
         return !(!t || !t[0] && !t[1]) || super.needToRedraw();
     }
-    ts() {
+    es() {
         const t = this.getSymbols()[0];
         return t.material && t.material.uvOffsetAnim;
     }
@@ -7428,18 +7437,18 @@ class nr extends qi {
             const e = Zt({}, r, t.ssr.defines);
             i.shaderDefines = e;
         }
-        if (t.onlyUpdateDepthInTaa && (this.shader = this.es, !n && this.ns && (this.shader = i, 
+        if (t.onlyUpdateDepthInTaa && (this.shader = this.ns, !n && this.rs && (this.shader = i, 
         this.setToRedraw(!0))), this.updateIBLDefines(i), super.paint(t), void 0 !== this.shadowCount && e) {
             const t = this.scene.getMeshes().length;
             this.shadowCount !== t && this.setToRedraw();
         }
         this.shader = i, n && (i.shaderDefines = r), delete this.shadowCount;
-        const s = this.ts();
+        const s = this.es();
         if (s && (s[0] || s[1])) this.material.set("uvOffset", [ 0, 0 ]); else {
             const t = this.getUVOffset(s);
             this.material.set("uvOffset", t);
         }
-        this.ns = n;
+        this.rs = n;
     }
     getShadowMeshes() {
         if (!this.isVisible()) return er;
@@ -7455,15 +7464,15 @@ class nr extends qi {
         Zt(this.sceneConfig, t), this.setToRedraw();
     }
     delete() {
-        super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.rs && this.rs.dispose(), 
-        this.shader && (this.shader.dispose(), delete this.shader), this.es && (this.es.dispose(), 
-        delete this.es);
+        super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.ss && this.ss.dispose(), 
+        this.shader && (this.shader.dispose(), delete this.shader), this.ns && (this.ns.dispose(), 
+        delete this.ns);
     }
     init(t) {
-        this.getMap().on("updatelights", this.ss, this), this.createIBLTextures(), this.oi = this.oi || t;
+        this.getMap().on("updatelights", this.os, this), this.createIBLTextures(), this.oi = this.oi || t;
         const e = this.regl;
-        this.renderer = new n.Renderer(e), this.os = this.as.bind(this), this.ls = this.disposeCachedTexture.bind(this), 
-        this.hs = this.cs.bind(this), this.Zr(), this.ni(t);
+        this.renderer = new n.Renderer(e), this.as = this.ls.bind(this), this.hs = this.disposeCachedTexture.bind(this), 
+        this.cs = this.fs.bind(this), this.Kr(), this.ni(t);
         const i = {
             vert: "\n                attribute vec3 aPosition;\n                uniform mat4 projViewModelMatrix;\n                uniform mat4 positionMatrix;\n                //引入fbo picking的vert相关函数\n                #include <line_extrusion_vert>\n                #include <get_output>\n                #include <fbo_picking_vert>\n                void main() {\n                    mat4 localPositionMatrix = getPositionMatrix();\n                    #ifdef IS_LINE_EXTRUSION\n                        vec3 linePosition = getLineExtrudePosition(aPosition);\n                        vec4 localVertex = getPosition(linePosition);\n                    #else\n                        vec4 localVertex = getPosition(aPosition);\n                    #endif\n\n                    gl_Position = projViewModelMatrix * localPositionMatrix * localVertex;\n                    fbo_picking_setData(gl_Position.w, true);\n                }\n            ",
             uniforms: [ {
@@ -7519,20 +7528,20 @@ class nr extends qi {
             polygonOffset: this.getPolygonOffset()
         }, o = {
             uniforms: r,
-            defines: this.fs(i),
+            defines: this.us(i),
             extraCommandProps: s
         };
         this.shader = new n.pbr.StandardShader(o), o.frag = "\n            precision mediump float;\n            #include <gl2_frag>\n            void main() {\n                glFragColor = vec4(0.0);\n                #if __VERSION__ == 100\n                    gl_FragColor = glFragColor;\n                #endif\n            }\n        ", 
-        this.es = new n.pbr.StandardShader(o);
+        this.ns = new n.pbr.StandardShader(o);
     }
-    as({resources: t}) {
+    ls({resources: t}) {
         for (let e = 0; e < t.length; e++) this.addCachedTexture(t[e].url, t[e].data);
         this.setToRedraw(!0);
     }
-    cs() {
+    fs() {
         this.setToRedraw(!0);
     }
-    Zr(t) {
+    Kr(t) {
         const e = t || this.getSymbols()[0].material, i = {};
         let r = !1;
         for (const t in e) if (he(e, t)) if (t.indexOf("Texture") > 0) {
@@ -7551,15 +7560,15 @@ class nr extends qi {
             } : s.data = a : o === s && (s = {
                 url: o,
                 wrap: "repeat"
-            }), s.flipY = !0, i[t] = new n.Texture2D(s, this.Qr), i[t].once("complete", this.os), 
-            i[t].once("disposed", this.ls), i[t].promise && this.addCachedTexture(o, i[t].promise), 
+            }), s.flipY = !0, i[t] = new n.Texture2D(s, this.ts), i[t].once("complete", this.as), 
+            i[t].once("disposed", this.hs), i[t].promise && this.addCachedTexture(o, i[t].promise), 
             r = !0;
         } else i[t] = e[t];
         if (this.material) {
             for (let t in i) this.material.set(t, i[t]);
             this.setToRedraw(!0);
-        } else this.material = new n.pbr.StandardMaterial(i), this.material.once("complete", this.hs);
-        r || this.cs();
+        } else this.material = new n.pbr.StandardMaterial(i), this.material.once("complete", this.cs);
+        r || this.fs();
     }
     getShader() {
         return this.shader;
@@ -7568,30 +7577,30 @@ class nr extends qi {
         const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = tr(t, n, i, e && e.ssr, e && e.jitter);
         return this.setIncludeUniformValues(r, e), r;
     }
-    fs(t) {
+    us(t) {
         return this.hasIBL() ? t.HAS_IBL_LIGHTING = 1 : delete t.HAS_IBL_LIGHTING, t;
     }
-    ss() {
+    os() {
         if (!this.shader) return;
         const t = this.shader.shaderDefines;
-        this.fs(t), this.shader.shaderDefines = t;
+        this.us(t), this.shader.shaderDefines = t;
     }
 }
 
 const ir = [], rr = [], sr = [ 0, 0, 0 ], or = [ 0, 0, 0 ], ar = [ 1, 1, 1 ], lr = [], hr = [ 1, 1, 1, 1 ], cr = [], fr = t => class extends t {
     constructor(t, e, n, i, r) {
-        super(t, e, n, i, r), this.us = !1, this.scene.sortFunction = this.sortByCommandKey, 
-        this.ds = [];
+        super(t, e, n, i, r), this.ds = !1, this.scene.sortFunction = this.sortByCommandKey, 
+        this.ps = [];
     }
     isAnimating() {
         const t = this.getSymbols();
         for (let e = 0; e < t.length; e++) {
-            if (t[e] && this.ps[e] && this.ms(e)) return !0;
+            if (t[e] && this.ys[e] && this.ms(e)) return !0;
         }
         return !1;
     }
     createGeometry(t, e) {
-        if (this.ys(), !this.us) return null;
+        if (this.gs(), !this.ds) return null;
         const {data: n, positionSize: i} = t;
         return {
             geometry: {
@@ -7615,7 +7624,7 @@ const ir = [], rr = [], sr = [ 0, 0, 0 ], or = [ 0, 0, 0 ], ar = [ 1, 1, 1 ], lr
             instance_vectorC: new Float32Array(4 * u),
             aPickingId: []
         };
-        this.gs(d, s, o, l.properties.z, f, h);
+        this.vs(d, s, o, l.properties.z, f, h);
         const p = {};
         for (const t in d) p[t] = {
             buffer: this.regl.buffer({
@@ -7624,26 +7633,26 @@ const ir = [], rr = [], sr = [ 0, 0, 0 ], or = [ 0, 0, 0 ], ar = [ 1, 1, 1 ], lr
             }),
             divisor: 1
         };
-        const m = [], y = this.getSymbols();
-        for (let t = 0; t < y.length; t++) {
-            const e = y[t], o = this.ds[t];
+        const y = [], m = this.getSymbols();
+        for (let t = 0; t < m.length; t++) {
+            const e = m[t], o = this.ps[t];
             if (!o) continue;
-            const {translation: l, rotation: h, scale: f, fixSizeOnZoom: g} = e, v = this.vs([], l, h, f);
+            const {translation: l, rotation: h, scale: f, fixSizeOnZoom: g} = e, v = this.xs([], l, h, f);
             let x = 0;
             o.forEach(t => {
                 const {geometry: n, nodeMatrix: i} = t, s = r.multiply(cr, v, i), o = n.boundingBox.copy();
                 o.transform(s);
-                const a = this.xs(o, e);
+                const a = this.bs(o, e);
                 a > x && (x = a);
             });
             const b = [ 0, 0, x ], A = o.map(o => {
-                const {geometry: l, nodeMatrix: h, materialInfo: f, skin: m, morphWeights: y, extraInfo: x} = o, A = new (this.getMaterialClazz(f))(f), w = {}, _ = new n.InstancedMesh(p, u, l, A, {
+                const {geometry: l, nodeMatrix: h, materialInfo: f, skin: y, morphWeights: m, extraInfo: x} = o, A = new (this.getMaterialClazz(f))(f), w = {}, _ = new n.InstancedMesh(p, u, l, A, {
                     transparent: !1,
                     picking: !0
                 });
-                m && (_.setUniform("jointTexture", m.jointTexture), _.setUniform("jointTextureSize", m.jointTextureSize), 
-                _.setUniform("numJoints", m.numJoints), _.setUniform("skinAnimation", 0), w.HAS_SKIN = 1), 
-                y && (_.setUniform("morphWeights", y), w.HAS_MORPH = 1), _.setUniform("hasAlpha", x.alphaMode && "BLEND" === x.alphaMode.toUpperCase()), 
+                y && (_.setUniform("jointTexture", y.jointTexture), _.setUniform("jointTextureSize", y.jointTextureSize), 
+                _.setUniform("numJoints", y.numJoints), _.setUniform("skinAnimation", 0), w.HAS_SKIN = 1), 
+                m && (_.setUniform("morphWeights", m), w.HAS_MORPH = 1), _.setUniform("hasAlpha", x.alphaMode && "BLEND" === x.alphaMode.toUpperCase()), 
                 ee(_.uniforms, "polygonFill", e, "polygonFill", hr, re(this.colorCache)), ee(_.uniforms, "polygonOpacity", e, "polygonOpacity", 1);
                 const S = r.multiply([], v, h), M = [];
                 return r.fromTranslation(M, b), r.multiply(S, M, S), _.setPositionMatrix(() => {
@@ -7659,17 +7668,17 @@ const ir = [], rr = [], sr = [ 0, 0, 0 ], or = [ 0, 0, 0 ], ar = [ 1, 1, 1 ], lr
                     index: t
                 }, _;
             });
-            m.push(...A);
+            y.push(...A);
         }
-        return m.insContext = {
+        return y.insContext = {
             instanceData: d,
             tileTranslationMatrix: s,
             tileExtent: o,
             aPosition: f,
             positionSize: h
-        }, m;
+        }, y;
     }
-    xs(t, e) {
+    bs(t, e) {
         const n = e.anchorZ || "bottom";
         let i = 0;
         return "bottom" === n ? i = -t.min[2] : "top" === n ? i = -t.max[2] : "center" === n && (i = -(t.min[2] + t.max[2]) / 2), 
@@ -7690,12 +7699,12 @@ const ir = [], rr = [], sr = [ 0, 0, 0 ], or = [ 0, 0, 0 ], ar = [ 1, 1, 1 ], lr
         let n = !1;
         for (let i = 0; i < e.length; i++) {
             const r = e[i];
-            if (!r || !this.ps[i]) continue;
-            if (this.ms(i) && this.ps[i]) {
+            if (!r || !this.ys[i]) continue;
+            if (this.ms(i) && this.ys[i]) {
                 n || (n = !0);
                 let e = r.speed;
                 const s = !!r.loop;
-                Qt(e) && (e = 1), this.ps[i].updateAnimation(t.timestamp, s, e);
+                Qt(e) && (e = 1), this.ys[i].updateAnimation(t.timestamp, s, e);
             }
         }
         n && this.setToRedraw(!0), super.prepareRender(t);
@@ -7707,9 +7716,9 @@ const ir = [], rr = [], sr = [ 0, 0, 0 ], or = [ 0, 0, 0 ], ar = [ 1, 1, 1 ], lr
     }
     ms(t) {
         const e = this.getSymbols()[t];
-        return e && e.animation && this.ps[t] && this.ps[t].hasSkinAnimation();
+        return e && e.animation && this.ys[t] && this.ys[t].hasSkinAnimation();
     }
-    gs(t, e, n, s, o, a) {
+    vs(t, e, n, s, o, a) {
         function l(e, n, i, r) {
             t[e][4 * n] = i[r], t[e][4 * n + 1] = i[r + 4], t[e][4 * n + 2] = i[r + 8], t[e][4 * n + 3] = i[r + 12];
         }
@@ -7725,26 +7734,26 @@ const ir = [], rr = [], sr = [ 0, 0, 0 ], or = [ 0, 0, 0 ], ar = [ 1, 1, 1 ], lr
         return t.positionAttribute = "POSITION", t.normalAttribute = "NORMAL", t;
     }
     init(t) {
-        super.init(t), this.ys();
+        super.init(t), this.gs();
     }
-    ys() {
-        if (this.ps) return;
-        this.ps = [];
+    gs() {
+        if (this.ys) return;
+        this.ys = [];
         const t = this.layer.getRenderer(), e = this.getSymbols();
-        this.bs = 0;
+        this.As = 0;
         for (let i = 0; i < e.length; i++) {
             const r = e[i].url;
             if (t.isCachePlaced(r)) continue;
             const s = t.fetchCache(r);
-            s ? (this.ps[i] = [ s ], this.ds[i] = s.getMeshesInfo(), this.bs++, t.addToCache(r)) : (t.placeCache(r), 
+            s ? (this.ys[i] = [ s ], this.ps[i] = s.getMeshesInfo(), this.As++, t.addToCache(r)) : (t.placeCache(r), 
             n.GLTFHelper.load(r).then(s => {
                 const o = n.GLTFHelper.exportGLTFPack(s, this.regl);
-                this.ps[i] = [ o ], this.ds[i] = o.getMeshesInfo(), t.addToCache(r, o, t => {
+                this.ys[i] = [ o ], this.ps[i] = o.getMeshesInfo(), t.addToCache(r, o, t => {
                     t.dispose();
-                }), this.bs++, this.bs >= e.length && (this.us = !0), this.setToRedraw(!0);
+                }), this.As++, this.As >= e.length && (this.ds = !0), this.setToRedraw(!0);
             }));
         }
-        this.bs >= e.length && (this.us = !0);
+        this.As >= e.length && (this.ds = !0);
     }
     getPickingVert() {
         return "\n    attribute vec3 aPosition;\n    uniform mat4 projViewModelMatrix;\n    uniform mat4 modelMatrix;\n    uniform mat4 positionMatrix;\n    //引入fbo picking的vert相关函数\n    #include <fbo_picking_vert>\n    #include <get_output>\n    void main()\n    {\n        mat4 localPositionMatrix = getPositionMatrix();\n        vec4 localPosition = getPosition(aPosition);\n\n        gl_Position = projViewModelMatrix * localPositionMatrix * localPosition;\n        //传入gl_Position的depth值\n        fbo_picking_setData(gl_Position.w, true);\n    }";
@@ -7758,15 +7767,15 @@ const ir = [], rr = [], sr = [ 0, 0, 0 ], or = [ 0, 0, 0 ], ar = [ 1, 1, 1 ], lr
     delete() {
         super.delete();
         const t = this.getSymbols()[0].url;
-        if (this.layer.getRenderer().removeCache(t), this.ds) for (let t = 0; t < this.ds.length; t++) {
-            const e = this.ds[t];
+        if (this.layer.getRenderer().removeCache(t), this.ps) for (let t = 0; t < this.ps.length; t++) {
+            const e = this.ps[t];
             for (let n = 0; n < e.length; n++) {
                 const n = e[t], {geometry: i, materialInfo: r} = n;
                 if (i && i.dispose(), r) for (const t in r) r[t] && r[t].destroy && r[t].destroy();
             }
         }
     }
-    vs(t, e, n, s) {
+    xs(t, e, n, s) {
         const o = i.set(ir, ...e || sr), a = n || or, l = s || ar, h = c.fromEuler(rr, a[0], a[1], a[2]);
         return r.fromRotationTranslationScale(t, h, o, l);
     }
@@ -7787,9 +7796,9 @@ class dr extends(fr(nr)){
 const pr = {
     color: [ 2.0303, 2.028, 2.028 ],
     direction: [ 0, -.2717, -1 ]
-}, mr = {
+}, yr = {
     index: 0
-}, yr = [ 0, 0, 0 ];
+}, mr = [ 0, 0, 0 ];
 
 class gr extends He {
     supportRenderMode(t) {
@@ -7799,7 +7808,7 @@ class gr extends He {
         return !0;
     }
     needToRedraw() {
-        return this.getSymbol(mr).animation;
+        return this.getSymbol(yr).animation;
     }
     createMesh(t, e) {
         const {geometry: i} = t;
@@ -7808,29 +7817,29 @@ class gr extends He {
             castShadow: !1,
             picking: !0
         });
-        return r.properties.symbolIndex = mr, r.setLocalTransform(e), r;
+        return r.properties.symbolIndex = yr, r.setLocalTransform(e), r;
     }
     callShader(t, e) {
         super.callShader(t, e), this.transformWater();
-        const n = this.As(this.getMap(), e);
-        this.renderer.render(this.ws, n, this._s, this.getRenderFBO(e));
+        const n = this.ws(this.getMap(), e);
+        this.renderer.render(this._s, n, this.Ss, this.getRenderFBO(e));
     }
     addMesh(t, e) {
         this.si(t, e), super.addMesh(...arguments);
     }
     si(t) {
-        const e = this.getSymbol(mr).ssr;
+        const e = this.getSymbol(yr).ssr;
         for (let n = 0; n < t.length; n++) t[n].ssr = e ? 1 : 0;
     }
     paint(t) {
-        t.states && t.states.includesChanged && (this.shader.dispose(), this.ws.dispose(), 
+        t.states && t.states.includesChanged && (this.shader.dispose(), this._s.dispose(), 
         this.ni(t));
-        const e = !!t.ssr && this.getSymbol(mr).ssr, n = this.ws, i = n.shaderDefines;
+        const e = !!t.ssr && this.getSymbol(yr).ssr, n = this._s, i = n.shaderDefines;
         if (e) {
             const e = Zt({}, i, t.ssr.defines);
             n.shaderDefines = e;
         }
-        this.updateIBLDefines(n), this.Ss.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
+        this.updateIBLDefines(n), this.Ms.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
     }
     init(t) {
         this.createIBLTextures();
@@ -7848,38 +7857,38 @@ class gr extends He {
             extraCommandProps: {
                 viewport: this.pickingViewport
             }
-        }, this.pickingFBO) ]), this.Ms();
+        }, this.pickingFBO) ]), this.Ps();
     }
-    Ms() {
+    Ps() {
         const t = this.regl;
-        this.Ps = t.texture(2), this.Ts = [ 2, 2 ];
+        this.Ts = t.texture(2), this.ks = [ 2, 2 ];
         const e = this.getSymbol({
             index: 0
         }), n = e.texWaveNormal, i = this.getCachedTexture(n), r = this;
-        if (i) i.loading || (this.ks = this.Is(t, i)); else {
+        if (i) i.loading || (this.Is = this.Os(t, i)); else {
             const e = new Image;
             e.loading = !0, e.onload = function() {
-                delete this.loading, r.ks = r.Is(t, this), this.Ts = [ this.width, this.height ], 
+                delete this.loading, r.Is = r.Os(t, this), this.ks = [ this.width, this.height ], 
                 r.setToRedraw();
             }, e.onerror = () => {
                 console.error("invalid water wave normal texture:" + n);
             }, this.addCachedTexture(n, e), e.src = n;
         }
         const s = e.texWavePerturbation, o = this.getCachedTexture(s);
-        if (o) o.loading || (this.Os = this.Is(t, o)); else {
+        if (o) o.loading || (this.Cs = this.Os(t, o)); else {
             const e = new Image;
             e.loading = !0, e.onload = function() {
-                delete this.loading, r.Os = r.Is(t, this), this.Ts = [ this.width, this.height ], 
+                delete this.loading, r.Cs = r.Os(t, this), this.ks = [ this.width, this.height ], 
                 r.setToRedraw();
             }, e.onerror = () => {
                 console.error("invalid water wave perturbation texture:" + s);
             }, this.addCachedTexture(s, e), e.src = s;
         }
     }
-    Is(t, e) {
-        return this.Ps ? t.texture({
-            width: this.Ts[0],
-            height: this.Ts[1],
+    Os(t, e) {
+        return this.Ts ? t.texture({
+            width: this.ks[0],
+            height: this.ks[1],
             mag: "linear",
             min: "linear mipmap linear",
             wrapS: "repeat",
@@ -7976,7 +7985,7 @@ class gr extends He {
                 enable: !1
             }
         };
-        i.push(...n.SsrPass.getUniformDeclares()), this.ws = new n.MeshShader({
+        i.push(...n.SsrPass.getUniformDeclares()), this._s = new n.MeshShader({
             vert: "#define SHADER_NAME WATER\nuniform mat4 modelMatrix;\nuniform mat4 projViewModelMatrix;\nattribute vec3 aPosition;\nattribute vec2 aTexCoord;\nuniform vec2 uvOffset;\nuniform vec2 noiseUvOffset;\nuniform vec2 uvScale;\nvarying vec2 vUv;\nvarying vec2 vNoiseUv;\nvarying vec3 vPos;\nvarying mat3 vTbnMatrix;\n#ifdef HAS_SSR\nuniform mat4 modelViewMatrix;\nvarying vec4 vViewVertex;\n#endif\nmat3 c(in vec3 d) {\n  vec3 t = normalize(cross(d, vec3(.0, 1., .0)));\n  vec3 e = normalize(cross(d, t));\n  return mat3(t, e, d);\n}\n#if defined(HAS_SHADOWING)\n#include <vsm_shadow_vert>\n#endif\nconst vec3 f = vec3(0., 0., 1.);\nvoid main(void) {\n  vec4 h = vec4(aPosition, 1.);\n  vec4 i = modelMatrix * h;\n  vPos = i.xyz;\n  vTbnMatrix = c(f);\n  gl_Position = projViewModelMatrix * h;\n  vUv = aTexCoord * uvScale + uvOffset;\n  vNoiseUv = aTexCoord * uvScale * TIME_NOISE_TEXTURE_REPEAT + noiseUvOffset;\n#ifdef HAS_SSR\nvec4 j = modelViewMatrix * h;\n  vViewVertex = j;\n#endif\n#if defined(HAS_SHADOWING)\nshadow_computeShadowPars(h);\n#endif\n}",
             frag: "#define SHADER_NAME WATER\nprecision highp float;\nprecision highp sampler2D;\n#include <hsv_frag>\nuniform vec3 hsv;\nuniform float contrast;\n#if defined(HAS_SHADOWING)\n#include <vsm_shadow_frag>\n#endif\n#if defined(HAS_IBL_LIGHTING)\nuniform vec3 hdrHsv;\nuniform samplerCube specularPBR;\nuniform float rgbmRange;\nuniform vec3 diffuseSPH[9];\n#else\nuniform vec3 ambientColor;\n#endif\nstruct PBRShadingWater {\n  float NdotL;\n  float NdotV;\n  float NdotH;\n  float VdotH;\n  float LdotH;\n  float VdotN;\n};\nvec3 c(const in vec4 d, const in float e) {\n  if(e <= .0)\n    return d.rgb;\n  return e * d.rgb * d.a;\n}\n#ifdef HAS_SSR\nvarying vec4 vViewVertex;\nuniform mat3 modelViewNormalMatrix;\nuniform sampler2D TextureDepth;\nuniform highp vec2 outSize;\nuniform float ssrFactor;\nuniform float ssrQuality;\nuniform sampler2D TextureReflected;\nuniform highp mat4 projMatrix;\nuniform mat4 invProjMatrix;\nuniform vec4 outputFovInfo[2];\nuniform mat4 reprojViewProjMatrix;\nuniform vec2 cameraNearFar;\nfloat f(const in vec4 h) {\n  return h.r + h.g / 255.;\n}\nfloat i(const in vec2 j, const in float k) {\n  vec3 l = vec3(.06711056, .00583715, 52.9829189);\n  return fract(l.z * fract(dot(j.xy + k * vec2(47., 17.) * .695, l.xy))) * .5;\n}\nvec3 m(const in float n, const in float o, const in vec2 u) {\n  float v = min(o - .01, n);\n  float A = floor(v);\n  float B = min(o, A + 1.);\n  float C = pow(2., B);\n  vec2 D = 2. * C / u;\n  if(v - A > .5)\n    C *= 2.;\n  return vec3(D, C);\n}\nvec2 E(const in vec2 F, const in vec3 G) {\n  vec2 H = max(G.xy, min(1. - G.xy, F));\n  return vec2(2. * H.x, G.z - 1. - H.y) / G.z;\n}\nvec3 I(const in mat4 J, const in vec3 K) {\n  vec4 L = J * vec4(K, 1.);\n  return vec3(.5 + .5 * L.xy / L.w, L.w);\n}\nvec3 M(const in float N, const in vec2 H) {\n  return texture2D(TextureReflected, H).rgb;\n}\nfloat O(float P) {\n  highp mat4 J = projMatrix;\n  highp float z = P * 2. - 1.;\n  return -J[3].z / (z + J[2].z);\n}\nfloat Q(const vec2 H) {\n  float P = f(texture2D(TextureDepth, H));\n  return P;\n}\nvec3 R(const in float k, const in vec3 S, const in vec3 T, const in vec3 U, const in vec3 V, const in float W) {\n  vec2 X;\n  X.x = i(gl_FragCoord.yx, k);\n  X.y = fract(X.x * 52.9829189);\n  X.y = mix(X.y, 1., .7);\n  float Y = 2. * 3.14159 * X.x;\n  float Z = pow(max(X.y, .000001), W / (2. - W));\n  float ba = sqrt(1. - Z * Z);\n  vec3 bb = vec3(ba * cos(Y), ba * sin(Y), Z);\n  bb = bb.x * S + bb.y * T + bb.z * U;\n  return normalize((2. * dot(V, bb)) * bb - V);\n}\nfloat bc(const in float k) {\n  return (i(gl_FragCoord.xy, k) - .5);\n}\nvec3 bd(const in vec3 be, const in float bf, const in vec3 bg) {\n  vec3 bh = I(projMatrix, vViewVertex.xyz + bg * bf);\n  bh.z = 1. / bh.z;\n  bh -= be;\n  float bi = min(1., .99 * (1. - be.x) / max(1e-5, bh.x));\n  float bj = min(1., .99 * (1. - be.y) / max(1e-5, bh.y));\n  float bk = min(1., .99 * be.x / max(1e-5, -bh.x));\n  float bl = min(1., .99 * be.y / max(1e-5, -bh.y));\n  return bh * min(bi, bj) * min(bk, bl);\n}\nfloat bm(const in vec3 be, const in vec3 bh, inout float bn, inout float bo) {\n  float bp = (bo + bn) * .5;\n  vec3 bq = be + bh * bp;\n  float z = Q(bq.xy);\n  float P = O(z);\n  float br = -1. / bq.z;\n  bn = P > br ? bn : bp;\n  bo = P > br ? bp : bo;\n  return bp;\n}\nvec4 bs(const in vec3 be, const in float bf, in float bt, const in vec3 bg, const in float bu, const in float k) {\n  const int bv = 20;\n  float bw = 1. / float(bv);\n  bt *= bw;\n  vec3 bh = bd(be, bf, bg);\n  float bx = bw;\n  vec3 by = vec3(.0, bx, 1.);\n  vec3 bq;\n  float z, P, br, bz, bA, bB;\n  bool bC;\n  float bD = 1.;\n  float bp;\n  for(int bE = 0; bE < bv; bE++) {\n    bq = be + bh * by.y;\n    z = Q(bq.xy);\n    P = O(z);\n    br = -1. / bq.z;\n    bz = br - P;\n    bz *= clamp(sign(abs(bz) - bf * bw * bw), .0, 1.);\n    bC = abs(bz + bt) < bt;\n    bA = clamp(by.x / (by.x - bz), .0, 1.);\n    bB = bC ? by.y + bA * bw - bw : 1.;\n    by.z = min(by.z, bB);\n    by.x = bz;\n    if(bC) {\n      float bn = by.y - bw;\n      float bo = by.y;\n      bp = bm(be, bh, bn, bo);\n      bp = bm(be, bh, bn, bo);\n      bp = bm(be, bh, bn, bo);\n      bD = bp;\n      break;\n    }\n    by.y += bw;\n  }\n  return vec4(be + bh * bD, 1. - bD);\n}\nvec3 bF(in vec4 bG, const in float bH, const in vec3 bI, const in vec3 bJ, const in float bu) {\n  vec4 bK = mix(outputFovInfo[0], outputFovInfo[1], bG.x);\n  bG.xyz = vec3(mix(bK.xy, bK.zw, bG.y), 1.) * -1. / bG.z;\n  bG.xyz = (reprojViewProjMatrix * vec4(bG.xyz, 1.)).xyw;\n  bG.xy /= bG.z;\n  float bL = clamp(6. - 6. * max(abs(bG.x), abs(bG.y)), .0, 1.);\n  bG.xy = .5 + .5 * bG.xy;\n  return vec3(bG.xy, 1.);\n}\nvec3 ssr(const in vec3 bI, const in vec3 bJ, const in float bu, const in vec3 bM, const in vec3 V) {\n  float bN = .0;\n  vec4 bO = vec4(.0);\n  float W = bu * bu;\n  W = W * W;\n  vec3 bP = abs(bM.z) < .999 ? vec3(.0, .0, 1.) : vec3(1., .0, .0);\n  vec3 S = normalize(cross(bP, bM));\n  vec3 T = cross(bM, S);\n  float bH = ssrFactor * clamp(-4. * dot(V, bM) + 3.8, .0, 1.);\n  bH *= clamp(4.7 - bu * 5., .0, 1.);\n  vec3 be = I(projMatrix, vViewVertex.xyz);\n  be.z = 1. / be.z;\n  vec3 bg = R(bN, S, T, bM, V, W);\n  float bf = mix(cameraNearFar.y + vViewVertex.z, -vViewVertex.z - cameraNearFar.x, bg.z * .5 + .5);\n  float bt = .5 * bf;\n  vec4 bG;\n  if(dot(bg, bM) > .001 && bH > .0) {\n    bG = bs(be, bf, bt, bg, bu, bN);\n    if(bG.w > .0)\n      return bF(bG, bH, bI, bJ, bu);\n    \n  }\n  return vec3(.0);\n}\n#endif\nconst vec3 bQ = vec3(0., 0., 1.);\nuniform mat4 viewMatrix;\nuniform sampler2D normalTexture;\nuniform sampler2D heightTexture;\nuniform vec4 waveParams;\nuniform vec2 waterDir;\nuniform vec4 waterBaseColor;\nuniform vec3 lightDirection;\nuniform vec3 lightColor;\nuniform vec3 camPos;\nuniform float timeElapsed;\nvarying vec2 vUv;\nvarying vec2 vNoiseUv;\nvarying vec3 vPos;\nvarying mat3 vTbnMatrix;\nfloat bR(vec3 bS, float bT) {\n  float bU = max(.015, bT);\n  return max((bS.x + bS.y) * .3303545 / bU + .3303545, .0);\n}\nconst vec2 bV = vec2(6. / 25., 5. / 24.);\nvec2 bW(sampler2D bX, vec2 H) {\n  return 2. * texture2D(bX, H).rg - 1.;\n}\nfloat bY(vec2 H) {\n  return texture2D(heightTexture, H).b;\n}\nvec3 bZ(sampler2D bX, vec2 H) {\n  return 2. * texture2D(bX, H).rgb - 1.;\n}\nfloat ca(vec2 H, float cb) {\n  return fract(cb);\n}\nfloat cc(vec2 H, float cb) {\n  float cd = ca(H, cb);\n  return 1. - abs(1. - 2. * cd);\n}\nvec3 ce(sampler2D cf, vec2 H, float cb, float cg) {\n  float ch = waveParams[2];\n  float ci = waveParams[3];\n  vec2 cj = bW(cf, H) * ch;\n  float cd = ca(H, cb + cg);\n  float ck = cc(H, cb + cg);\n  vec2 bO = H;\n  bO -= cj * (cd + ci);\n  bO += cg;\n  bO += (cb - cd) * bV;\n  return vec3(bO, ck);\n}\nconst float cl = 7.77;\nvec3 cm(sampler2D cn, sampler2D co, vec2 cp, vec2 cq, float cb) {\n  float bT = waveParams[0];\n  vec2 cr = cb * -cq;\n  float cs = bY(vNoiseUv) * cl;\n  vec3 ct = ce(co, cp + cr, cb + cs, .0);\n  vec3 cu = ce(co, cp + cr, cb + cs, .5);\n  vec3 cv = bZ(cn, ct.xy) * ct.z;\n  vec3 cw = bZ(cn, cu.xy) * cu.z;\n  vec3 cx = normalize(cv + cw);\n  cx.xy *= bT;\n  cx.z = sqrt(1. - dot(cx.xy, cx.xy));\n  return cx;\n}\nvec4 cy(vec2 cp, float cz) {\n  float cA = waveParams[1];\n  vec3 bM = cm(normalTexture, heightTexture, cp * cA, waterDir, cz);\n  float cB = bR(bM, waveParams[0]);\n  return vec4(bM, cB);\n}\nconst float cC = 3.141592653589793;\nconst float cD = 1. / cC;\nconst float cE = .3183098861837907;\nconst float cF = 1.570796326794897;\nconst float cG = .4;\nfloat cH = 2.2;\nvec3 cI(float cJ, vec3 cK, float cL) {\n  return cK + (cL - cK) * pow(1. - cJ, 5.);\n}\nfloat cM(float cN, float bu) {\n  float cO = bu * bu;\n  float cP = cN * cN;\n  float cQ = pow((cP * (cO - 1.) + 1.), cH) * cC;\n  return cO / cQ;\n}\nfloat cR(float cS) {\n  return .25 / (cS * cS);\n}\nvec3 cT(const vec3 x) {\n  return (x * (2.51 * x + .03)) / (x * (2.43 * x + .59) + .14);\n}\nconst float cU = 2.2;\nconst float cV = .4545454545;\nvec4 cW(vec4 d) {\n  return vec4(pow(d.rgb, vec3(cV)), d.w);\n}\nvec3 cX(vec3 d) {\n  return pow(d, vec3(cU));\n}\nconst vec3 cY = vec3(.02, 1., 5.);\nconst vec2 cZ = vec2(.02, .1);\nconst float bu = .06;\nconst float da = 1.7;\nconst vec3 db = vec3(0, .6, .9);\nconst vec3 dc = vec3(.72, .92, 1.);\nconst float dd = .65;\nconst float de = 300000.0;\nconst float df = 500000.0;\nconst float dg = .775;\nconst float dh = .8;\nvec3 di(in vec3 bS, in vec3 dj) {\n  \n#ifdef HAS_IBL_LIGHTING\nvec3 dk = reflect(-dj, bS);\n  return c(textureCube(specularPBR, dk), rgbmRange);\n#else\nreturn ambientColor;\n#endif\n}\nPBRShadingWater dl;\nvec3 dm(in PBRShadingWater dn, float bu, vec3 dp, float dq) {\n  vec3 dr = cI(dn.VdotH, dp, dq);\n  float ds = cM(dn.NdotH, bu);\n  float dt = cR(dn.LdotH);\n  float du = mix(bu + .045, bu + .385, 1. - dn.VdotH);\n  float dv = 1.2;\n  float dw = cM(dn.NdotH, du) * dv;\n  return ((ds + dw) * dt) * dr;\n}\nvec3 dx(float da, float dy, vec3 db, float dz) {\n  return da * (.075 * db * pow(dy, 4.) + 50. * pow(dy, 23.)) * dz;\n}\nvec3 dA(in float Z, in vec3 dB, in vec3 dC) {\n  float dD = pow((1. - Z), cY[2]);\n  return mix(dC, dB, dD);\n}\nvec3 dE(in vec3 bS, in vec3 dj, in vec3 dF, vec3 d, in vec3 dG, in vec3 dH, in float dI, float dJ, vec3 dK) {\n  float dL = 0.;\n  vec3 dM = cX(d);\n  vec3 bb = normalize(dF + dj);\n  dl.NdotL = clamp(dot(bS, dF), .0, 1.);\n  dl.NdotV = clamp(dot(bS, dj), .001, 1.);\n  dl.VdotN = clamp(dot(dj, bS), .001, 1.);\n  dl.NdotH = clamp(dot(bS, bb), .0, 1.);\n  dl.VdotH = clamp(dot(dj, bb), .0, 1.);\n  dl.LdotH = clamp(dot(dF, bb), .0, 1.);\n  float dN = max(dot(dH, dj), .0);\n  vec3 dO = cX(dc);\n  vec3 dP = cX(db);\n  vec3 dc = dA(dN, dO, dP);\n  float dQ = max(dot(dH, dF), .0);\n  float dR = .1 + dQ * .9;\n  dc *= dR;\n  float dS = clamp(dI, .8, 1.);\n  vec3 dT = cI(dl.VdotN, vec3(cY[0]), cY[1]);\n  vec3 dU = dT * dc * dS;\n  vec3 dV = dM * mix(dc, dQ * dG * cD, 2. / 3.) * dS;\n  vec3 dW = vec3(.0);\n  if(dN > .0 && dQ > .0) {\n    vec3 dX = dm(dl, bu, vec3(cZ[0]), cZ[1]);\n    vec3 dY = dG * cD * dI;\n    dW = dl.NdotL * dY * dX;\n  }\n  vec3 cB = vec3(.0);\n  if(dN > .0) {\n    cB = dx(da, dJ, db, dR);\n  }\n  vec3 dZ = vec3(.0);\n#ifdef HAS_SSR\nfloat ea = smoothstep(df, de, -dK.z);\n  mat4 eb = viewMatrix;\n  vec4 ec = vec4(dK.xyz, 1.);\n  vec3 ed = normalize(ec.xyz);\n  vec4 ee = eb * vec4(bS, .0);\n  vec3 ef = normalize(ee.xyz);\n  vec4 eg = eb * vec4(dH, .0);\n  float eh = pow(max(dot(-ed, eg.xyz), .0), cG);\n  vec3 ei = mix(eg.xyz, ef, eh);\n  vec3 ej = ssr(vec3(.0), vec3(1.), bu, normalize(ei), -normalize(vViewVertex.xyz));\n  if(ej.z > .0) {\n    vec2 ek = smoothstep(.3, .6, abs(vec2(.5) - ej.xy));\n    dL = dg * clamp(1. - 1.3 * ek.y, .0, 1.) * ea;\n    vec3 el = M(.0, ej.xy);\n    dZ = cX(el) * dL * dT.y * dd;\n  }\n#endif\nfloat em = mix(dh, dh * .5, dL);\n  return cT((1. - dL) * dU + dZ + dV * em + dW + cB);\n}\nvoid main() {\n  vec3 dH = bQ;\n  vec4 en = cy(vUv, timeElapsed);\n  vec3 bS = normalize(vTbnMatrix * en.xyz);\n  vec3 dj = -normalize(vPos - camPos);\n  vec3 dF = normalize(-lightDirection);\n#if defined(HAS_SHADOWING)\nfloat dI = shadow_computeShadow();\n#else\nfloat dI = 1.;\n#endif\nvec4 eo = viewMatrix * vec4(vPos, 1.);\n  vec4 ep = vec4(dE(bS, dj, dF, waterBaseColor.rgb, lightColor, dH, dI, en.w, eo.xyz), waterBaseColor.a);\n  gl_FragColor = cW(ep);\n  if(contrast != 1.) {\n    gl_FragColor = contrastMatrix(contrast) * gl_FragColor;\n  }\n  if(length(hsv) > .0) {\n    gl_FragColor = hsv_apply(gl_FragColor, hsv);\n  }\n}",
             defines: s,
@@ -7997,10 +8006,10 @@ class gr extends He {
         };
         return this.setIncludeUniformValues(i, e), i;
     }
-    As(t, e) {
+    ws(t, e) {
         const {iblTexes: n} = this.getIBLRes(), i = t.projViewMatrix, r = t.getLightManager();
         let s = r && r.getDirectionalLight() || {};
-        const o = r && r.getAmbientLight() || {}, a = this.getSymbol(mr), l = this.Cs = this.Cs || [], h = {
+        const o = r && r.getAmbientLight() || {}, a = this.getSymbol(yr), l = this.Fs = this.Fs || [], h = {
             hdrHsv: o.hsv || [ 0, 0, 0 ],
             specularPBR: n && n.prefilterMap,
             rgbmRange: n && n.rgbmRange,
@@ -8014,36 +8023,36 @@ class gr extends He {
             lightColor: s.color || pr.color,
             camPos: t.cameraPosition,
             timeElapsed: a.animation ? (this.layer.getRenderer().getFrameTimestamp() || 0) / (1 / (a.waterSpeed || 1) * 1e4) : 0,
-            normalTexture: this.ks || this.Ps,
-            heightTexture: this.Os || this.Ps,
+            normalTexture: this.Is || this.Ts,
+            heightTexture: this.Cs || this.Ts,
             waveParams: [ .09, a.uvScale || 3, .03, -.5 ],
             waterDir: vr(l, a.waterDirection || 0),
             waterBaseColor: a.waterBaseColor || [ .1451, .2588, .4863, 1 ],
             contrast: a.contrast || 1,
-            hsv: a.hsv || yr
+            hsv: a.hsv || mr
         };
         return this.setIncludeUniformValues(h, e), e && e.ssr && e.ssr.renderUniforms && Zt(h, e.ssr.renderUniforms), 
         h;
     }
     delete() {
-        super.delete(), this.Ps && (this.Ps.destroy(), delete this.Ps), this.ks && this.ks.destroy(), 
-        this.Os && this.Os.destroy(), this.shader && this.shader.dispose(), this.ws && this.ws.dispose(), 
-        this.Ss && (this.Ss.geometry.dispose(), this.Ss.material && this.Ss.material.dispose(), 
-        this.Ss.dispose(), delete this.Ss), this.disposeIBLTextures();
+        super.delete(), this.Ts && (this.Ts.destroy(), delete this.Ts), this.Is && this.Is.destroy(), 
+        this.Cs && this.Cs.destroy(), this.shader && this.shader.dispose(), this._s && this._s.dispose(), 
+        this.Ms && (this.Ms.geometry.dispose(), this.Ms.material && this.Ms.material.dispose(), 
+        this.Ms.dispose(), delete this.Ms), this.disposeIBLTextures();
     }
     createGround() {
         const t = new n.Plane;
         t.data.aTexCoord = new Uint8Array([ 0, 1, 1, 1, 0, 0, 1, 0 ]), t.generateBuffers(this.renderer.regl), 
-        this.Ss = new n.Mesh(t, null, {
+        this.Ms = new n.Mesh(t, null, {
             castShadow: !1
-        }), this._s = new n.Scene([ this.Ss ]);
+        }), this.Ss = new n.Scene([ this.Ms ]);
     }
     transformWater() {
-        const t = this.getMap(), e = s.getGroundTransform(this.Ss.localTransform, t);
-        this.Ss.setLocalTransform(e);
-        const n = t._get2DExtentAtRes(t.getGLRes()), i = n.getWidth(), r = n.getHeight(), o = t.cameraLookAt, a = o[0] - i, l = o[1] + r, h = this.Ts, c = a / h[0], f = l / h[1], u = c % 1, d = f % 1, p = .3737 * c % 1, m = .3737 * f % 1, y = n.getWidth() / h[0] * 2, g = n.getHeight() / h[1] * 2;
-        this.Ss.setUniform("uvOffset", [ u, d ]), this.Ss.setUniform("noiseUvOffset", [ p, m ]), 
-        this.Ss.setUniform("uvScale", [ y, -g ]);
+        const t = this.getMap(), e = s.getGroundTransform(this.Ms.localTransform, t);
+        this.Ms.setLocalTransform(e);
+        const n = t._get2DExtentAtRes(t.getGLRes()), i = n.getWidth(), r = n.getHeight(), o = t.cameraLookAt, a = o[0] - i, l = o[1] + r, h = this.ks, c = a / h[0], f = l / h[1], u = c % 1, d = f % 1, p = .3737 * c % 1, y = .3737 * f % 1, m = n.getWidth() / h[0] * 2, g = n.getHeight() / h[1] * 2;
+        this.Ms.setUniform("uvOffset", [ u, d ]), this.Ms.setUniform("noiseUvOffset", [ p, y ]), 
+        this.Ms.setUniform("uvScale", [ m, -g ]);
     }
 }
 
@@ -8139,7 +8148,7 @@ const Or = Jt("heatmap", class extends He {
         o;
     }
     callRenderer(t, e) {
-        this.Fs.render(this.scene, t, this.getRenderFBO(e));
+        this.Es.render(this.scene, t, this.getRenderFBO(e));
     }
     getUniformValues(t) {
         const {projViewMatrix: e} = t;
@@ -8153,7 +8162,7 @@ const Or = Jt("heatmap", class extends He {
         return this.scene.getMeshes();
     }
     delete() {
-        super.delete(...arguments), this.Fs.dispose(), delete this.Fs;
+        super.delete(...arguments), this.Es.dispose(), delete this.Es;
     }
     init() {
         const t = this.regl;
@@ -8172,7 +8181,7 @@ const Or = Jt("heatmap", class extends He {
                 zpass: "replace"
             }
         }, r = this.getPolygonOffset(), s = this.getSymbols()[0];
-        this.Fs = new f(this.regl, this.sceneConfig, this.layer, s.heatmapColor, i, r);
+        this.Es = new f(this.regl, this.sceneConfig, this.layer, s.heatmapColor, i, r);
     }
 });
 
@@ -8182,7 +8191,7 @@ const Cr = Jt("water", gr);
 
 Cr.registerAt(ct), At.registerPainter("lit", nr), At.registerPainter("icon", hi), 
 At.registerPainter("fill", Ne), At.registerPainter("line", Ve), At.registerPainter("line-gradient", je), 
-At.registerPainter("water", gr), ct.VERSION = "0.63.5", At.VERSION = "0.63.5";
+At.registerPainter("water", gr), ct.VERSION = "0.63.8", At.VERSION = "0.63.8";
 
 if (e.mat4.create(), e.transcoders) {
     const n = t.Map.VERSION;
@@ -8194,6 +8203,6 @@ if (e.mat4.create(), e.transcoders) {
     }));
 } else t.registerWorkerAdapter("@maptalks/vt", H);
 
-export { Ne as FillPainter, xr as FillPlugin, kr as GLTFPhongPlugin, Ir as GLTFStandardPlugin, vt as GeoJSONVectorTileLayer, Or as HeatmapPlugin, hi as IconPainter, wr as IconPlugin, Ar as LineGradientPlugin, Ve as LinePainter, br as LinePlugin, Ut as LineStringLayer, Tr as LitPlugin, yt as MapboxVectorTileLayer, Bi as NativeLinePainter, Sr as NativeLinePlugin, Gi as NativePointPainter, Ki as PhongPainter, Mr as PhongPlugin, jt as PointLayer, Gt as PolygonLayer, Li as TextPainter, _r as TextPlugin, At as Vector3DLayer, ct as VectorTileLayer, nt as VectorTileLayerRenderer, Cr as WaterPlugin, Qi as WireframePainter, Pr as WireframePlugin };
+export { Ne as FillPainter, xr as FillPlugin, kr as GLTFPhongPlugin, Ir as GLTFStandardPlugin, vt as GeoJSONVectorTileLayer, Or as HeatmapPlugin, hi as IconPainter, wr as IconPlugin, Ar as LineGradientPlugin, Ve as LinePainter, br as LinePlugin, Ut as LineStringLayer, Tr as LitPlugin, mt as MapboxVectorTileLayer, Bi as NativeLinePainter, Sr as NativeLinePlugin, Gi as NativePointPainter, Ki as PhongPainter, Mr as PhongPlugin, jt as PointLayer, Gt as PolygonLayer, Li as TextPainter, _r as TextPlugin, At as Vector3DLayer, ct as VectorTileLayer, nt as VectorTileLayerRenderer, Cr as WaterPlugin, Qi as WireframePainter, Pr as WireframePlugin };
 
-"undefined" != typeof console && console.log("@maptalks/vt v0.63.5");
+"undefined" != typeof console && console.log("@maptalks/vt v0.63.8");