@maptalks/vt 0.92.1 → 0.92.2

package/dist/maptalks.vt.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/vt v0.92.1
+ * @maptalks/vt v0.92.2
  * LICENSE : undefined
  * (c) 2016-2024 maptalks.org
  */
@@ -10533,7 +10533,8 @@
             });
         }
         Hi() {
-            if (this.Ri && (this.ir(this.Ri[0], this.wi), this.ir(this.Ri[1], this.Ai)), this.Li) for (let t = 0; t < this.Li.length; t++) this.ir(this.Li[t], this.Mi);
+            if (this.Ri && (this.ir(this.Ri[0], this.wi), this.ir(this.Ri[1], this.Ai), this.Ri[0] && this.Pi.prepareCollideIndex(this.Ri[0].geometry), 
+            this.Ri[1] && this.Pi.prepareCollideIndex(this.Ri[1].geometry)), this.Li) for (let t = 0; t < this.Li.length; t++) this.ir(this.Li[t], this.Mi);
             if (this.meshes) for (let t = 0; t < this.meshes.length; t++) this.ir(this.meshes[t], this.xi);
         }
         ir(t, e) {
@@ -14078,6 +14079,10 @@
         paint(t) {
             this.isShadowIncludeChanged(t) && (this.shader.dispose(), this.Ys(t)), super.paint(t);
         }
+        isEnableStencil(t) {
+            const e = this.layer.getRenderer();
+            return !(!!(t && t.isRenderingTerrain && this.isTerrainSkin()) || !e.isEnableTileStencil || !e.isEnableTileStencil()) && "VectorTileLayer" === this.layer.getJSONType();
+        }
         init(t) {
             const e = this.regl, i = this.canvas, r = {
                 x: (t, e) => e.viewport ? e.viewport.x : 0,
@@ -14086,18 +14091,18 @@
                 height: (t, e) => e.viewport ? e.viewport.height : i ? i.height : 1
             };
             this.renderer = new n.reshader.Renderer(e);
-            const s = !!(t && t.isRenderingTerrain && this.isTerrainSkin()), o = this.layer.getRenderer(), a = {
+            const s = this.layer.getRenderer(), o = {
                 viewport: r,
                 stencil: {
-                    enable: () => !(s || !o.isEnableTileStencil || !o.isEnableTileStencil()),
+                    enable: () => this.isEnableStencil(t),
                     func: {
-                        cmp: () => o.isEnableTileStencil && o.isEnableTileStencil() ? "=" : "<=",
-                        ref: (t, e) => o.isEnableTileStencil && o.isEnableTileStencil() ? e.stencilRef : e.level
+                        cmp: () => s.isEnableTileStencil && s.isEnableTileStencil() ? "=" : "<=",
+                        ref: (t, e) => s.isEnableTileStencil && s.isEnableTileStencil() ? e.stencilRef : e.level
                     },
                     op: {
                         fail: "keep",
                         zfail: "keep",
-                        zpass: () => o.isEnableTileStencil && o.isEnableTileStencil() ? "zero" : "replace"
+                        zpass: () => s.isEnableTileStencil && s.isEnableTileStencil() ? "zero" : "replace"
                     }
                 },
                 depth: {
@@ -14122,7 +14127,7 @@
                     offset: this.getPolygonOffset()
                 }
             };
-            if (this.Ys(t, a), this.pickingFBO) {
+            if (this.Ys(t, o), this.pickingFBO) {
                 const t = [];
                 this.picking = [ new n.reshader.FBORayPicking(this.renderer, {
                     vert: Nf,
@@ -14133,7 +14138,7 @@
                             return n.mat4.multiply(t, i.projViewMatrix, i.modelMatrix), t;
                         }
                     } ],
-                    extraCommandProps: a
+                    extraCommandProps: o
                 }, this.pickingFBO, this.getMap()) ];
             }
         }
@@ -15938,7 +15943,7 @@
                 }
             }
         }
-        fa(t) {
+        prepareCollideIndex(t) {
             const {collideIds: e, elements: n, aCount: i} = t.properties;
             if (!e) return;
             const r = e, s = {};
@@ -16004,10 +16009,10 @@
                     t.positionMatrix = this.getAltitudeOffsetMatrix(), delete t.geometry.properties.iconAtlas;
                 }), f.push(...t));
             }
-            return "line" === a.properties.markerPlacement && this.da(a, r), "line" === a.properties.markerPlacement && f.forEach(t => t.properties.isLinePlacement = !0), 
-            this.fa(a), f;
+            return "line" === a.properties.markerPlacement && this.fa(a, r), "line" === a.properties.markerPlacement && f.forEach(t => t.properties.isLinePlacement = !0), 
+            this.prepareCollideIndex(a), f;
         }
-        da(t, e) {
+        fa(t, e) {
             const {collideIds: n} = t.properties, i = new Uint16Array(n.length);
             if (this.ua(t)) {
                 let r = 0;
@@ -16066,31 +16071,31 @@
             if (!this.isEnableCollision()) return;
             super.updateCollision(t);
             const e = this.scene.getMeshes();
-            e && e.length ? (this.pa(t.timestamp), this.la = [], this.po()) : this.po();
+            e && e.length ? (this.da(t.timestamp), this.la = [], this.po()) : this.po();
         }
         callCurrentTileShader(t, e) {
             this.shader.filter = e.sceneFilter ? [ this.ra, e.sceneFilter ] : this.ra, this.callRenderer(this.shader, t, e), 
-            this.ya.filter = e.sceneFilter ? [ this.oa, e.sceneFilter ] : this.oa, this.callRenderer(this.ya, t, e);
+            this.pa.filter = e.sceneFilter ? [ this.oa, e.sceneFilter ] : this.oa, this.callRenderer(this.pa, t, e);
         }
         callBackgroundTileShader(t, e) {
             this.shader.filter = e.sceneFilter ? [ this.sa, e.sceneFilter ] : this.sa, this.callRenderer(this.shader, t, e), 
-            this.ya.filter = e.sceneFilter ? [ this.aa, e.sceneFilter ] : this.aa, this.callRenderer(this.ya, t, e);
+            this.pa.filter = e.sceneFilter ? [ this.aa, e.sceneFilter ] : this.aa, this.callRenderer(this.pa, t, 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));
         }
-        pa() {
+        da() {
             if (!this.isEnableCollision()) return;
             let t = this.la;
-            t && t.length && this.ma(t);
+            t && t.length && this.ya(t);
         }
-        ga(t, e, n, i) {
+        ma(t, e, n, i) {
             return this.updateBoxCollisionFading(!0, t, e, n, i);
         }
         isEnableUniquePlacement() {
             return this.isEnableCollision() && !0 === this.sceneConfig.uniquePlacement;
         }
-        ma(t) {
+        ya(t) {
             const e = this.layer.getRenderer();
             t = t.sort(_p);
             for (let n = 0; n < t.length; n++) {
@@ -16105,12 +16110,12 @@
                 const s = e.isForeground(i.meshes[0]);
                 if (this.shouldIgnoreBackground() && !s) continue;
                 const o = i.properties.meshKey;
-                this.startMeshCollision(i), this.va(i), this.forEachBox(i, this.ga), this.xa(i), 
+                this.startMeshCollision(i), this.ga(i), this.forEachBox(i, this.ma), this.va(i), 
                 this.endMeshCollision(o);
-                for (let t = 0; t < i.meshes.length; t++) this.ba(i.meshes[t]);
+                for (let t = 0; t < i.meshes.length; t++) this.xa(i.meshes[t]);
             }
         }
-        ba(t) {
+        xa(t) {
             const e = t && t.geometry && t.geometry.properties.aOpacity;
             e && e.dirty && (t.geometry.updateData("aOpacity", e), e.dirty = !1);
         }
@@ -16120,9 +16125,9 @@
             const i = {
                 boxIndex: 0
             }, r = n.length;
-            for (let s = 0; s < r; s++) this.wa(t, n[s], e, i);
+            for (let s = 0; s < r; s++) this.ba(t, n[s], e, i);
         }
-        wa(t, e, i, r) {
+        ba(t, e, i, r) {
             const s = this.getMap(), {collideBoxIndex: o} = t.meshes[0].geometry.properties;
             if (!(o && o[e])) return !1;
             const a = n.mat4.multiply(vp, s.projViewMatrix, t.meshes[0].localTransform);
@@ -16151,16 +16156,16 @@
                 l[f].allElements = r, f++;
             }
             if (!h) return !1;
-            return i.call(this, t, l, a, r.boxIndex++) && this.Aa(t, e), !0;
+            return i.call(this, t, l, a, r.boxIndex++) && this.wa(t, e), !0;
         }
-        va(t) {
+        ga(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);
             }
         }
-        Aa(t, e) {
+        wa(t, e) {
             const n = t.meshes;
             for (let t = 0; t < n.length; t++) {
                 const i = n[t];
@@ -16175,7 +16180,7 @@
                 a.count = c;
             }
         }
-        xa(t) {
+        va(t) {
             const e = t.meshes;
             for (let t = 0; t < e.length; t++) {
                 const n = e[t], i = n && n.geometry;
@@ -16258,7 +16263,7 @@
                 extraCommandProps: i
             }), this.shader.version = 300;
             const {uniforms: r, extraCommandProps: s} = Yd.call(this, e, this.sceneConfig), o = this.ha || {};
-            if (this.ya = new n.reshader.MeshShader({
+            if (this.pa = new n.reshader.MeshShader({
                 vert: rp,
                 frag: sp,
                 uniforms: r,
@@ -16390,8 +16395,8 @@
         }
         constructor(t, e, n, i, r, s) {
             super(t, e, n, i, r, s), this.propAllowOverlap = "textAllowOverlap", this.propIgnorePlacement = "textIgnorePlacement", 
-            this.colorCache = {}, this.Ma = Ep.bind(this), this._a = Dp.bind(this), this.Sa = Np.bind(this), 
-            this.ka = Rp.bind(this), this.isLabelCollides = tp.bind(this), this.Pa();
+            this.colorCache = {}, this.Aa = Ep.bind(this), this.Ma = Dp.bind(this), this._a = Np.bind(this), 
+            this.Sa = Rp.bind(this), this.isLabelCollides = tp.bind(this), this.ka();
         }
         prepareRender(...t) {
             super.prepareRender(...t);
@@ -16403,34 +16408,34 @@
             }
         }
         updateSymbol(...t) {
-            this.Ta = void 0, this.Fa = void 0;
+            this.Pa = void 0, this.Ta = void 0;
             const e = super.updateSymbol(...t);
-            return this.Pa(), e;
+            return this.ka(), e;
         }
         isTerrainVector() {
             if (!super.isTerrainSkin()) return !1;
-            if (void 0 !== this.Ta) return this.Ta;
+            if (void 0 !== this.Pa) return this.Pa;
             for (let t = 0; t < this.symbolDef.length; t++) {
-                if ("map" !== this.symbolDef[t].textPitchAlignment) return this.Ta = !0, !0;
+                if ("map" !== this.symbolDef[t].textPitchAlignment) return this.Pa = !0, !0;
             }
-            return this.Ta = !1, !1;
+            return this.Pa = !1, !1;
         }
         isTerrainSkin() {
             if (!super.isTerrainSkin()) return !1;
-            if (void 0 !== this.Fa) return this.Fa;
+            if (void 0 !== this.Ta) return this.Ta;
             for (let t = 0; t < this.symbolDef.length; t++) {
                 const e = this.symbolDef[t].textPitchAlignment;
-                if ("map" === e || x(e) || ho.isExpression(e)) return this.Fa = !0, !0;
+                if ("map" === e || x(e) || ho.isExpression(e)) return this.Ta = !0, !0;
             }
-            return this.Fa = !1, !1;
+            return this.Ta = !1, !1;
         }
-        Pa() {
-            this.Oa = [];
+        ka() {
+            this.Fa = [];
             for (let t = 0; t < this.symbolDef.length; t++) {
                 const e = this.symbolDef[t];
                 if (ho.isExpression(e.textName)) {
                     const n = ho.createExpression(e.textName, "string");
-                    this.Oa[t] = (t, e) => {
+                    this.Fa[t] = (t, e) => {
                         let i;
                         ey.zoom = t, ny.properties = e;
                         try {
@@ -16440,7 +16445,7 @@
                         }
                         return i;
                     };
-                } else x(e.textName) && (this.Oa[t] = b(e.textName));
+                } else x(e.textName) && (this.Fa[t] = b(e.textName));
             }
         }
         shouldDeleteMeshOnUpdateSymbol(t) {
@@ -16469,7 +16474,7 @@
             s.properties.symbolIndex = o;
             const a = this.getSymbol(o), l = this.getSymbolDef(o), h = this.getFnTypeConfig(o), u = Wd.call(this, this.regl, s, e, l, a, h, this.layer.options.collision, !i, r);
             if (u.length) {
-                "line" === s.properties.textPlacement ? this.Ia = !0 : this.Ca = !0;
+                "line" === s.properties.textPlacement ? this.Oa = !0 : this.Ia = !0;
             }
             return u.forEach(t => {
                 t.positionMatrix = this.getAltitudeOffsetMatrix(), t.properties.tileVectorTransform = n;
@@ -16478,21 +16483,21 @@
         updateCollision(t) {
             super.updateCollision(t);
             const e = this.scene.getMeshes();
-            e && e.length ? (this.Ea = {}, this.Da(t.timestamp), this.po()) : this.po();
+            e && e.length ? (this.Ca = {}, this.Ea(t.timestamp), this.po()) : this.po();
         }
         callCurrentTileShader(t, e) {
-            this.shader.filter = e.sceneFilter ? [ this.Ma, e.sceneFilter ] : this.Ma, this.callRenderer(this.shader, t, e), 
-            this.Na.filter = e.sceneFilter ? [ this.Sa, e.sceneFilter ] : this.Sa, this.callRenderer(this.Na, t, e);
+            this.shader.filter = e.sceneFilter ? [ this.Aa, e.sceneFilter ] : this.Aa, this.callRenderer(this.shader, t, e), 
+            this.Da.filter = e.sceneFilter ? [ this._a, e.sceneFilter ] : this._a, this.callRenderer(this.Da, t, e);
         }
         callBackgroundTileShader(t, e) {
-            this.shader.filter = e.sceneFilter ? [ this._a, e.sceneFilter ] : this._a, this.callRenderer(this.shader, t, e), 
-            this.Na.filter = e.sceneFilter ? [ this.ka, e.sceneFilter ] : this.ka, this.callRenderer(this.Na, t, e);
+            this.shader.filter = e.sceneFilter ? [ this.Ma, e.sceneFilter ] : this.Ma, this.callRenderer(this.shader, t, e), 
+            this.Da.filter = e.sceneFilter ? [ this.Sa, e.sceneFilter ] : this.Sa, this.callRenderer(this.Da, t, e);
         }
         callRenderer(t, e, n) {
             n && n.isRenderingTerrain && x(this.symbolDef.textPitchAlignment) && (n.isRenderingTerrainSkin ? e.textPitchFilter = 1 : e.textPitchFilter = 2), 
             super.callRenderer(t, e, n);
         }
-        Da() {
+        Ea() {
             let t = this.scene.getMeshes();
             if (!t || !t.length) return;
             const e = -this.getMap().getBearing() * Math.PI / 180, i = n.mat2.fromRotation(Up, e), r = (t, e, n, i) => {
@@ -16517,7 +16522,7 @@
                 const h = n.properties.meshKey;
                 if ("line" === a.properties.textPlacement) {
                     if (!a.properties.line) continue;
-                    s && this.startMeshCollision(n), this.Ra(n, i);
+                    s && this.startMeshCollision(n), this.Na(n, i);
                     const {aOffset: t, aOpacity: e} = a.properties;
                     t.dirty && (a.updateData("aOffset", t), t.dirty = !1), e && e.dirty && (a.updateData("aOpacity", e), 
                     e.dirty = !1), s && this.endMeshCollision(h);
@@ -16542,7 +16547,7 @@
         getUniqueEntryKey(t, e) {
             return ep(t, e);
         }
-        Ra(t, e) {
+        Na(t, e) {
             const i = this.getMap(), r = t.geometry, s = r.properties;
             let o = s.line;
             if (!o) return;
@@ -16550,8 +16555,8 @@
             if (!c) {
                 const e = n.mat4.multiply(zp, i.projViewMatrix, t.localTransform), r = o.id + "-" + e.join();
                 let a;
-                this.Ea[r] ? o = this.Ea[r] : (a = s.projectedLine = s.projectedLine || new Array(o.length), 
-                o = this.La(a, o, e, i.width, i.height), this.Ea[r] = a);
+                this.Ca[r] ? o = this.Ca[r] : (a = s.projectedLine = s.projectedLine || new Array(o.length), 
+                o = this.Ra(a, o, e, i.width, i.height), this.Ca[r] = a);
             }
             const d = this.isEnableCollision(), p = r.properties.visElemts = r.properties.visElemts || new f.constructor(f.length), y = r.properties.visCache = r.properties.visCache || [];
             d && (p.count = 0);
@@ -16559,7 +16564,7 @@
             this.forEachBox(t, (t, n, i, r) => {
                 const {start: s, end: a} = n[0];
                 let l = y[r];
-                if ((void 0 === l || m) && (l = this.za(t, f, s, a, o, i, c ? e : null, r)), y[r] = l, 
+                if ((void 0 === l || m) && (l = this.La(t, f, s, a, o, i, c ? e : null, r)), y[r] = l, 
                 d && (l = this.updateBoxCollisionFading(l, t, n, i, r), l)) {
                     let t = p.count;
                     for (let e = s; e < a; e++) p[t++] = f[e];
@@ -16569,7 +16574,7 @@
             const g = t.geometry.properties.aAltitude;
             g && g.dirty && (r.updateData("aAltitude", g), g.dirty = !1), !d || p.count === f.length && r.count === p.count || r.setElements(p, p.count);
         }
-        La(t, e, i, r, s) {
+        Ra(t, e, i, r, s) {
             return function(t, e, i, r, s) {
                 for (let o = 0; o < e.length; o += 3) n.vec4.set(uf, e[o], e[o + 1], e[o + 2], 1), 
                 cf(uf, uf, i, r, s), t[o] = uf[0], t[o + 1] = uf[1], t[o + 2] = e[o + 2];
@@ -16585,7 +16590,7 @@
             for (let n = 0; n <= l.length; n += 6) if (d = l[n], h[d] !== y || n === l.length) {
                 const i = a[y] && a[y].feature;
                 if (u && this.isMeshUniquePlaced(t) && i && !i.label) {
-                    const e = i.properties || {}, {symbolIndex: n} = t.properties, r = n && this.Oa[n.index] ? this.Oa[n.index](t.properties.z, e) : this.getSymbol(t.properties.symbolIndex).textName, s = Io.resolveText(r, e);
+                    const e = i.properties || {}, {symbolIndex: n} = t.properties, r = n && this.Fa[n.index] ? this.Fa[n.index](t.properties.z, e) : this.getSymbol(t.properties.symbolIndex).textName, s = Io.resolveText(r, e);
                     i.label = s;
                 }
                 const s = n, m = o[l[p]];
@@ -16594,7 +16599,7 @@
                 y = h[d], p = n;
             }
         }
-        za(t, e, i, r, s, o, a) {
+        La(t, e, i, r, s, o, a) {
             const l = this.layer.getRenderer(), h = t.material.uniforms, u = 1 === h.pitchWithMap, c = !u && l.getTerrainHelper && l.getTerrainHelper(), f = this.isEnableCollision(), d = this.getMap(), p = t.geometry, y = p.desc.positionSize, {aShape: m, aOffset: g, aAnchor: v, aAltitude: x, aPitchRotation: b} = p.properties;
             let {aProjectedAnchor: w} = p.properties;
             w || (w = p.properties.aProjectedAnchor = new Array(v.length / y * 3));
@@ -16615,7 +16620,7 @@
             M && (k = P), w[3 * _] = F[0], w[3 * _ + 1] = F[1], w[3 * _ + 2] = F[2];
             const I = M ? 1 : p.properties.tileExtent / this.layer.getTileSize().width;
             let C = !0;
-            const E = e[i], D = e[r - 1], N = A ? A[E] : t.properties.textSize, R = this.Ha(t, N, s, E, D, k, Vp, I, a);
+            const E = e[i], D = e[r - 1], N = A ? A[E] : t.properties.textSize, R = this.za(t, N, s, E, D, k, Vp, I, a);
             if (null === R) return hy(g, e, i, r), !1;
             const L = D - E <= 3, z = Math.floor(R / 2), H = R % 2;
             for (let a = i; a < r; a += 6) {
@@ -16650,7 +16655,7 @@
             }
             return C;
         }
-        Ha(t, e, n, i, r, s, o, a, l) {
+        za(t, e, n, i, r, s, o, a, l) {
             const h = r - i <= 3, u = this.getMap();
             return h ? 0 : Ip.call(this, Qp, ty, t, e, n, i, r, s, o, a, u.width / u.height, l);
         }
@@ -16663,7 +16668,7 @@
             }) : t.material && delete t.material.uniforms.texture), super.deleteMesh(t, e));
         }
         delete() {
-            super.delete(), this.Na.dispose(), delete this.Ea, this.Ua && this.Ua.dispose();
+            super.delete(), this.Da.dispose(), delete this.Ca, this.Ha && this.Ha.dispose();
         }
         needClearStencil() {
             return !0;
@@ -16685,7 +16690,7 @@
             });
             let o = i;
             if (this.layer.getRenderer().isEnableWorkAround("win-intel-gpu-crash") && (o = zl({}, i), 
-            o.stencil = zl({}, i.stencil), o.stencil.enable = !0), this.Na = new n.reshader.MeshShader({
+            o.stencil = zl({}, i.stencil), o.stencil.enable = !0), this.Da = new n.reshader.MeshShader({
                 vert: Cp,
                 frag: sp,
                 uniforms: e,
@@ -17042,7 +17047,7 @@
             Object.defineProperty(l.uniforms, "uvOrigin", {
                 enumerable: !0,
                 get: () => {
-                    const t = this.Va(w, o, i, y, x, a);
+                    const t = this.Ua(w, o, i, y, x, a);
                     return n.vec2.set(b, t[0] - t[0] % 1, t[1] - t[1] % 1);
                 }
             });
@@ -17050,7 +17055,7 @@
             Object.defineProperty(l.uniforms, "uvOffset", {
                 enumerable: !0,
                 get: () => {
-                    const t = this.Va(w, o, i, y, x, a);
+                    const t = this.Ua(w, o, i, y, x, a);
                     return n.vec2.set(b, t[0] % 1, t[1] % 1);
                 }
             }), Object.defineProperty(l.uniforms, "hasAlpha", {
@@ -17066,7 +17071,7 @@
                 get: () => g.isForeground(l) ? 0 : A - l.properties.tile.z
             }), l.properties.symbolIndex = o, l;
         }
-        Va(t, e, i, r, s, o) {
+        Ua(t, e, i, r, s, o) {
             if (1 === this.dataConfig.topUVMode) return gy;
             const a = this.getMap(), l = this.getSymbol(e).material;
             let h = i;
@@ -17107,10 +17112,10 @@
             return o[0] = s * t[0], o[1] = s * t[0], r || (o[0] %= 1, o[1] %= 1), o;
         }
         needPolygonOffset() {
-            return this.ja;
+            return this.Va;
         }
         startFrame(...t) {
-            return delete this.ja, super.startFrame(...t);
+            return delete this.Va, super.startFrame(...t);
         }
         addMesh(t, e) {
             t.forEach(t => {
@@ -17123,7 +17128,7 @@
                 0 === e && (e = .01), vy[2] = e, n.mat4.fromScaling(i, vy), n.mat4.multiply(i, t.properties.tileTransform, i), 
                 t.setLocalTransform(i);
             } else t.setLocalTransform(t.properties.tileTransform);
-            t.material !== this.material && t.setMaterial(this.material), t.geometry.properties.maxAltitude <= 0 && (this.ja = !0), 
+            t.material !== this.material && t.setMaterial(this.material), t.geometry.properties.maxAltitude <= 0 && (this.Va = !0), 
             this.getSymbol(t.properties.symbolIndex).ssr ? t.ssr = 1 : t.ssr = 0;
         }
         deleteMaterial() {
@@ -17223,10 +17228,10 @@
             return this.shader;
         }
         delete(t) {
-            this.getMap().off("updatelights", this.Ba, this), super.delete(t), this.material.dispose();
+            this.getMap().off("updatelights", this.ja, this), super.delete(t), this.material.dispose();
         }
         init() {
-            this.getMap().on("updatelights", this.Ba, this);
+            this.getMap().on("updatelights", this.ja, this);
             const t = this.regl;
             this.renderer = new n.reshader.Renderer(t);
             const e = this.getShaderConfig();
@@ -17246,7 +17251,7 @@
             };
             this.picking = [ new n.reshader.FBORayPicking(this.renderer, i, this.layer.getRenderer().pickingFBO, this.getMap()) ];
         }
-        Ba() {
+        ja() {
             this.setToRedraw();
         }
         getShaderConfig() {
@@ -17302,7 +17307,7 @@
             this.material = new n.reshader.PhongMaterial(e);
         }
         getUniformValues(t, e) {
-            const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, s = this.Ga(), o = zl({
+            const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, s = this.Ba(), o = zl({
                 viewMatrix: n,
                 projMatrix: i,
                 cameraPosition: r,
@@ -17315,7 +17320,7 @@
         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        ";
         }
-        Ga() {
+        Ba() {
             const t = this.getMap().getLightManager(), e = t && t.getAmbientLight() || {}, n = t && t.getDirectionalLight() || {};
             return {
                 ambientColor: e.color || [ .2, .2, .2 ],
@@ -17411,20 +17416,20 @@
     const {getPBRUniforms: Ey} = n.reshader.pbr.PBRUtils;
     class Dy extends Py {
         constructor(...t) {
-            super(...t), this.Wa = new n.reshader.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
+            super(...t), this.Ga = new n.reshader.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
         }
         supportRenderMode(t) {
             return this.getSymbols()[0].ssr ? "fxaa" === t || "fxaaAfterTaa" === t : super.supportRenderMode(t);
         }
         isAnimating() {
-            const t = this.$a();
+            const t = this.Wa();
             if (t && (t[0] || t[1])) return !0;
         }
         needToRedraw() {
-            const t = this.$a();
+            const t = this.Wa();
             return !(!t || !t[0] && !t[1]) || super.needToRedraw();
         }
-        $a() {
+        Wa() {
             const t = this.getSymbols()[0];
             return t.material && t.material.uvOffsetAnim;
         }
@@ -17447,32 +17452,32 @@
         paint(t) {
             const e = !!t.shadow;
             t.states && t.states.includesChanged && (this.shader.dispose(), delete this.shader, 
-            this.Xa.dispose(), delete this.Xa, this.Ys(t));
+            this.$a.dispose(), delete this.$a, this.Ys(t));
             let n = !!t.ssr && this.getSymbols()[0].ssr;
             const i = this.shader, r = i.shaderDefines;
             if (n) {
                 const e = zl({}, r, t.ssr.defines);
                 i.shaderDefines = e;
             }
-            if (t.onlyUpdateDepthInTaa && (this.shader = this.Xa, !n && this.Ya && (this.shader = i, 
+            if (t.onlyUpdateDepthInTaa && (this.shader = this.$a, !n && this.Xa && (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, this.Ya = n;
+            this.shader = i, n && (i.shaderDefines = r), delete this.shadowCount, this.Xa = n;
         }
         updateSceneConfig(t) {
             zl(this.sceneConfig, t), this.setToRedraw();
         }
         delete() {
-            super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.Xa && (this.Xa.dispose(), 
-            delete this.Xa);
+            super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.$a && (this.$a.dispose(), 
+            delete this.$a);
         }
         init(t) {
-            this.getMap().on("updatelights", this.qa, this), this.createIBLTextures(), this.Zs = this.Zs || t;
+            this.getMap().on("updatelights", this.Ya, this), this.createIBLTextures(), this.Zs = this.Zs || t;
             const e = this.regl;
-            this.renderer = new n.reshader.Renderer(e), this.Ja = this.Ka.bind(this), this.Za = this.disposeCachedTexture.bind(this), 
-            this.Qa = this.el.bind(this), this.Wr(), this.Ys(t);
+            this.renderer = new n.reshader.Renderer(e), this.qa = this.Ja.bind(this), this.Ka = this.disposeCachedTexture.bind(this), 
+            this.Za = this.Qa.bind(this), this.Wr(), this.Ys(t);
             const i = {
                 vert: "\n                #include <gl2_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: [ {
@@ -17534,17 +17539,17 @@
                 }
             }, o = {
                 uniforms: r,
-                defines: this.nl(i),
+                defines: this.el(i),
                 extraCommandProps: s
             };
             this.shader = new n.reshader.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.Xa = new n.reshader.pbr.StandardShader(o);
+            this.$a = new n.reshader.pbr.StandardShader(o);
         }
-        Ka({resources: t}) {
+        Ja({resources: t}) {
             for (let e = 0; e < t.length; e++) this.addCachedTexture(t[e].url, t[e].data);
             this.setToRedraw(!0);
         }
-        el() {
+        Qa() {
             this.setToRedraw(!0);
         }
         Wr(t) {
@@ -17571,14 +17576,14 @@
                     url: a,
                     wrap: "repeat"
                 }), o.flipY = !e.upsideUpTexture, o.min = "linear mipmap linear", o.mag = "linear", 
-                r[t] = new n.reshader.Texture2D(o, this.Wa), r[t].once("complete", this.Ja), r[t].once("disposed", this.Za), 
+                r[t] = new n.reshader.Texture2D(o, this.Ga), r[t].once("complete", this.qa), r[t].once("disposed", this.Ka), 
                 r[t].promise && this.addCachedTexture(a, r[t].promise), s = !0;
             } else r[t] = i[t];
             if (void 0 === r.alphaTest && this.getMaterialClazz && (r.alphaTest = .05), this.material) {
                 for (let t in r) this.material.set(t, r[t]);
                 this.setToRedraw(!0);
-            } else this.material = new n.reshader.pbr.StandardMaterial(r), this.material.once("complete", this.Qa);
-            s || this.el();
+            } else this.material = new n.reshader.pbr.StandardMaterial(r), this.material.once("complete", this.Za);
+            s || this.Qa();
         }
         getShader() {
             return this.shader;
@@ -17587,13 +17592,13 @@
             const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = Ey(t, n, i, e && e.ssr, e && e.jitter);
             return this.setIncludeUniformValues(r, e), r;
         }
-        nl(t) {
+        el(t) {
             return this.hasIBL() ? t.HAS_IBL_LIGHTING = 1 : delete t.HAS_IBL_LIGHTING, t;
         }
-        qa() {
+        Ya() {
             if (!this.shader) return;
             const t = this.shader.shaderDefines;
-            this.nl(t), this.shader.shaderDefines = t;
+            this.el(t), this.shader.shaderDefines = t;
         }
     }
     var Ny = "#include <gl2_vert>\n#define EXTRUDE_SCALE 63.0\n#define EXTRUDE_MOD 64.0\n#define MAX_LINE_DISTANCE 65535.0\nuniform mat4 projViewModelMatrix;\nuniform vec2 centiMeterToLocal;\n#ifdef HAS_ALTITUDE\nattribute vec2 aPosition;\nattribute float aAltitude;\n#else\nattribute vec3 aPosition;\n#endif\nattribute vec4 aTubeNormal;\n#ifdef HAS_LINE_WIDTH\nattribute float aLineWidth;\n#else\nuniform float lineWidth;\n#endif\n#include <vt_position_vert>\n#ifdef PICKING_MODE\n#include <fbo_picking_vert>\n#else\nuniform mat4 modelViewMatrix;\nuniform mat3 modelNormalMatrix;\nuniform mat4 modelMatrix;\n#if defined(HAS_PATTERN)\nuniform float resolution;\nuniform float tileResolution;\nuniform float tileRatio;\nattribute float aLinesofar;\nvarying highp float vLinesofar;\nattribute vec4 aTexInfo;\nvarying vec4 vTexInfo;\nvarying float vNormalY;\nvarying float vPatternHeight;\nattribute float aNormalDistance;\n#if defined(HAS_PATTERN_ANIM)\nattribute float aLinePatternAnimSpeed;\nvarying float vLinePatternAnimSpeed;\n#endif\n#if defined(HAS_PATTERN_GAP)\nattribute float aLinePatternGap;\nvarying float vLinePatternGap;\n#endif\n#endif\n#ifdef HAS_COLOR\nattribute vec4 aColor;\nvarying vec4 vColor;\n#endif\n#ifdef HAS_OPACITY\nattribute float aOpacity;\n#endif\nvarying float vOpacity;\nvarying vec3 vModelNormal;\nvarying vec4 vViewVertex;\nvarying vec3 vModelVertex;\n#endif\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\n#include <vsm_shadow_vert>\n#endif\n#include <highlight_vert>\nvoid main() {\n  \n#ifdef HAS_LINE_WIDTH\nfloat c = aLineWidth;\n#else\nfloat c = lineWidth;\n#endif\nfloat d = c / 2.;\n  vec3 e = aTubeNormal.xyz / EXTRUDE_SCALE;\n  vec3 f = unpackVTPosition();\n  vec4 h = vec4(f, 1.);\n  h.xy += e.xy * d * centiMeterToLocal;\n  h.z += e.z * d;\n  gl_Position = projViewModelMatrix * h;\n#ifdef PICKING_MODE\nfbo_picking_setData(gl_Position.w, true);\n#else\nvViewVertex = modelViewMatrix * h;\n  vec3 i = normalize(e);\n  vModelNormal = modelNormalMatrix * i;\n  vModelVertex = (modelMatrix * h).xyz;\n#if defined(HAS_SHADOWING) && !defined(HAS_BLOOM)\nshadow_computeShadowPars(h);\n#endif\n#ifdef HAS_COLOR\nvColor = aColor / 255.;\n#endif\n#ifdef HAS_OPACITY\nvOpacity = aOpacity / 255.;\n#else\nvOpacity = 1.;\n#endif\n#ifdef HAS_PATTERN\nfloat j = tileResolution / resolution;\n  float k = aLinesofar - d * centiMeterToLocal.y * aNormalDistance / EXTRUDE_SCALE;\n  vLinesofar = k / tileRatio * j;\n  vTexInfo = vec4(aTexInfo.xy, aTexInfo.zw + 1.);\n  vPatternHeight = c * centiMeterToLocal.x / tileRatio * j;\n  vNormalY = aTubeNormal.w / EXTRUDE_SCALE;\n#if defined(HAS_PATTERN_ANIM)\nvLinePatternAnimSpeed = aLinePatternAnimSpeed / 127.;\n#endif\n#if defined(HAS_PATTERN_GAP)\nvLinePatternGap = aLinePatternGap / 10.0;\n#endif\n#endif\nhighlight_setVarying();\n#endif\n}";
@@ -17664,7 +17669,7 @@
             super.paint(t);
         }
         init(t) {
-            this.getMap().on("updatelights", this.qa, this), this.createIBLTextures();
+            this.getMap().on("updatelights", this.Ya, this), this.createIBLTextures();
             const e = this.regl;
             if (this.renderer = new n.reshader.Renderer(e), this.createShader(t), this.pickingFBO) {
                 const t = [];
@@ -17699,7 +17704,7 @@
             }), this.shader = new n.reshader.pbr.StandardShader({
                 vert: Ny,
                 uniforms: e,
-                defines: this.nl(i),
+                defines: this.el(i),
                 extraCommandProps: this.getExtraCommandProps()
             });
         }
@@ -17814,13 +17819,13 @@
                 }
             } ];
         }
-        nl(t) {
+        el(t) {
             return this.hasIBL() ? t.HAS_IBL_LIGHTING = 1 : delete t.HAS_IBL_LIGHTING, t;
         }
-        qa() {
+        Ya() {
             if (!this.shader) return;
             const t = this.shader.shaderDefines;
-            this.nl(t), this.shader.shaderDefines = t;
+            this.el(t), this.shader.shaderDefines = t;
         }
         delete() {
             super.delete(), this.disposeIBLTextures(), this.shader && (this.shader.dispose(), 
@@ -17829,13 +17834,13 @@
     }
     const zy = [], Hy = [], Uy = [], Vy = [], jy = [], By = [ 0, 0, 0 ], Gy = [ 0, 0, 0 ], Wy = [ 1, 1, 1 ], $y = [], Xy = [ 1, 1, 1, 1 ], Yy = [], qy = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], Jy = t => class extends t {
         constructor(t, e, i, r, s, o) {
-            super(t, e, i, r, s, o), this.il = !1, this.scene.sortFunction = this.sortByCommandKey, 
-            this.rl = new n.reshader.GLTFManager(t), this.sl(), this.ol();
+            super(t, e, i, r, s, o), this.nl = !1, this.scene.sortFunction = this.sortByCommandKey, 
+            this.il = new n.reshader.GLTFManager(t), this.rl(), this.sl();
         }
         isAnimating() {
             const t = this.getSymbols();
             for (let e = 0; e < t.length; e++) {
-                if (t[e] && this.al[e] && this.ll(e)) return !0;
+                if (t[e] && this.ol[e] && this.al(e)) return !0;
             }
             return !1;
         }
@@ -17855,7 +17860,7 @@
             return $y;
         }
         createMesh(t, e, {tileTranslationMatrix: i, tileExtent: r}, {timestamp: s}) {
-            if (!this.il) return null;
+            if (!this.nl) return null;
             const o = this.getMap(), {geometry: a} = t, {positionSize: l, features: h} = a, {aPosition: u, aPickingId: c, aXYRotation: f, aZRotation: d, aAltitude: p} = a.data, y = u.length / l;
             if (0 === y) return null;
             const m = {
@@ -17863,7 +17868,7 @@
                 instance_vectorB: new Float32Array(4 * y),
                 instance_vectorC: new Float32Array(4 * y),
                 aPickingId: []
-            }, g = this.hl(m, i, r, a.properties.z, u, p, f, d, l, c, h);
+            }, g = this.ll(m, i, r, a.properties.z, u, p, f, d, l, c, h);
             a.data.aTerrainAltitude && (m.aTerrainAltitude = a.data.aTerrainAltitude);
             const v = {};
             for (const t in m) v[t] = {
@@ -17873,22 +17878,22 @@
                 }),
                 divisor: 1
             };
-            const x = this.ul(), b = this.cl(), w = n.mat4.identity([]);
+            const x = this.hl(), b = this.ul(), w = n.mat4.identity([]);
             n.mat4.scale(w, w, [ b, b, b ]);
             const A = [], M = this.getSymbols();
             for (let t = 0; t < M.length; t++) {
-                const e = M[t], r = this.fl[t];
+                const e = M[t], r = this.cl[t];
                 if (!r) continue;
-                const l = this.al[t][0], {fixSizeOnZoom: h} = e;
+                const l = this.ol[t][0], {fixSizeOnZoom: h} = e;
                 let u = n.mat4.identity([]);
-                x || (u = this.dl(u));
+                x || (u = this.fl(u));
                 let c = 0;
                 r.forEach(t => {
                     const {geometry: i, nodeMatrix: r} = t;
                     n.mat4.multiply(Yy, qy, r), n.mat4.multiply(Yy, u, Yy);
                     const s = n.mat4.multiply(Yy, w, Yy), o = i.boundingBox.copy();
                     o.transform(s);
-                    const a = this.pl(o, e);
+                    const a = this.dl(o, e);
                     Math.abs(a) > Math.abs(c) && (c = a);
                 });
                 const f = [ 0, 0, c ], d = r.map((r, d) => {
@@ -17899,17 +17904,17 @@
                         picking: !0
                     });
                     if (l.hasSkinAnimation()) {
-                        const e = this.yl(k, t, 0)[M];
+                        const e = this.pl(k, t, 0)[M];
                         k.setUniform("jointTexture", e.jointTexture), k.setUniform("jointTextureSize", e.jointTextureSize), 
-                        k.setUniform("numJoints", e.numJoints), k.setUniform("skinAnimation", +this.ll(t)), 
+                        k.setUniform("numJoints", e.numJoints), k.setUniform("skinAnimation", +this.al(t)), 
                         k.properties.startTime = s, S.HAS_SKIN = 1;
                     }
                     b && (k.setUniform("morphWeights", b), S.HAS_MORPH = 1), k.setUniform("hasAlpha", A.alphaMode && "BLEND" === A.alphaMode.toUpperCase()), 
                     Bl(k.uniforms, "polygonFill", e, "markerFill", Xy, $l(this.colorCache)), Bl(k.uniforms, "polygonOpacity", e, "markerOpacity", 1);
                     const P = [];
                     k.setPositionMatrix(() => {
-                        const e = this.ml(t, d, M);
-                        n.mat4.multiply(P, qy, e), this.dl(u), n.mat4.multiply(P, u, P), n.mat4.multiply(P, w, P);
+                        const e = this.yl(t, d, M);
+                        n.mat4.multiply(P, qy, e), this.fl(u), n.mat4.multiply(P, u, P), n.mat4.multiply(P, w, P);
                         const i = n.mat4.identity(Yy);
                         if (0 !== c && (n.mat4.fromTranslation(i, f), n.mat4.multiply(P, i, P)), ql(h)) {
                             const t = o.getGLScale() / o.getGLScale(h);
@@ -17939,19 +17944,19 @@
                 positionSize: l
             }, A;
         }
-        ml(t, e, n) {
-            const i = t, r = this.fl[i][e];
-            return this.ll(t) && this.vl && this.vl[n] || r.nodeMatrix;
-        }
         yl(t, e, n) {
-            if (!this.al) return;
-            const i = this.al[e][0];
-            this.xl || (this.xl = {}), this.vl = {}, this.xl[t.uuid] || (this.xl[t.uuid] = {});
-            const r = this.getSymbols()[e], s = this.wl[e], {loop: o, speed: a, animationName: l} = r, h = l || s.animations[0].name;
-            return i.updateAnimation(n, o || !1, a || 1, h, t.properties.startTime || 0, this.vl, this.xl[t.uuid]), 
-            this.xl[t.uuid];
-        }
-        pl(t, e) {
+            const i = t, r = this.cl[i][e];
+            return this.al(t) && this.ml && this.ml[n] || r.nodeMatrix;
+        }
+        pl(t, e, n) {
+            if (!this.ol) return;
+            const i = this.ol[e][0];
+            this.vl || (this.vl = {}), this.ml = {}, this.vl[t.uuid] || (this.vl[t.uuid] = {});
+            const r = this.getSymbols()[e], s = this.xl[e], {loop: o, speed: a, animationName: l} = r, h = l || s.animations[0].name;
+            return i.updateAnimation(n, o || !1, a || 1, h, t.properties.startTime || 0, this.ml, this.vl[t.uuid]), 
+            this.vl[t.uuid];
+        }
+        dl(t, e) {
             const n = e.anchorZ || "center";
             let i = 0;
             const r = t.max[2] - t.min[2];
@@ -17964,8 +17969,8 @@
             for (let e = 0; e < t.length; e++) {
                 if (!t[e] || !t[e].geometry) continue;
                 t[e].instancedData.aTerrainAltitude && this.gs(t[e], t[e].instancedData, t[e].properties, 3, n);
-                const r = t[e].properties.symbolIndex.index, s = this.ll(r);
-                s && this.yl(t[e], r, i), t[e].setUniform("skinAnimation", +s);
+                const r = t[e].properties.symbolIndex.index, s = this.al(r);
+                s && this.pl(t[e], r, i), t[e].setUniform("skinAnimation", +s);
             }
             return this.scene.addMesh(t), this;
         }
@@ -17976,8 +17981,8 @@
             const e = this.getSymbols();
             let n = !1;
             for (let t = 0; t < e.length; t++) {
-                if (!e[t] || !this.al[t]) continue;
-                if (this.ll(t) && this.al[t] && !n) {
+                if (!e[t] || !this.ol[t]) continue;
+                if (this.al(t) && this.ol[t] && !n) {
                     n = !0;
                     break;
                 }
@@ -17989,11 +17994,11 @@
             this.shadowCount = this.scene.getMeshes().length;
             return this.scene.getMeshes().filter(t => 0 === t.properties.level);
         }
-        ll(t) {
+        al(t) {
             const e = this.getSymbols()[t];
-            return !!(e && e.animation && this.al[t] && this.al[t][0] && this.al[t][0].hasSkinAnimation());
+            return !!(e && e.animation && this.ol[t] && this.ol[t][0] && this.ol[t][0].hasSkinAnimation());
         }
-        hl(t, e, i, r, s, o, a, l, h, u, c) {
+        ll(t, e, i, r, s, o, a, l, h, u, c) {
             function f(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];
             }
@@ -18006,7 +18011,7 @@
                 e[0] < g && (g = e[0]), e[0] > b && (b = e[0]), e[1] < v && (v = e[1]), e[1] > w && (w = e[1]), 
                 e[2] < x && (x = e[2]), e[2] > A && (A = e[2]);
             }
-            const S = (g + b) / 2, k = (v + w) / 2, P = (x + A) / 2, T = [], F = this.ul(), O = [ 0, 0, 1 ];
+            const S = (g + b) / 2, k = (v + w) / 2, P = (x + A) / 2, T = [], F = this.hl(), O = [ 0, 0, 1 ];
             for (let e = 0; e < d; e++) {
                 o ? n.vec3.set(_, s[e * h], s[e * h + 1], o[e]) : fl.unpackPosition(_, s[e * h], s[e * h + 1], s[e * h + 2]);
                 const i = _[0], r = _[1], d = n.vec3.set(M, i * p - S, -r * p - k, (_[2] + m) * y - P), g = a && a[e] || 0, v = l && l[e] || 0;
@@ -18018,7 +18023,7 @@
                     n.mat4.multiply(T, s, T);
                 } else n.mat4.fromTranslation(T, d);
                 if (F) {
-                    const t = this.dl(Yy, c, u, e);
+                    const t = this.fl(Yy, c, u, e);
                     n.mat4.multiply(T, T, t);
                 }
                 f("instance_vectorA", e, T, 0), f("instance_vectorB", e, T, 1), f("instance_vectorC", e, T, 2), 
@@ -18026,30 +18031,30 @@
             }
             return n.vec3.set(M, S, k, P), M;
         }
-        cl() {
-            if (!this.Al) {
+        ul() {
+            if (!this.wl) {
                 const t = this.getMap();
-                this.Al = 100 * R(t.getGLRes(), t);
+                this.wl = 100 * R(t.getGLRes(), t);
             }
-            return this.Al;
+            return this.wl;
         }
-        dl(t, e, i, r) {
-            const s = this.getMap(), o = this.symbolDef[0], a = this.cl();
+        fl(t, e, i, r) {
+            const s = this.getMap(), o = this.symbolDef[0], a = this.ul();
             let l = o.translationX || 0, h = o.translationY || 0, u = o.translationZ || 0, c = o.rotationX || 0, f = o.rotationY || 0, d = o.rotationZ || 0, p = o.scaleX || 1, y = o.scaleY || 1, m = o.scaleZ || 1;
-            const g = i && i[r], v = e && e[g], x = s.getZoom(), b = v && v.feature && v.feature.properties, w = this.Ml(x, b);
-            this._l && (l = this._l(x, b)), this.Sl && (h = this.Sl(x, b)), this.kl && (u = this.kl(x, b));
+            const g = i && i[r], v = e && e[g], x = s.getZoom(), b = v && v.feature && v.feature.properties, w = this.Al(x, b);
+            this.Ml && (l = this.Ml(x, b)), this._l && (h = this._l(x, b)), this.Sl && (u = this.Sl(x, b));
             const A = n.vec3.set(Hy, l * a, h * a, u * a);
-            this.Pl && (c = this.Pl(x, b)), this.Tl && (f = this.Tl(x, b)), this.Fl && (d = this.Fl(x, b));
+            this.kl && (c = this.kl(x, b)), this.Pl && (f = this.Pl(x, b)), this.Tl && (d = this.Tl(x, b));
             const M = n.vec3.set(Uy, c, f, d);
-            this.Ol && (p = this.Ol(x, b)), this.Il && (y = this.Il(x, b)), this.Cl && (m = this.Cl(x, b));
+            this.Fl && (p = this.Fl(x, b)), this.Ol && (y = this.Ol(x, b)), this.Il && (m = this.Il(x, b));
             const _ = n.vec3.set(Vy, p * w, y * w, m * w);
-            return this.El(t, A, M, _);
+            return this.Cl(t, A, M, _);
         }
-        Ml(t, e) {
+        Al(t, e) {
             const n = this.symbolDef[0];
-            let i = this.Dl ? this.Dl(t, e) : n.modelHeight;
+            let i = this.El ? this.El(t, e) : n.modelHeight;
             if (C(i)) return 1;
-            const r = this.Nl[0];
+            const r = this.Dl[0];
             return i / Math.abs(r.max[1] - r.min[1]);
         }
         getShaderConfig() {
@@ -18057,40 +18062,40 @@
             return t.positionAttribute = "POSITION", t.normalAttribute = "NORMAL", t;
         }
         init(t) {
-            super.init(t), this.ol();
+            super.init(t), this.sl();
         }
-        sl() {
+        rl() {
             const t = this.symbolDef[0];
-            x(t.modelHeight) && (this.Dl = b(t.modelHeight)), x(t.translationX) && (this._l = b(t.translationX)), 
-            x(t.translationY) && (this.Sl = b(t.translationY)), x(t.translationZ) && (this.kl = b(t.translationZ)), 
-            x(t.rotationX) && (this.Pl = b(t.rotationX)), x(t.rotationY) && (this.Tl = b(t.rotationY)), 
-            x(t.rotationZ) && (this.Fl = b(t.rotationZ)), x(t.scaleX) && (this.Ol = b(t.scaleX)), 
-            x(t.scaleY) && (this.Il = b(t.scaleY)), x(t.scaleZ) && (this.Cl = b(t.scaleZ));
+            x(t.modelHeight) && (this.El = b(t.modelHeight)), x(t.translationX) && (this.Ml = b(t.translationX)), 
+            x(t.translationY) && (this._l = b(t.translationY)), x(t.translationZ) && (this.Sl = b(t.translationZ)), 
+            x(t.rotationX) && (this.kl = b(t.rotationX)), x(t.rotationY) && (this.Pl = b(t.rotationY)), 
+            x(t.rotationZ) && (this.Tl = b(t.rotationZ)), x(t.scaleX) && (this.Fl = b(t.scaleX)), 
+            x(t.scaleY) && (this.Ol = b(t.scaleY)), x(t.scaleZ) && (this.Il = b(t.scaleZ));
         }
-        ul() {
-            return !!(this.Dl && !this.Dl.isFeatureConstant || this._l && !this._l.isFeatureConstant || this.Sl && !this.Sl.isFeatureConstant || this.kl && !this.kl.isFeatureConstant || this.Pl && !this.Pl.isFeatureConstant || this.Tl && !this.Tl.isFeatureConstant || this.Fl && !this.Fl.isFeatureConstant || this.Ol && !this.Ol.isFeatureConstant || this.Il && !this.Il.isFeatureConstant || this.Cl && !this.Cl.isFeatureConstant);
+        hl() {
+            return !!(this.El && !this.El.isFeatureConstant || this.Ml && !this.Ml.isFeatureConstant || this._l && !this._l.isFeatureConstant || this.Sl && !this.Sl.isFeatureConstant || this.kl && !this.kl.isFeatureConstant || this.Pl && !this.Pl.isFeatureConstant || this.Tl && !this.Tl.isFeatureConstant || this.Fl && !this.Fl.isFeatureConstant || this.Ol && !this.Ol.isFeatureConstant || this.Il && !this.Il.isFeatureConstant);
         }
-        ol() {
-            if (this.al) return;
-            this.al = [], this.wl = [], this.Nl = [], this.fl = [];
+        sl() {
+            if (this.ol) return;
+            this.ol = [], this.xl = [], this.Dl = [], this.cl = [];
             const t = this.getSymbols();
-            this.Rl = 0;
+            this.Nl = 0;
             for (let e = 0; e < t.length; e++) {
                 const n = t[e].url || "pyramid";
-                this.rl.loginGLTF(n);
-                const i = this.rl.getGLTF(n);
+                this.il.loginGLTF(n);
+                const i = this.il.getGLTF(n);
                 if (i.then) i.then(n => {
-                    if (!n.gltfPack) return this.Rl++, void (this.Rl >= t.length && (this.il = !0, this.setToRedraw(!0)));
+                    if (!n.gltfPack) return this.Nl++, void (this.Nl >= t.length && (this.nl = !0, this.setToRedraw(!0)));
                     const {gltfPack: i, json: r, bbox: s} = n;
-                    this.al[e] = [ i ], this.fl[e] = i.getMeshesInfo(), this.wl[e] = r, this.Nl[e] = s, 
-                    this.Rl++, this.Rl >= t.length && (this.il = !0), this.setToRedraw(!0);
+                    this.ol[e] = [ i ], this.cl[e] = i.getMeshesInfo(), this.xl[e] = r, this.Dl[e] = s, 
+                    this.Nl++, this.Nl >= t.length && (this.nl = !0), this.setToRedraw(!0);
                 }); else {
                     const {gltfPack: t, json: n, bbox: r} = i;
-                    t && (this.al[e] = [ t ], this.fl[e] = t.getMeshesInfo(), this.wl[e] = n, this.Nl[e] = r, 
-                    this.Rl++);
+                    t && (this.ol[e] = [ t ], this.cl[e] = t.getMeshesInfo(), this.xl[e] = n, this.Dl[e] = r, 
+                    this.Nl++);
                 }
             }
-            this.Rl >= t.length && (this.il = !0);
+            this.Nl >= t.length && (this.nl = !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    }";
@@ -18099,10 +18104,10 @@
             if (t) {
                 this.scene.removeMesh(t);
                 for (let e = 0; e < t.length; e++) {
-                    const n = this.xl && this.xl[t[e].uuid];
+                    const n = this.vl && this.vl[t[e].uuid];
                     if (n) {
                         for (const t in n) n[t].jointTexture && n[t].jointTexture.destroy();
-                        delete this.xl[t[e].uuid];
+                        delete this.vl[t[e].uuid];
                     }
                     t[e].disposeInstanceData(), t[e].dispose();
                 }
@@ -18113,18 +18118,18 @@
             const t = this.getSymbols();
             for (let e = 0; e < t.length; e++) {
                 const n = t[e].url || "pyramid";
-                this.rl.logoutGLTF(n);
+                this.il.logoutGLTF(n);
             }
-            if (this.xl) {
-                for (const t in this.xl) {
-                    const e = this.xl[t];
+            if (this.vl) {
+                for (const t in this.vl) {
+                    const e = this.vl[t];
                     for (const t in e) e[t].jointTexture && e[t].jointTexture.destroy();
                 }
-                delete this.xl;
+                delete this.vl;
             }
-            delete this.vl;
+            delete this.ml;
         }
-        El(t, e, i, r) {
+        Cl(t, e, i, r) {
             const s = n.vec3.set(zy, ...e || By), o = i || Gy, a = r || Wy, l = n.quat.fromEuler(jy, o[0], o[1], o[2]);
             return n.mat4.fromRotationTranslationScale(t, l, s, a);
         }
@@ -18173,8 +18178,8 @@
         }
         callShader(t, e) {
             super.callShader(t, e), this.transformWater();
-            const n = this.Ll(this.getMap(), e);
-            this.xs += this.renderer.render(this.zl, n, this.Hl, this.getRenderFBO(e));
+            const n = this.Rl(this.getMap(), e);
+            this.xs += this.renderer.render(this.Ll, n, this.zl, this.getRenderFBO(e));
         }
         addMesh(t, e) {
             this.Ks(t, e), super.addMesh(...arguments);
@@ -18184,14 +18189,14 @@
             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.zl.dispose(), 
+            t.states && t.states.includesChanged && (this.shader.dispose(), this.Ll.dispose(), 
             this.Ys(t));
-            const e = !!t.ssr && this.getSymbol(em).ssr, n = this.zl, i = n.shaderDefines;
+            const e = !!t.ssr && this.getSymbol(em).ssr, n = this.Ll, i = n.shaderDefines;
             if (e) {
                 const e = zl({}, i, t.ssr.defines);
                 n.shaderDefines = e;
             }
-            this.updateIBLDefines(n), this.Ul.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
+            this.updateIBLDefines(n), this.Hl.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
         }
         init(t) {
             this.createIBLTextures();
@@ -18209,38 +18214,38 @@
                 extraCommandProps: {
                     viewport: this.pickingViewport
                 }
-            }, this.pickingFBO, this.getMap()) ]), this.Vl();
+            }, this.pickingFBO, this.getMap()) ]), this.Ul();
         }
-        Vl() {
+        Ul() {
             const t = this.regl;
-            this.jl || (this.jl = t.texture(2));
+            this.Vl || (this.Vl = t.texture(2));
             const e = this.getSymbol({
                 index: 0
             }), n = e.texWaveNormal, i = this.getCachedTexture(n), r = this;
-            if (i) this.Bl || (i.isLoading ? setTimeout(() => {
-                this.shader && this.Vl();
-            }, 20) : this.Bl = this.Gl(t, i)); else {
+            if (i) this.jl || (i.isLoading ? setTimeout(() => {
+                this.shader && this.Ul();
+            }, 20) : this.jl = this.Bl(t, i)); else {
                 const e = new Image;
                 e.isLoading = !0, e.onload = function() {
-                    delete this.isLoading, r.Bl = r.Gl(t, this), r.setToRedraw();
+                    delete this.isLoading, r.jl = r.Bl(t, this), 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) this.Wl || (o.isLoading ? setTimeout(() => {
-                this.Vl(), this.shader;
-            }, 20) : this.Wl = this.Gl(t, o)); else {
+            if (o) this.Gl || (o.isLoading ? setTimeout(() => {
+                this.Ul(), this.shader;
+            }, 20) : this.Gl = this.Bl(t, o)); else {
                 const e = new Image;
                 e.isLoading = !0, e.onload = function() {
-                    delete this.isLoading, r.Wl = r.Gl(t, this), r.setToRedraw();
+                    delete this.isLoading, r.Gl = r.Bl(t, this), r.setToRedraw();
                 }, e.onerror = () => {
                     console.error("invalid water wave perturbation texture:" + s);
                 }, this.addCachedTexture(s, e), e.src = s;
             }
         }
-        Gl(t, e) {
-            return this.jl ? t.texture({
+        Bl(t, e) {
+            return this.Vl ? t.texture({
                 width: e.width,
                 height: e.height,
                 mag: "linear",
@@ -18346,7 +18351,7 @@
                     enable: !1
                 }
             };
-            r.push(...n.reshader.SsrPass.getUniformDeclares()), this.zl = new n.reshader.MeshShader({
+            r.push(...n.reshader.SsrPass.getUniformDeclares()), this.Ll = new n.reshader.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\n#include <highlight_vert>\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\nhighlight_setVarying();\n}",
                 frag: "#define SHADER_NAME WATER\nprecision highp float;\nprecision highp sampler2D;\n#include <hsv_frag>\nuniform vec3 hsv;\nuniform float contrast;\nuniform float layerOpacity;\n#if defined(HAS_SHADOWING)\n#include <vsm_shadow_frag>\n#endif\n#include <highlight_frag>\n#if defined(HAS_IBL_LIGHTING)\nuniform vec3 hdrHSV;\nuniform samplerCube prefilterMap;\nuniform sampler2D brdfLUT;\nuniform float rgbmRange;\nuniform mat3 uEnvironmentTransform;\nuniform vec3 diffuseSPH[9];\nvec3 c(const in vec3 d) {\n  vec3 e = uEnvironmentTransform * d;\n  float x = e.x;\n  float y = e.y;\n  float z = e.z;\n  vec3 f = (diffuseSPH[0] + diffuseSPH[1] * x + diffuseSPH[2] * y + diffuseSPH[3] * z + diffuseSPH[4] * z * x + diffuseSPH[5] * y * z + diffuseSPH[6] * y * x + diffuseSPH[7] * (3. * z * z - 1.) + diffuseSPH[8] * (x * x - y * y));\n  if(length(hdrHSV) > .0) {\n    f = hsv_apply(f, hdrHSV);\n  }\n  return max(f, vec3(.0));\n}\nvec3 h(const in vec3 i, const in float j, const in float k, const in float l) {\n  vec4 rgba = texture2D(brdfLUT, vec2(k, j));\n  float b = (rgba[3] * 65280.0 + rgba[2] * 255.);\n  float a = (rgba[1] * 65280.0 + rgba[0] * 255.);\n  const float m = 1. / 65535.;\n  return (i * a + b * l) * m;\n}\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 o(const in vec4 u, const in float v) {\n  if(v <= .0)\n    return u.rgb;\n  return v * u.rgb * u.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 A(const in vec4 B) {\n  return B.r + B.g / 255.;\n}\nfloat C(const in vec2 D, const in float E) {\n  vec3 F = vec3(.06711056, .00583715, 52.9829189);\n  return fract(F.z * fract(dot(D.xy + E * vec2(47., 17.) * .695, F.xy))) * .5;\n}\nvec3 G(const in float H, const in float I, const in vec2 J) {\n  float K = min(I - .01, H);\n  float L = floor(K);\n  float M = min(I, L + 1.);\n  float N = pow(2., M);\n  vec2 O = 2. * N / J;\n  if(K - L > .5)\n    N *= 2.;\n  return vec3(O, N);\n}\nvec2 P(const in vec2 Q, const in vec3 R) {\n  vec2 S = max(R.xy, min(1. - R.xy, Q));\n  return vec2(2. * S.x, R.z - 1. - S.y) / R.z;\n}\nvec3 T(const in mat4 U, const in vec3 V) {\n  vec4 W = U * vec4(V, 1.);\n  return vec3(.5 + .5 * W.xy / W.w, W.w);\n}\nvec3 X(const in float Y, const in vec2 S) {\n  return texture2D(TextureReflected, S).rgb;\n}\nfloat Z(float ba) {\n  highp mat4 U = projMatrix;\n  highp float z = ba * 2. - 1.;\n  return -U[3].z / (z + U[2].z);\n}\nfloat bb(const vec2 S) {\n  float ba = A(texture2D(TextureDepth, S));\n  return ba;\n}\nvec3 bc(const in float E, const in vec3 bd, const in vec3 be, const in vec3 bf, const in vec3 bg, const in float bh) {\n  vec2 bi;\n  bi.x = C(gl_FragCoord.yx, E);\n  bi.y = fract(bi.x * 52.9829189);\n  bi.y = mix(bi.y, 1., .7);\n  float bj = 2. * 3.14159 * bi.x;\n  float bk = pow(max(bi.y, .000001), bh / (2. - bh));\n  float bl = sqrt(1. - bk * bk);\n  vec3 bm = vec3(bl * cos(bj), bl * sin(bj), bk);\n  bm = bm.x * bd + bm.y * be + bm.z * bf;\n  return normalize((2. * dot(bg, bm)) * bm - bg);\n}\nfloat bn(const in float E) {\n  return (C(gl_FragCoord.xy, E) - .5);\n}\nvec3 bo(const in vec3 bp, const in float bq, const in vec3 br) {\n  vec3 bs = T(projMatrix, vViewVertex.xyz + br * bq);\n  bs.z = 1. / bs.z;\n  bs -= bp;\n  float bt = min(1., .99 * (1. - bp.x) / max(1e-5, bs.x));\n  float bu = min(1., .99 * (1. - bp.y) / max(1e-5, bs.y));\n  float bv = min(1., .99 * bp.x / max(1e-5, -bs.x));\n  float bw = min(1., .99 * bp.y / max(1e-5, -bs.y));\n  return bs * min(bt, bu) * min(bv, bw);\n}\nfloat bx(const in vec3 bp, const in vec3 bs, inout float by, inout float bz) {\n  float bA = (bz + by) * .5;\n  vec3 bB = bp + bs * bA;\n  float z = bb(bB.xy);\n  float ba = Z(z);\n  float bC = -1. / bB.z;\n  by = ba > bC ? by : bA;\n  bz = ba > bC ? bA : bz;\n  return bA;\n}\nvec4 bD(const in vec3 bp, const in float bq, in float bE, const in vec3 br, const in float j, const in float E) {\n  const int bF = 20;\n  float bG = 1. / float(bF);\n  bE *= bG;\n  vec3 bs = bo(bp, bq, br);\n  float bH = bG;\n  vec3 bI = vec3(.0, bH, 1.);\n  vec3 bB;\n  float z, ba, bC, bJ, bK, bL;\n  bool bM;\n  float bN = 1.;\n  float bA;\n  for(int bO = 0; bO < bF; bO++) {\n    bB = bp + bs * bI.y;\n    z = bb(bB.xy);\n    ba = Z(z);\n    bC = -1. / bB.z;\n    bJ = bC - ba;\n    bJ *= clamp(sign(abs(bJ) - bq * bG * bG), .0, 1.);\n    bM = abs(bJ + bE) < bE;\n    bK = clamp(bI.x / (bI.x - bJ), .0, 1.);\n    bL = bM ? bI.y + bK * bG - bG : 1.;\n    bI.z = min(bI.z, bL);\n    bI.x = bJ;\n    if(bM) {\n      float by = bI.y - bG;\n      float bz = bI.y;\n      bA = bx(bp, bs, by, bz);\n      bA = bx(bp, bs, by, bz);\n      bA = bx(bp, bs, by, bz);\n      bN = bA;\n      break;\n    }\n    bI.y += bG;\n  }\n  return vec4(bp + bs * bN, 1. - bN);\n}\nvec3 bP(in vec4 bQ, const in float bR, const in vec3 bS, const in vec3 bT, const in float j) {\n  vec4 bU = mix(outputFovInfo[0], outputFovInfo[1], bQ.x);\n  bQ.xyz = vec3(mix(bU.xy, bU.zw, bQ.y), 1.) * -1. / bQ.z;\n  bQ.xyz = (reprojViewProjMatrix * vec4(bQ.xyz, 1.)).xyw;\n  bQ.xy /= bQ.z;\n  float bV = clamp(6. - 6. * max(abs(bQ.x), abs(bQ.y)), .0, 1.);\n  bQ.xy = .5 + .5 * bQ.xy;\n  return vec3(bQ.xy, 1.);\n}\nvec3 ssr(const in vec3 bS, const in vec3 bT, const in float j, const in vec3 d, const in vec3 bg) {\n  float bW = .0;\n  vec4 f = vec4(.0);\n  float bh = j * j;\n  bh = bh * bh;\n  vec3 bX = abs(d.z) < .999 ? vec3(.0, .0, 1.) : vec3(1., .0, .0);\n  vec3 bd = normalize(cross(bX, d));\n  vec3 be = cross(d, bd);\n  float bR = ssrFactor * clamp(-4. * dot(bg, d) + 3.8, .0, 1.);\n  bR *= clamp(4.7 - j * 5., .0, 1.);\n  vec3 bp = T(projMatrix, vViewVertex.xyz);\n  bp.z = 1. / bp.z;\n  vec3 br = bc(bW, bd, be, d, bg, bh);\n  float bq = mix(cameraNearFar.y + vViewVertex.z, -vViewVertex.z - cameraNearFar.x, br.z * .5 + .5);\n  float bE = .5 * bq;\n  vec4 bQ;\n  if(dot(br, d) > .001 && bR > .0) {\n    bQ = bD(bp, bq, bE, br, j, bW);\n    if(bQ.w > .0)\n      return bP(bQ, bR, bS, bT, j);\n    \n  }\n  return vec3(.0);\n}\n#endif\nconst vec3 bY = 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 bZ(vec3 e, float ca) {\n  float cb = max(.015, ca);\n  return max((e.x + e.y) * .3303545 / cb + .3303545, .0);\n}\nconst vec2 cc = vec2(6. / 25., 5. / 24.);\nvec2 cd(sampler2D ce, vec2 S) {\n  return 2. * texture2D(ce, S).rg - 1.;\n}\nfloat cf(vec2 S) {\n  return texture2D(heightTexture, S).b;\n}\nvec3 cg(sampler2D ce, vec2 S) {\n  return 2. * texture2D(ce, S).rgb - 1.;\n}\nfloat ch(vec2 S, float ci) {\n  return fract(ci);\n}\nfloat cj(vec2 S, float ci) {\n  float ck = ch(S, ci);\n  return 1. - abs(1. - 2. * ck);\n}\nvec3 cl(sampler2D cm, vec2 S, float ci, float cn) {\n  float co = waveParams[2];\n  float cp = waveParams[3];\n  vec2 cq = cd(cm, S) * co;\n  float ck = ch(S, ci + cn);\n  float cr = cj(S, ci + cn);\n  vec2 f = S;\n  f -= cq * (ck + cp);\n  f += cn;\n  f += (ci - ck) * cc;\n  return vec3(f, cr);\n}\nconst float cs = 7.77;\nvec3 ct(sampler2D cu, sampler2D cv, vec2 cw, vec2 cx, float ci) {\n  float ca = waveParams[0];\n  vec2 cy = ci * -cx;\n  float cz = cf(vNoiseUv) * cs;\n  vec3 cA = cl(cv, cw + cy, ci + cz, .0);\n  vec3 cB = cl(cv, cw + cy, ci + cz, .5);\n  vec3 cC = cg(cu, cA.xy) * cA.z;\n  vec3 cD = cg(cu, cB.xy) * cB.z;\n  vec3 cE = normalize(cC + cD);\n  cE.xy *= ca;\n  cE.z = sqrt(1. - dot(cE.xy, cE.xy));\n  return cE;\n}\nvec4 cF(vec2 cw, float cG) {\n  float cH = waveParams[1];\n  vec3 d = ct(normalTexture, heightTexture, cw * cH, waterDir, cG);\n  float cI = bZ(d, waveParams[0]);\n  return vec4(d, cI);\n}\nconst float cJ = 3.141592653589793;\nconst float cK = 1. / cJ;\nconst float cL = .3183098861837907;\nconst float cM = 1.570796326794897;\nconst float cN = .4;\nfloat cO = 2.2;\nvec3 cP(float cQ, vec3 cR, float l) {\n  return cR + (l - cR) * pow(1. - cQ, 5.);\n}\nfloat cS(float cT, float j) {\n  float cU = j * j;\n  float cV = cT * cT;\n  float cW = pow((cV * (cU - 1.) + 1.), cO) * cJ;\n  return cU / cW;\n}\nfloat cX(float cY) {\n  return .25 / (cY * cY);\n}\nvec3 cZ(const vec3 x) {\n  return (x * (2.51 * x + .03)) / (x * (2.43 * x + .59) + .14);\n}\nconst float da = 2.2;\nconst float db = .4545454545;\nvec4 dc(vec4 u) {\n  return vec4(pow(u.rgb, vec3(db)), u.w);\n}\nvec3 dd(vec3 u) {\n  return pow(u, vec3(da));\n}\nconst vec3 de = vec3(.02, 1., 5.);\nconst vec2 df = vec2(.02, .1);\nconst float j = .06;\nconst float dg = 1.7;\nconst vec3 dh = vec3(0, .6, .9);\nconst vec3 di = vec3(.72, .92, 1.);\nconst float dj = .65;\nconst float dk = 300000.0;\nconst float dl = 500000.0;\nconst float dm = .775;\nconst float dn = .8;\nPBRShadingWater dp;\nvec3 dq(in PBRShadingWater dr, float j, vec3 ds, float dt) {\n  vec3 du = cP(dr.VdotH, ds, dt);\n  float dv = cS(dr.NdotH, j);\n  float dw = cX(dr.LdotH);\n  float dx = mix(j + .045, j + .385, 1. - dr.VdotH);\n  float dy = 1.2;\n  float dz = cS(dr.NdotH, dx) * dy;\n  return ((dv + dz) * dw) * du;\n}\nvec3 dA(float dg, float dB, vec3 dh, float dC) {\n  return dg * (.075 * dh * pow(dB, 4.) + 50. * pow(dB, 23.)) * dC;\n}\nvec3 dD(in float bk, in vec3 dE, in vec3 dF) {\n  float dG = pow((1. - bk), de[2]);\n  return mix(dF, dE, dG);\n}\nvec3 dH(in vec3 e, in vec3 dI, in float dJ, in float j) {\n  \n#ifdef HAS_IBL_LIGHTING\nvec3 dK = reflect(-dI, e);\n  vec4 dL = textureCube(prefilterMap, uEnvironmentTransform * dK);\n  float dM = clamp(1. + dot(dK, e), .0, 1.);\n  dL *= dM * dM;\n  vec3 i = o(dL, rgbmRange);\n  vec3 dN = c(e);\n  float l = clamp(50.0 * waterBaseColor.g, .0, 1.);\n  vec3 dO = h(waterBaseColor.rgb, j, dot(e, dI), l);\n  return i * dO + dN;\n#else\nvec3 dP = dd(di);\n  vec3 dQ = dd(dh);\n  vec3 di = dD(dJ, dP, dQ);\n  return di;\n#endif\n}\nvec3 dR(in vec3 e, in vec3 dI, in vec3 dS, vec3 u, in vec3 dT, in vec3 dU, in float dV, float dW, vec3 dX) {\n  float dY = 0.;\n  vec3 dZ = dd(u);\n  vec3 bm = normalize(dS + dI);\n  dp.NdotL = clamp(dot(e, dS), .0, 1.);\n  dp.NdotV = clamp(dot(e, dI), .001, 1.);\n  dp.VdotN = clamp(dot(dI, e), .001, 1.);\n  dp.NdotH = clamp(dot(e, bm), .0, 1.);\n  dp.VdotH = clamp(dot(dI, bm), .0, 1.);\n  dp.LdotH = clamp(dot(dS, bm), .0, 1.);\n  float dJ = max(dot(dU, dI), .0);\n  vec3 di = dH(e, dI, dJ, j);\n  float ea = max(dot(dU, dS), .0);\n  float eb = .1 + ea * .9;\n  di *= eb;\n  float ec = clamp(dV, .8, 1.);\n  vec3 ed = cP(dp.VdotN, vec3(de[0]), de[1]);\n  vec3 ee = ed * di * ec;\n  vec3 ef = dZ * mix(di, ea * dT * cK, 2. / 3.) * ec;\n  vec3 i = vec3(.0);\n  if(dJ > .0 && ea > .0) {\n    vec3 eg = dq(dp, j, vec3(df[0]), df[1]);\n    vec3 eh = dT * cK * dV;\n    i = dp.NdotL * eh * eg;\n  }\n  vec3 cI = vec3(.0);\n  if(dJ > .0) {\n    cI = dA(dg, dW, dh, eb);\n  }\n  vec3 ei = vec3(.0);\n#ifdef HAS_SSR\nfloat ej = smoothstep(dl, dk, -dX.z);\n  mat4 ek = viewMatrix;\n  vec4 el = vec4(dX.xyz, 1.);\n  vec3 em = normalize(el.xyz);\n  vec4 en = ek * vec4(e, .0);\n  vec3 eo = normalize(en.xyz);\n  vec4 ep = ek * vec4(dU, .0);\n  float eq = pow(max(dot(-em, ep.xyz), .0), cN);\n  vec3 er = mix(ep.xyz, eo, eq);\n  vec3 es = ssr(vec3(.0), vec3(1.), j, normalize(er), -normalize(vViewVertex.xyz));\n  if(es.z > .0) {\n    vec2 et = smoothstep(.3, .6, abs(vec2(.5) - es.xy));\n    dY = dm * clamp(1. - 1.3 * et.y, .0, 1.) * ej;\n    vec3 eu = X(.0, es.xy);\n    ei = dd(eu) * dY * ed.y * dj;\n  }\n#endif\nfloat ev = mix(dn, dn * .5, dY);\n  return cZ((1. - dY) * ee + ei + ef * ev + i + cI);\n}\nvoid main() {\n  vec3 dU = bY;\n  vec4 ew = cF(vUv, timeElapsed);\n  vec3 e = normalize(vTbnMatrix * ew.xyz);\n  vec3 dI = -normalize(vPos - camPos);\n  vec3 dS = normalize(-lightDirection);\n#if defined(HAS_SHADOWING)\nfloat dV = shadow_computeShadow();\n#else\nfloat dV = 1.;\n#endif\nvec4 ex = viewMatrix * vec4(vPos, 1.);\n  vec4 ey = vec4(dR(e, dI, dS, waterBaseColor.rgb, lightColor, dU, dV, ew.w, ex.xyz), waterBaseColor.a);\n  gl_FragColor = dc(ey);\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  gl_FragColor = highlight_blendColor(gl_FragColor) * layerOpacity;\n}",
                 defines: s,
@@ -18362,10 +18367,10 @@
                 projViewMatrix: t.projViewMatrix
             };
         }
-        Ll(t, e) {
+        Rl(t, e) {
             const {iblTexes: i, dfgLUT: r} = this.getIBLRes(), s = Qy(t, i, r, e && e.ssr, e && e.jitter), o = t.getLightManager();
             let a = o && o.getDirectionalLight() || {};
-            const l = o && o.getAmbientLight() || {}, h = this.getSymbol(em), u = this.$l = this.$l || [], c = this.Xl = this.Xl || [];
+            const l = o && o.getAmbientLight() || {}, h = this.getSymbol(em), u = this.Wl = this.Wl || [], c = this.$l = this.$l || [];
             n.vec4.set(c, .09, h.uvScale || 3, .03, -.5);
             zl(s, {
                 ambientColor: l.color || [ .2, .2, .2 ],
@@ -18374,8 +18379,8 @@
                 lightColor: a.color || tm.color,
                 camPos: t.cameraPosition,
                 timeElapsed: h.animation ? (this.layer.getRenderer().getFrameTimestamp() || 0) / (1 / (h.waterSpeed || 1) * 1e4) : 0,
-                normalTexture: this.Bl || this.jl,
-                heightTexture: this.Wl || this.jl,
+                normalTexture: this.jl || this.Vl,
+                heightTexture: this.Gl || this.Vl,
                 waveParams: c,
                 waterDir: sm(u, h.waterDirection || 0),
                 waterBaseColor: h.waterBaseColor || [ .1451, .2588, .4863, 1 ],
@@ -18387,24 +18392,24 @@
             s;
         }
         delete() {
-            super.delete(), this.jl && (this.jl.destroy(), delete this.jl), this.Bl && this.Bl.destroy(), 
-            this.Wl && this.Wl.destroy(), this.shader && (this.shader.dispose(), delete this.shader), 
-            this.zl && this.zl.dispose(), this.Ul && (this.Ul.geometry.dispose(), this.Ul.material && this.Ul.material.dispose(), 
-            this.Ul.dispose(), delete this.Ul), this.disposeIBLTextures();
+            super.delete(), this.Vl && (this.Vl.destroy(), delete this.Vl), this.jl && this.jl.destroy(), 
+            this.Gl && this.Gl.destroy(), this.shader && (this.shader.dispose(), delete this.shader), 
+            this.Ll && this.Ll.dispose(), this.Hl && (this.Hl.geometry.dispose(), this.Hl.material && this.Hl.material.dispose(), 
+            this.Hl.dispose(), delete this.Hl), this.disposeIBLTextures();
         }
         createGround() {
             const t = new n.reshader.Plane;
             t.data.aTexCoord = new Uint8Array([ 0, 1, 1, 1, 0, 0, 1, 0 ]), t.generateBuffers(this.renderer.regl), 
-            this.Ul = new n.reshader.Mesh(t, null, {
+            this.Hl = new n.reshader.Mesh(t, null, {
                 castShadow: !1
-            }), this.Hl = new n.reshader.Scene([ this.Ul ]);
+            }), this.zl = new n.reshader.Scene([ this.Hl ]);
         }
         transformWater() {
-            const t = this.getMap(), e = n.GroundPainter.getGroundTransform(this.Ul.localTransform, t);
-            this.Ul.setLocalTransform(e);
+            const t = this.getMap(), e = n.GroundPainter.getGroundTransform(this.Hl.localTransform, t);
+            this.Hl.setLocalTransform(e);
             const i = t._get2DExtentAtRes(t.getGLRes()), r = i.getWidth(), s = i.getHeight(), o = t.cameraLookAt, a = o[0] - r, l = o[1] + s, h = a / im[0], u = l / im[1], c = h % 1, f = u % 1, d = .3737 * h % 1, p = .3737 * u % 1, y = r / im[0] * 2, m = s / im[1] * 2;
-            this.Ul.setUniform("uvOffset", [ c, f ]), this.Ul.setUniform("noiseUvOffset", [ d, p ]), 
-            this.Ul.setUniform("uvScale", [ y, -m ]);
+            this.Hl.setUniform("uvOffset", [ c, f ]), this.Hl.setUniform("noiseUvOffset", [ d, p ]), 
+            this.Hl.setUniform("uvScale", [ y, -m ]);
         }
     }
     function sm(t, e) {
@@ -18474,7 +18479,7 @@
         }
         callRenderer(t, e, n) {
             const i = this.getRenderFBO(n);
-            this.xs += this.Yl.render(this.scene, e, i);
+            this.xs += this.Xl.render(this.scene, e, i);
         }
         getUniformValues(t) {
             const e = this.getSymbol({
@@ -18491,13 +18496,13 @@
             return this.scene.getMeshes();
         }
         delete() {
-            super.delete(...arguments), this.Yl.dispose(), delete this.Yl;
+            super.delete(...arguments), this.Xl.dispose(), delete this.Xl;
         }
         init() {
             const t = this.regl;
             this.renderer = new n.reshader.Renderer(t);
             const e = this.getPolygonOffset(), i = this.getSymbols()[0];
-            this.Yl = new n.HeatmapProcess(this.regl, this.sceneConfig, this.layer, i.heatmapColor, null, e);
+            this.Xl = new n.HeatmapProcess(this.regl, this.sceneConfig, this.layer, i.heatmapColor, null, e);
         }
     });
     vm.registerAt(_h);
@@ -18505,7 +18510,7 @@
     xm.registerAt(_h), Lh.registerPainter("lit", Dy), Lh.registerPainter("icon", Mp), 
     Lh.registerPainter("fill", Xf), Lh.registerPainter("line", Kf), Lh.registerPainter("line-gradient", Zf), 
     Lh.registerPainter("water", rm), Lh.registerPainter("tube", Ly), n.reshader.ShaderLib.register("vt_position_vert", "#ifdef HAS_TERRAIN_ALTITUDE\n    attribute float aTerrainAltitude;\n#endif\nuniform float minAltitude;\n#ifdef HAS_ALTITUDE\n    vec3 unpackVTPosition() {\n        float altitude = aAltitude;\n        #ifdef HAS_TERRAIN_ALTITUDE\n            altitude += aTerrainAltitude * 100.0;\n        #endif\n        altitude += minAltitude * 100.0;\n        return vec3(aPosition, altitude);\n    }\n#else\n    float position_modValue = 16384.0;\n    float position_delta = 0.00001;\n    vec3 unpackVTPosition() {\n        float z = aPosition.z;\n        vec2 pos = sign(aPosition.xy + position_delta) * mod(abs(aPosition.xy), position_modValue);\n        vec2 highs = floor(abs(aPosition.xy) / position_modValue);\n        float altitude = sign(z + position_delta) * (highs.x * 2.0 + highs.y) * pow(2.0, 15.0) + z;\n        #ifdef HAS_TERRAIN_ALTITUDE\n            altitude += aTerrainAltitude * 100.0;\n        #endif\n        altitude += minAltitude * 100.0;\n        return vec3(pos, altitude);\n    }\n#endif"), 
-    _h.VERSION = "0.92.1", Lh.VERSION = "0.92.1";
+    _h.VERSION = "0.92.2", Lh.VERSION = "0.92.2";
     if (s.mat4.create(), s.transcoders) {
         const t = r.Map.VERSION;
         if (t.indexOf("1.0.0-beta") >= 0 || t.indexOf("1.0.0-alpha") >= 0) {
@@ -18526,5 +18531,5 @@
     t.VectorTileLayer = _h, t.VectorTileLayerRenderer = ah, t.WaterPlugin = xm, t.WireframePainter = Cy, 
     t.WireframePlugin = dm, Object.defineProperty(t, "t", {
         value: !0
-    }), "undefined" != typeof console && console.log("@maptalks/vt v0.92.1");
+    }), "undefined" != typeof console && console.log("@maptalks/vt v0.92.2");
 }));