@maptalks/vt 0.92.1 → 0.92.2

package/dist/maptalks.vt.es.js

@@ -1,5 +1,5 @@
 /*!
- * @maptalks/vt v0.92.1
+ * @maptalks/vt v0.92.2
  * LICENSE : undefined
  * (c) 2016-2024 maptalks.org
  */
@@ -3244,7 +3244,8 @@ class Le extends t.renderer.CanvasRenderer {
         });
     }
     cn() {
-        if (this.ln && (this.On(this.ln[0], this.Xe), this.On(this.ln[1], this.Ye)), this.hn) for (let t = 0; t < this.hn.length; t++) this.On(this.hn[t], this.$e);
+        if (this.ln && (this.On(this.ln[0], this.Xe), this.On(this.ln[1], this.Ye), this.ln[0] && this.Ze.prepareCollideIndex(this.ln[0].geometry), 
+        this.ln[1] && this.Ze.prepareCollideIndex(this.ln[1].geometry)), this.hn) for (let t = 0; t < this.hn.length; t++) this.On(this.hn[t], this.$e);
         if (this.meshes) for (let t = 0; t < this.meshes.length; t++) this.On(this.meshes[t], this.Ge);
     }
     On(t, e) {
@@ -6521,6 +6522,10 @@ class nr extends Bi {
     paint(t) {
         this.isShadowIncludeChanged(t) && (this.shader.dispose(), this.br(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, s = {
             x: (t, e) => e.viewport ? e.viewport.x : 0,
@@ -6529,18 +6534,18 @@ class nr extends Bi {
             height: (t, e) => e.viewport ? e.viewport.height : i ? i.height : 1
         };
         this.renderer = new n.Renderer(e);
-        const o = !!(t && t.isRenderingTerrain && this.isTerrainSkin()), a = this.layer.getRenderer(), l = {
+        const o = this.layer.getRenderer(), a = {
             viewport: s,
             stencil: {
-                enable: () => !(o || !a.isEnableTileStencil || !a.isEnableTileStencil()),
+                enable: () => this.isEnableStencil(t),
                 func: {
-                    cmp: () => a.isEnableTileStencil && a.isEnableTileStencil() ? "=" : "<=",
-                    ref: (t, e) => a.isEnableTileStencil && a.isEnableTileStencil() ? e.stencilRef : e.level
+                    cmp: () => o.isEnableTileStencil && o.isEnableTileStencil() ? "=" : "<=",
+                    ref: (t, e) => o.isEnableTileStencil && o.isEnableTileStencil() ? e.stencilRef : e.level
                 },
                 op: {
                     fail: "keep",
                     zfail: "keep",
-                    zpass: () => a.isEnableTileStencil && a.isEnableTileStencil() ? "zero" : "replace"
+                    zpass: () => o.isEnableTileStencil && o.isEnableTileStencil() ? "zero" : "replace"
                 }
             },
             depth: {
@@ -6565,7 +6570,7 @@ class nr extends Bi {
                 offset: this.getPolygonOffset()
             }
         };
-        if (this.br(t, l), this.pickingFBO) {
+        if (this.br(t, a), this.pickingFBO) {
             const t = [];
             this.picking = [ new n.FBORayPicking(this.renderer, {
                 vert: Gi,
@@ -6576,7 +6581,7 @@ class nr extends Bi {
                         return r.multiply(t, n.projViewMatrix, n.modelMatrix), t;
                     }
                 } ],
-                extraCommandProps: l
+                extraCommandProps: a
             }, this.pickingFBO, this.getMap()) ];
         }
     }
@@ -8418,7 +8423,7 @@ class Cs extends br {
             }
         }
     }
-    Ns(t) {
+    prepareCollideIndex(t) {
         const {collideIds: e, elements: n, aCount: i} = t.properties;
         if (!e) return;
         const r = e, s = {};
@@ -8484,10 +8489,10 @@ class Cs extends br {
                 t.positionMatrix = this.getAltitudeOffsetMatrix(), delete t.geometry.properties.iconAtlas;
             }), f.push(...t));
         }
-        return "line" === a.properties.markerPlacement && this.Hs(a, r), "line" === a.properties.markerPlacement && f.forEach(t => t.properties.isLinePlacement = !0), 
-        this.Ns(a), f;
+        return "line" === a.properties.markerPlacement && this.Ns(a, r), "line" === a.properties.markerPlacement && f.forEach(t => t.properties.isLinePlacement = !0), 
+        this.prepareCollideIndex(a), f;
     }
-    Hs(t, e) {
+    Ns(t, e) {
         const {collideIds: n} = t.properties, i = new Uint16Array(n.length);
         if (this.Rs(t)) {
             let r = 0;
@@ -8546,31 +8551,31 @@ class Cs extends br {
         if (!this.isEnableCollision()) return;
         super.updateCollision(t);
         const e = this.scene.getMeshes();
-        e && e.length ? (this.zs(t.timestamp), this.Es = [], this.zr()) : this.zr();
+        e && e.length ? (this.Hs(t.timestamp), this.Es = [], this.zr()) : this.zr();
     }
     callCurrentTileShader(t, e) {
         this.shader.filter = e.sceneFilter ? [ this.Os, e.sceneFilter ] : this.Os, this.callRenderer(this.shader, t, e), 
-        this.Vs.filter = e.sceneFilter ? [ this.Fs, e.sceneFilter ] : this.Fs, this.callRenderer(this.Vs, t, e);
+        this.zs.filter = e.sceneFilter ? [ this.Fs, e.sceneFilter ] : this.Fs, this.callRenderer(this.zs, t, e);
     }
     callBackgroundTileShader(t, e) {
         this.shader.filter = e.sceneFilter ? [ this.Is, e.sceneFilter ] : this.Is, this.callRenderer(this.shader, t, e), 
-        this.Vs.filter = e.sceneFilter ? [ this.Cs, e.sceneFilter ] : this.Cs, this.callRenderer(this.Vs, t, e);
+        this.zs.filter = e.sceneFilter ? [ this.Cs, e.sceneFilter ] : this.Cs, this.callRenderer(this.zs, 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));
     }
-    zs() {
+    Hs() {
         if (!this.isEnableCollision()) return;
         let t = this.Es;
-        t && t.length && this.Us(t);
+        t && t.length && this.Vs(t);
     }
-    js(t, e, n, i) {
+    Us(t, e, n, i) {
         return this.updateBoxCollisionFading(!0, t, e, n, i);
     }
     isEnableUniquePlacement() {
         return this.isEnableCollision() && !0 === this.sceneConfig.uniquePlacement;
     }
-    Us(t) {
+    Vs(t) {
         const e = this.layer.getRenderer();
         t = t.sort(Es);
         for (let n = 0; n < t.length; n++) {
@@ -8585,12 +8590,12 @@ class Cs extends br {
             const s = e.isForeground(i.meshes[0]);
             if (this.shouldIgnoreBackground() && !s) continue;
             const o = i.properties.meshKey;
-            this.startMeshCollision(i), this.Bs(i), this.forEachBox(i, this.js), this.Gs(i), 
+            this.startMeshCollision(i), this.js(i), this.forEachBox(i, this.Us), this.Bs(i), 
             this.endMeshCollision(o);
-            for (let t = 0; t < i.meshes.length; t++) this.Ws(i.meshes[t]);
+            for (let t = 0; t < i.meshes.length; t++) this.Gs(i.meshes[t]);
         }
     }
-    Ws(t) {
+    Gs(t) {
         const e = t && t.geometry && t.geometry.properties.aOpacity;
         e && e.dirty && (t.geometry.updateData("aOpacity", e), e.dirty = !1);
     }
@@ -8600,9 +8605,9 @@ class Cs extends br {
         const i = {
             boxIndex: 0
         }, r = n.length;
-        for (let s = 0; s < r; s++) this.Xs(t, n[s], e, i);
+        for (let s = 0; s < r; s++) this.Ws(t, n[s], e, i);
     }
-    Xs(t, e, n, i) {
+    Ws(t, e, n, i) {
         const s = this.getMap(), {collideBoxIndex: o} = t.meshes[0].geometry.properties;
         if (!(o && o[e])) return !1;
         const a = r.multiply(Ts, s.projViewMatrix, t.meshes[0].localTransform);
@@ -8631,16 +8636,16 @@ class Cs extends br {
             l[f].allElements = r, f++;
         }
         if (!h) return !1;
-        return n.call(this, t, l, a, i.boxIndex++) && this.Ys(t, e), !0;
+        return n.call(this, t, l, a, i.boxIndex++) && this.Xs(t, e), !0;
     }
-    Bs(t) {
+    js(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);
         }
     }
-    Ys(t, e) {
+    Xs(t, e) {
         const n = t.meshes;
         for (let t = 0; t < n.length; t++) {
             const i = n[t];
@@ -8655,7 +8660,7 @@ class Cs extends br {
             a.count = c;
         }
     }
-    Gs(t) {
+    Bs(t) {
         const e = t.meshes;
         for (let t = 0; t < e.length; t++) {
             const n = e[t], i = n && n.geometry;
@@ -8738,7 +8743,7 @@ class Cs extends br {
             extraCommandProps: i
         }), this.shader.version = 300;
         const {uniforms: s, extraCommandProps: o} = is.call(this, e, this.sceneConfig), a = this.Ds || {};
-        if (this.Vs = new n.MeshShader({
+        if (this.zs = new n.MeshShader({
             vert: ds,
             frag: ps,
             uniforms: s,
@@ -8878,8 +8883,8 @@ class vo extends br {
     }
     constructor(t, e, n, i, r, s) {
         super(t, e, n, i, r, s), this.propAllowOverlap = "textAllowOverlap", this.propIgnorePlacement = "textIgnorePlacement", 
-        this.colorCache = {}, this.$s = js.bind(this), this.qs = Bs.bind(this), this.Js = Gs.bind(this), 
-        this.Ks = Ws.bind(this), this.isLabelCollides = hs.bind(this), this.Zs();
+        this.colorCache = {}, this.Ys = js.bind(this), this.$s = Bs.bind(this), this.qs = Gs.bind(this), 
+        this.Js = Ws.bind(this), this.isLabelCollides = hs.bind(this), this.Ks();
     }
     prepareRender(...t) {
         super.prepareRender(...t);
@@ -8891,34 +8896,34 @@ class vo extends br {
         }
     }
     updateSymbol(...t) {
-        this.Qs = void 0, this.to = void 0;
+        this.Zs = void 0, this.Qs = void 0;
         const e = super.updateSymbol(...t);
-        return this.Zs(), e;
+        return this.Ks(), e;
     }
     isTerrainVector() {
         if (!super.isTerrainSkin()) return !1;
-        if (void 0 !== this.Qs) return this.Qs;
+        if (void 0 !== this.Zs) return this.Zs;
         for (let t = 0; t < this.symbolDef.length; t++) {
-            if ("map" !== this.symbolDef[t].textPitchAlignment) return this.Qs = !0, !0;
+            if ("map" !== this.symbolDef[t].textPitchAlignment) return this.Zs = !0, !0;
         }
-        return this.Qs = !1, !1;
+        return this.Zs = !1, !1;
     }
     isTerrainSkin() {
         if (!super.isTerrainSkin()) return !1;
-        if (void 0 !== this.to) return this.to;
+        if (void 0 !== this.Qs) return this.Qs;
         for (let t = 0; t < this.symbolDef.length; t++) {
             const e = this.symbolDef[t].textPitchAlignment;
-            if ("map" === e || p(e) || b.isExpression(e)) return this.to = !0, !0;
+            if ("map" === e || p(e) || b.isExpression(e)) return this.Qs = !0, !0;
         }
-        return this.to = !1, !1;
+        return this.Qs = !1, !1;
     }
-    Zs() {
-        this.eo = [];
+    Ks() {
+        this.to = [];
         for (let t = 0; t < this.symbolDef.length; t++) {
             const e = this.symbolDef[t];
             if (b.isExpression(e.textName)) {
                 const n = b.createExpression(e.textName, "string");
-                this.eo[t] = (t, e) => {
+                this.to[t] = (t, e) => {
                     let i;
                     uo.zoom = t, co.properties = e;
                     try {
@@ -8928,7 +8933,7 @@ class vo extends br {
                     }
                     return i;
                 };
-            } else p(e.textName) && (this.eo[t] = g(e.textName));
+            } else p(e.textName) && (this.to[t] = g(e.textName));
         }
     }
     shouldDeleteMeshOnUpdateSymbol(t) {
@@ -8957,7 +8962,7 @@ class vo extends br {
         s.properties.symbolIndex = o;
         const a = this.getSymbol(o), l = this.getSymbolDef(o), h = this.getFnTypeConfig(o), u = ts.call(this, this.regl, s, e, l, a, h, this.layer.options.collision, !i, r);
         if (u.length) {
-            "line" === s.properties.textPlacement ? this.no = !0 : this.io = !0;
+            "line" === s.properties.textPlacement ? this.eo = !0 : this.no = !0;
         }
         return u.forEach(t => {
             t.positionMatrix = this.getAltitudeOffsetMatrix(), t.properties.tileVectorTransform = n;
@@ -8966,21 +8971,21 @@ class vo extends br {
     updateCollision(t) {
         super.updateCollision(t);
         const e = this.scene.getMeshes();
-        e && e.length ? (this.ro = {}, this.so(t.timestamp), this.zr()) : this.zr();
+        e && e.length ? (this.io = {}, this.ro(t.timestamp), this.zr()) : this.zr();
     }
     callCurrentTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.$s, e.sceneFilter ] : this.$s, this.callRenderer(this.shader, t, e), 
-        this.oo.filter = e.sceneFilter ? [ this.Js, e.sceneFilter ] : this.Js, this.callRenderer(this.oo, t, e);
+        this.shader.filter = e.sceneFilter ? [ this.Ys, e.sceneFilter ] : this.Ys, this.callRenderer(this.shader, t, e), 
+        this.so.filter = e.sceneFilter ? [ this.qs, e.sceneFilter ] : this.qs, this.callRenderer(this.so, t, e);
     }
     callBackgroundTileShader(t, e) {
-        this.shader.filter = e.sceneFilter ? [ this.qs, e.sceneFilter ] : this.qs, this.callRenderer(this.shader, t, e), 
-        this.oo.filter = e.sceneFilter ? [ this.Ks, e.sceneFilter ] : this.Ks, this.callRenderer(this.oo, t, e);
+        this.shader.filter = e.sceneFilter ? [ this.$s, e.sceneFilter ] : this.$s, this.callRenderer(this.shader, t, e), 
+        this.so.filter = e.sceneFilter ? [ this.Js, e.sceneFilter ] : this.Js, this.callRenderer(this.so, t, e);
     }
     callRenderer(t, e, n) {
         n && n.isRenderingTerrain && p(this.symbolDef.textPitchAlignment) && (n.isRenderingTerrainSkin ? e.textPitchFilter = 1 : e.textPitchFilter = 2), 
         super.callRenderer(t, e, n);
     }
-    so() {
+    ro() {
         let t = this.scene.getMeshes();
         if (!t || !t.length) return;
         const e = -this.getMap().getBearing() * Math.PI / 180, n = u.fromRotation(qs, e), i = (t, e, n, i) => {
@@ -9005,7 +9010,7 @@ class vo extends br {
             const h = o.properties.meshKey;
             if ("line" === a.properties.textPlacement) {
                 if (!a.properties.line) continue;
-                r && this.startMeshCollision(o), this.ao(o, n);
+                r && this.startMeshCollision(o), this.oo(o, n);
                 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), r && this.endMeshCollision(h);
@@ -9030,7 +9035,7 @@ class vo extends br {
     getUniqueEntryKey(t, e) {
         return us(t, e);
     }
-    ao(t, e) {
+    oo(t, e) {
         const n = this.getMap(), i = t.geometry, s = i.properties;
         let o = s.line;
         if (!o) return;
@@ -9038,8 +9043,8 @@ class vo extends br {
         if (!c) {
             const e = r.multiply(Ys, n.projViewMatrix, t.localTransform), i = o.id + "-" + e.join();
             let a;
-            this.ro[i] ? o = this.ro[i] : (a = s.projectedLine = s.projectedLine || new Array(o.length), 
-            o = this.lo(a, o, e, n.width, n.height), this.ro[i] = a);
+            this.io[i] ? o = this.io[i] : (a = s.projectedLine = s.projectedLine || new Array(o.length), 
+            o = this.ao(a, o, e, n.width, n.height), this.io[i] = a);
         }
         const d = this.isEnableCollision(), p = i.properties.visElemts = i.properties.visElemts || new f.constructor(f.length), m = i.properties.visCache = i.properties.visCache || [];
         d && (p.count = 0);
@@ -9047,7 +9052,7 @@ class vo extends br {
         this.forEachBox(t, (t, n, i, r) => {
             const {start: s, end: a} = n[0];
             let l = m[r];
-            if ((void 0 === l || y) && (l = this.ho(t, f, s, a, o, i, c ? e : null, r)), m[r] = l, 
+            if ((void 0 === l || y) && (l = this.lo(t, f, s, a, o, i, c ? e : null, r)), m[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];
@@ -9057,7 +9062,7 @@ class vo extends br {
         const g = t.geometry.properties.aAltitude;
         g && g.dirty && (i.updateData("aAltitude", g), g.dirty = !1), !d || p.count === f.length && i.count === p.count || i.setElements(p, p.count);
     }
-    lo(t, e, n, i, r) {
+    ao(t, e, n, i, r) {
         return function(t, e, n, i, r) {
             for (let s = 0; s < e.length; s += 3) a.set(xi, e[s], e[s + 1], e[s + 2], 1), bi(xi, xi, n, i, r), 
             t[s] = xi[0], t[s + 1] = xi[1], t[s + 2] = e[s + 2];
@@ -9073,7 +9078,7 @@ class vo extends br {
         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;
             if (u && this.isMeshUniquePlaced(t) && r && !r.label) {
-                const e = r.properties || {}, {symbolIndex: n} = t.properties, i = n && this.eo[n.index] ? this.eo[n.index](t.properties.z, e) : this.getSymbol(t.properties.symbolIndex).textName, s = R.resolveText(i, e);
+                const e = r.properties || {}, {symbolIndex: n} = t.properties, i = n && this.to[n.index] ? this.to[n.index](t.properties.z, e) : this.getSymbol(t.properties.symbolIndex).textName, s = R.resolveText(i, e);
                 r.label = s;
             }
             const s = n, y = o[l[p]];
@@ -9082,7 +9087,7 @@ class vo extends br {
             m = h[d], p = n;
         }
     }
-    ho(t, e, n, s, o, l, u) {
+    lo(t, e, n, s, o, l, u) {
         const f = this.layer.getRenderer(), d = t.material.uniforms, p = 1 === d.pitchWithMap, m = !p && f.getTerrainHelper && f.getTerrainHelper(), y = this.isEnableCollision(), g = this.getMap(), v = t.geometry, x = v.desc.positionSize, {aShape: b, aOffset: w, aAnchor: _, aAltitude: S, aPitchRotation: M} = v.properties;
         let {aProjectedAnchor: P} = v.properties;
         P || (P = v.properties.aProjectedAnchor = new Array(_.length / x * 3));
@@ -9103,7 +9108,7 @@ class vo extends br {
         k && (F = C), P[3 * O] = D[0], P[3 * O + 1] = D[1], P[3 * O + 2] = D[2];
         const L = k ? 1 : v.properties.tileExtent / this.layer.getTileSize().width;
         let N = !0;
-        const H = e[n], z = e[s - 1], V = T ? T[H] : t.properties.textSize, U = this.uo(t, V, o, H, z, F, Js, L, u);
+        const H = e[n], z = e[s - 1], V = T ? T[H] : t.properties.textSize, U = this.ho(t, V, o, H, z, F, Js, L, u);
         if (null === U) return xo(w, e, n, s), !1;
         const j = z - H <= 3, B = Math.floor(U / 2), G = U % 2;
         for (let a = n; a < s; a += 6) {
@@ -9138,7 +9143,7 @@ class vo extends br {
         }
         return N;
     }
-    uo(t, e, n, i, r, s, o, a, l) {
+    ho(t, e, n, i, r, s, o, a, l) {
         const h = r - i <= 3, u = this.getMap();
         return h ? 0 : Vs.call(this, lo, ho, t, e, n, i, r, s, o, a, u.width / u.height, l);
     }
@@ -9151,7 +9156,7 @@ class vo extends br {
         }) : t.material && delete t.material.uniforms.texture), super.deleteMesh(t, e));
     }
     delete() {
-        super.delete(), this.oo.dispose(), delete this.ro, this.co && this.co.dispose();
+        super.delete(), this.so.dispose(), delete this.io, this.uo && this.uo.dispose();
     }
     needClearStencil() {
         return !0;
@@ -9173,7 +9178,7 @@ class vo extends br {
         });
         let o = i;
         if (this.layer.getRenderer().isEnableWorkAround("win-intel-gpu-crash") && (o = Tt({}, i), 
-        o.stencil = Tt({}, i.stencil), o.stencil.enable = !0), this.oo = new n.MeshShader({
+        o.stencil = Tt({}, i.stencil), o.stencil.enable = !0), this.so = new n.MeshShader({
             vert: Us,
             frag: ps,
             uniforms: e,
@@ -9540,7 +9545,7 @@ class No extends Vi {
         Object.defineProperty(u.uniforms, "uvOrigin", {
             enumerable: !0,
             get: () => {
-                const t = this.fo(_, a, s, g, A, l);
+                const t = this.co(_, a, s, g, A, l);
                 return h.set(w, t[0] - t[0] % 1, t[1] - t[1] % 1);
             }
         });
@@ -9548,7 +9553,7 @@ class No extends Vi {
         Object.defineProperty(u.uniforms, "uvOffset", {
             enumerable: !0,
             get: () => {
-                const t = this.fo(_, a, s, g, A, l);
+                const t = this.co(_, a, s, g, A, l);
                 return h.set(w, t[0] % 1, t[1] % 1);
             }
         }), Object.defineProperty(u.uniforms, "hasAlpha", {
@@ -9564,7 +9569,7 @@ class No extends Vi {
             get: () => x.isForeground(u) ? 0 : S - u.properties.tile.z
         }), u.properties.symbolIndex = a, u;
     }
-    fo(t, e, n, i, r, s) {
+    co(t, e, n, i, r, s) {
         if (1 === this.dataConfig.topUVMode) return To;
         const o = this.getMap(), a = this.getSymbol(e).material;
         let l = n;
@@ -9605,10 +9610,10 @@ class No extends Vi {
         return s[0] = r * t[0], s[1] = r * t[0], i || (s[0] %= 1, s[1] %= 1), s;
     }
     needPolygonOffset() {
-        return this.do;
+        return this.fo;
     }
     startFrame(...t) {
-        return delete this.do, super.startFrame(...t);
+        return delete this.fo, super.startFrame(...t);
     }
     addMesh(t, e) {
         t.forEach(t => {
@@ -9621,7 +9626,7 @@ class No extends Vi {
             0 === e && (e = .01), ko[2] = e, r.fromScaling(n, ko), 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.do = !0), 
+        t.material !== this.material && t.setMaterial(this.material), t.geometry.properties.maxAltitude <= 0 && (this.fo = !0), 
         this.getSymbol(t.properties.symbolIndex).ssr ? t.ssr = 1 : t.ssr = 0;
     }
     deleteMaterial() {
@@ -9724,10 +9729,10 @@ class Vo extends No {
         return this.shader;
     }
     delete(t) {
-        this.getMap().off("updatelights", this.po, this), super.delete(t), this.material.dispose();
+        this.getMap().off("updatelights", this.do, this), super.delete(t), this.material.dispose();
     }
     init() {
-        this.getMap().on("updatelights", this.po, this);
+        this.getMap().on("updatelights", this.do, this);
         const t = this.regl;
         this.renderer = new n.Renderer(t);
         const e = this.getShaderConfig();
@@ -9747,7 +9752,7 @@ class Vo extends No {
         };
         this.picking = [ new n.FBORayPicking(this.renderer, i, this.layer.getRenderer().pickingFBO, this.getMap()) ];
     }
-    po() {
+    do() {
         this.setToRedraw();
     }
     getShaderConfig() {
@@ -9803,7 +9808,7 @@ class Vo extends No {
         this.material = new n.PhongMaterial(e);
     }
     getUniformValues(t, e) {
-        const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, s = this.mo(), o = Tt({
+        const n = t.viewMatrix, i = t.projMatrix, r = t.cameraPosition, s = this.po(), o = Tt({
             viewMatrix: n,
             projMatrix: i,
             cameraPosition: r,
@@ -9816,7 +9821,7 @@ class Vo extends No {
     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        ";
     }
-    mo() {
+    po() {
         const t = this.getMap().getLightManager(), e = t && t.getAmbientLight() || {}, n = t && t.getDirectionalLight() || {};
         return {
             ambientColor: e.color || [ .2, .2, .2 ],
@@ -9916,20 +9921,20 @@ const {getPBRUniforms: Bo} = n.pbr.PBRUtils;
 
 class Go extends No {
     constructor(...t) {
-        super(...t), this.yo = new n.ResourceLoader, this.scene.sortFunction = this.sortByCommandKey;
+        super(...t), this.mo = 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.vo();
+        const t = this.yo();
         if (t && (t[0] || t[1])) return !0;
     }
     needToRedraw() {
-        const t = this.vo();
+        const t = this.yo();
         return !(!t || !t[0] && !t[1]) || super.needToRedraw();
     }
-    vo() {
+    yo() {
         const t = this.getSymbols()[0];
         return t.material && t.material.uvOffsetAnim;
     }
@@ -9952,32 +9957,32 @@ class Go extends No {
     paint(t) {
         const e = !!t.shadow;
         t.states && t.states.includesChanged && (this.shader.dispose(), delete this.shader, 
-        this.xo.dispose(), delete this.xo, this.br(t));
+        this.vo.dispose(), delete this.vo, this.br(t));
         let n = !!t.ssr && this.getSymbols()[0].ssr;
         const i = this.shader, r = i.shaderDefines;
         if (n) {
             const e = Tt({}, r, t.ssr.defines);
             i.shaderDefines = e;
         }
-        if (t.onlyUpdateDepthInTaa && (this.shader = this.xo, !n && this.bo && (this.shader = i, 
+        if (t.onlyUpdateDepthInTaa && (this.shader = this.vo, !n && this.xo && (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.bo = n;
+        this.shader = i, n && (i.shaderDefines = r), delete this.shadowCount, this.xo = n;
     }
     updateSceneConfig(t) {
         Tt(this.sceneConfig, t), this.setToRedraw();
     }
     delete() {
-        super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.xo && (this.xo.dispose(), 
-        delete this.xo);
+        super.delete(), this.disposeIBLTextures(), this.material.dispose(), this.vo && (this.vo.dispose(), 
+        delete this.vo);
     }
     init(t) {
-        this.getMap().on("updatelights", this.Ao, this), this.createIBLTextures(), this.Sr = this.Sr || t;
+        this.getMap().on("updatelights", this.bo, this), this.createIBLTextures(), this.Sr = this.Sr || t;
         const e = this.regl;
-        this.renderer = new n.Renderer(e), this.wo = this._o.bind(this), this.So = this.disposeCachedTexture.bind(this), 
-        this.Mo = this.Po.bind(this), this.ri(), this.br(t);
+        this.renderer = new n.Renderer(e), this.Ao = this.wo.bind(this), this._o = this.disposeCachedTexture.bind(this), 
+        this.So = this.Mo.bind(this), this.ri(), this.br(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: [ {
@@ -10039,17 +10044,17 @@ class Go extends No {
             }
         }, o = {
             uniforms: r,
-            defines: this.To(i),
+            defines: this.Po(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.xo = new n.pbr.StandardShader(o);
+        this.vo = new n.pbr.StandardShader(o);
     }
-    _o({resources: t}) {
+    wo({resources: t}) {
         for (let e = 0; e < t.length; e++) this.addCachedTexture(t[e].url, t[e].data);
         this.setToRedraw(!0);
     }
-    Po() {
+    Mo() {
         this.setToRedraw(!0);
     }
     ri(t) {
@@ -10076,14 +10081,14 @@ class Go extends No {
                 url: a,
                 wrap: "repeat"
             }), o.flipY = !e.upsideUpTexture, o.min = "linear mipmap linear", o.mag = "linear", 
-            r[t] = new n.Texture2D(o, this.yo), r[t].once("complete", this.wo), r[t].once("disposed", this.So), 
+            r[t] = new n.Texture2D(o, this.mo), r[t].once("complete", this.Ao), r[t].once("disposed", this._o), 
             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.pbr.StandardMaterial(r), this.material.once("complete", this.Mo);
-        s || this.Po();
+        } else this.material = new n.pbr.StandardMaterial(r), this.material.once("complete", this.So);
+        s || this.Mo();
     }
     getShader() {
         return this.shader;
@@ -10092,13 +10097,13 @@ class Go extends No {
         const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = Bo(t, n, i, e && e.ssr, e && e.jitter);
         return this.setIncludeUniformValues(r, e), r;
     }
-    To(t) {
+    Po(t) {
         return this.hasIBL() ? t.HAS_IBL_LIGHTING = 1 : delete t.HAS_IBL_LIGHTING, t;
     }
-    Ao() {
+    bo() {
         if (!this.shader) return;
         const t = this.shader.shaderDefines;
-        this.To(t), this.shader.shaderDefines = t;
+        this.Po(t), this.shader.shaderDefines = t;
     }
 }
 
@@ -10172,7 +10177,7 @@ class Yo extends Bi {
         super.paint(t);
     }
     init(t) {
-        this.getMap().on("updatelights", this.Ao, this), this.createIBLTextures();
+        this.getMap().on("updatelights", this.bo, this), this.createIBLTextures();
         const e = this.regl;
         if (this.renderer = new n.Renderer(e), this.createShader(t), this.pickingFBO) {
             const t = [];
@@ -10207,7 +10212,7 @@ class Yo extends Bi {
         }), this.shader = new n.pbr.StandardShader({
             vert: Wo,
             uniforms: e,
-            defines: this.To(i),
+            defines: this.Po(i),
             extraCommandProps: this.getExtraCommandProps()
         });
     }
@@ -10322,13 +10327,13 @@ class Yo extends Bi {
             }
         } ];
     }
-    To(t) {
+    Po(t) {
         return this.hasIBL() ? t.HAS_IBL_LIGHTING = 1 : delete t.HAS_IBL_LIGHTING, t;
     }
-    Ao() {
+    bo() {
         if (!this.shader) return;
         const t = this.shader.shaderDefines;
-        this.To(t), this.shader.shaderDefines = t;
+        this.Po(t), this.shader.shaderDefines = t;
     }
     delete() {
         super.delete(), this.disposeIBLTextures(), this.shader && (this.shader.dispose(), 
@@ -10338,13 +10343,13 @@ class Yo extends Bi {
 
 const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0, 0 ], ea = [ 1, 1, 1 ], na = [], ia = [ 1, 1, 1, 1 ], ra = [], sa = [ 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 1 ], oa = t => class extends t {
     constructor(t, e, i, r, s, o) {
-        super(t, e, i, r, s, o), this.ko = !1, this.scene.sortFunction = this.sortByCommandKey, 
-        this.Oo = new n.GLTFManager(t), this.Io(), this.Fo();
+        super(t, e, i, r, s, o), this.To = !1, this.scene.sortFunction = this.sortByCommandKey, 
+        this.ko = new n.GLTFManager(t), this.Oo(), this.Io();
     }
     isAnimating() {
         const t = this.getSymbols();
         for (let e = 0; e < t.length; e++) {
-            if (t[e] && this.Co[e] && this.Eo(e)) return !0;
+            if (t[e] && this.Fo[e] && this.Co(e)) return !0;
         }
         return !1;
     }
@@ -10364,7 +10369,7 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         return na;
     }
     createMesh(t, e, {tileTranslationMatrix: s, tileExtent: o}, {timestamp: a}) {
-        if (!this.ko) return null;
+        if (!this.To) return null;
         const l = this.getMap(), {geometry: h} = t, {positionSize: u, features: c} = h, {aPosition: f, aPickingId: d, aXYRotation: p, aZRotation: m, aAltitude: y} = h.data, g = f.length / u;
         if (0 === g) return null;
         const v = {
@@ -10372,7 +10377,7 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
             instance_vectorB: new Float32Array(4 * g),
             instance_vectorC: new Float32Array(4 * g),
             aPickingId: []
-        }, x = this.Do(v, s, o, h.properties.z, f, y, p, m, u, d, c);
+        }, x = this.Eo(v, s, o, h.properties.z, f, y, p, m, u, d, c);
         h.data.aTerrainAltitude && (v.aTerrainAltitude = h.data.aTerrainAltitude);
         const b = {};
         for (const t in v) b[t] = {
@@ -10382,22 +10387,22 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
             }),
             divisor: 1
         };
-        const A = this.Ro(), w = this.Lo(), _ = r.identity([]);
+        const A = this.Do(), w = this.Ro(), _ = r.identity([]);
         r.scale(_, _, [ w, w, w ]);
         const S = [], M = this.getSymbols();
         for (let t = 0; t < M.length; t++) {
-            const e = M[t], o = this.No[t];
+            const e = M[t], o = this.Lo[t];
             if (!o) continue;
-            const u = this.Co[t][0], {fixSizeOnZoom: c} = e;
+            const u = this.Fo[t][0], {fixSizeOnZoom: c} = e;
             let f = r.identity([]);
-            A || (f = this.Ho(f));
+            A || (f = this.No(f));
             let d = 0;
             o.forEach(t => {
                 const {geometry: n, nodeMatrix: i} = t;
                 r.multiply(ra, sa, i), r.multiply(ra, f, ra);
                 const s = r.multiply(ra, _, ra), o = n.boundingBox.copy();
                 o.transform(s);
-                const a = this.zo(o, e);
+                const a = this.Ho(o, e);
                 Math.abs(a) > Math.abs(d) && (d = a);
             });
             const p = [ 0, 0, d ], m = o.map((o, m) => {
@@ -10408,17 +10413,17 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
                     picking: !0
                 });
                 if (u.hasSkinAnimation()) {
-                    const e = this.Vo(k, t, 0)[M];
+                    const e = this.zo(k, t, 0)[M];
                     k.setUniform("jointTexture", e.jointTexture), k.setUniform("jointTextureSize", e.jointTextureSize), 
-                    k.setUniform("numJoints", e.numJoints), k.setUniform("skinAnimation", +this.Eo(t)), 
+                    k.setUniform("numJoints", e.numJoints), k.setUniform("skinAnimation", +this.Co(t)), 
                     k.properties.startTime = a, T.HAS_SKIN = 1;
                 }
                 w && (k.setUniform("morphWeights", w), T.HAS_MORPH = 1), k.setUniform("hasAlpha", S.alphaMode && "BLEND" === S.alphaMode.toUpperCase()), 
                 Ct(k.uniforms, "polygonFill", e, "markerFill", ia, Rt(this.colorCache)), Ct(k.uniforms, "polygonOpacity", e, "markerOpacity", 1);
                 const O = [];
                 k.setPositionMatrix(() => {
-                    const e = this.Uo(t, m, M);
-                    r.multiply(O, sa, e), this.Ho(f), r.multiply(O, f, O), r.multiply(O, _, O);
+                    const e = this.Vo(t, m, M);
+                    r.multiply(O, sa, e), this.No(f), r.multiply(O, f, O), r.multiply(O, _, O);
                     const n = r.identity(ra);
                     if (0 !== d && (r.fromTranslation(n, p), r.multiply(O, n, O)), Ht(c)) {
                         const t = l.getGLScale() / l.getGLScale(c);
@@ -10448,19 +10453,19 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
             positionSize: u
         }, S;
     }
-    Uo(t, e, n) {
-        const i = t, r = this.No[i][e];
-        return this.Eo(t) && this.jo && this.jo[n] || r.nodeMatrix;
-    }
     Vo(t, e, n) {
-        if (!this.Co) return;
-        const i = this.Co[e][0];
-        this.Bo || (this.Bo = {}), this.jo = {}, this.Bo[t.uuid] || (this.Bo[t.uuid] = {});
-        const r = this.getSymbols()[e], s = this.Go[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.jo, this.Bo[t.uuid]), 
-        this.Bo[t.uuid];
-    }
-    zo(t, e) {
+        const i = t, r = this.Lo[i][e];
+        return this.Co(t) && this.Uo && this.Uo[n] || r.nodeMatrix;
+    }
+    zo(t, e, n) {
+        if (!this.Fo) return;
+        const i = this.Fo[e][0];
+        this.jo || (this.jo = {}), this.Uo = {}, this.jo[t.uuid] || (this.jo[t.uuid] = {});
+        const r = this.getSymbols()[e], s = this.Bo[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.Uo, this.jo[t.uuid]), 
+        this.jo[t.uuid];
+    }
+    Ho(t, e) {
         const n = e.anchorZ || "center";
         let i = 0;
         const r = t.max[2] - t.min[2];
@@ -10473,8 +10478,8 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         for (let e = 0; e < t.length; e++) {
             if (!t[e] || !t[e].geometry) continue;
             t[e].instancedData.aTerrainAltitude && this.ji(t[e], t[e].instancedData, t[e].properties, 3, n);
-            const r = t[e].properties.symbolIndex.index, s = this.Eo(r);
-            s && this.Vo(t[e], r, i), t[e].setUniform("skinAnimation", +s);
+            const r = t[e].properties.symbolIndex.index, s = this.Co(r);
+            s && this.zo(t[e], r, i), t[e].setUniform("skinAnimation", +s);
         }
         return this.scene.addMesh(t), this;
     }
@@ -10485,8 +10490,8 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         const e = this.getSymbols();
         let n = !1;
         for (let t = 0; t < e.length; t++) {
-            if (!e[t] || !this.Co[t]) continue;
-            if (this.Eo(t) && this.Co[t] && !n) {
+            if (!e[t] || !this.Fo[t]) continue;
+            if (this.Co(t) && this.Fo[t] && !n) {
                 n = !0;
                 break;
             }
@@ -10498,11 +10503,11 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         this.shadowCount = this.scene.getMeshes().length;
         return this.scene.getMeshes().filter(t => 0 === t.properties.level);
     }
-    Eo(t) {
+    Co(t) {
         const e = this.getSymbols()[t];
-        return !!(e && e.animation && this.Co[t] && this.Co[t][0] && this.Co[t][0].hasSkinAnimation());
+        return !!(e && e.animation && this.Fo[t] && this.Fo[t][0] && this.Fo[t][0].hasSkinAnimation());
     }
-    Do(t, e, n, s, o, a, l, h, u, c, f) {
+    Eo(t, e, n, s, o, a, l, h, u, c, f) {
         function d(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];
         }
@@ -10515,7 +10520,7 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
             e[0] < v && (v = e[0]), e[0] > w && (w = e[0]), e[1] < x && (x = e[1]), e[1] > _ && (_ = e[1]), 
             e[2] < b && (b = e[2]), e[2] > S && (S = e[2]);
         }
-        const T = (v + w) / 2, k = (x + _) / 2, O = (b + S) / 2, I = [], F = this.Ro(), C = [ 0, 0, 1 ];
+        const T = (v + w) / 2, k = (x + _) / 2, O = (b + S) / 2, I = [], F = this.Do(), C = [ 0, 0, 1 ];
         for (let e = 0; e < p; e++) {
             a ? i.set(P, o[e * u], o[e * u + 1], a[e]) : A.unpackPosition(P, o[e * u], o[e * u + 1], o[e * u + 2]);
             const n = P[0], s = P[1], p = i.set(M, n * m - T, -s * m - k, (P[2] + g) * y - O), v = l && l[e] || 0, x = h && h[e] || 0;
@@ -10527,7 +10532,7 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
                 r.multiply(I, o, I);
             } else r.fromTranslation(I, p);
             if (F) {
-                const t = this.Ho(ra, f, c, e);
+                const t = this.No(ra, f, c, e);
                 r.multiply(I, I, t);
             }
             d("instance_vectorA", e, I, 0), d("instance_vectorB", e, I, 1), d("instance_vectorC", e, I, 2), 
@@ -10535,30 +10540,30 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         }
         return i.set(M, T, k, O), M;
     }
-    Lo() {
-        if (!this.Wo) {
+    Ro() {
+        if (!this.Go) {
             const t = this.getMap();
-            this.Wo = 100 * lt(t.getGLRes(), t);
+            this.Go = 100 * lt(t.getGLRes(), t);
         }
-        return this.Wo;
+        return this.Go;
     }
-    Ho(t, e, n, r) {
-        const s = this.getMap(), o = this.symbolDef[0], a = this.Lo();
+    No(t, e, n, r) {
+        const s = this.getMap(), o = this.symbolDef[0], a = this.Ro();
         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, m = o.scaleY || 1, y = o.scaleZ || 1;
-        const g = n && n[r], v = e && e[g], x = s.getZoom(), b = v && v.feature && v.feature.properties, A = this.Xo(x, b);
-        this.Yo && (l = this.Yo(x, b)), this.$o && (h = this.$o(x, b)), this.qo && (u = this.qo(x, b));
+        const g = n && n[r], v = e && e[g], x = s.getZoom(), b = v && v.feature && v.feature.properties, A = this.Wo(x, b);
+        this.Xo && (l = this.Xo(x, b)), this.Yo && (h = this.Yo(x, b)), this.$o && (u = this.$o(x, b));
         const w = i.set(qo, l * a, h * a, u * a);
-        this.Jo && (c = this.Jo(x, b)), this.Ko && (f = this.Ko(x, b)), this.Zo && (d = this.Zo(x, b));
+        this.qo && (c = this.qo(x, b)), this.Jo && (f = this.Jo(x, b)), this.Ko && (d = this.Ko(x, b));
         const _ = i.set(Jo, c, f, d);
-        this.Qo && (p = this.Qo(x, b)), this.ta && (m = this.ta(x, b)), this.ea && (y = this.ea(x, b));
+        this.Zo && (p = this.Zo(x, b)), this.Qo && (m = this.Qo(x, b)), this.ta && (y = this.ta(x, b));
         const S = i.set(Ko, p * A, m * A, y * A);
-        return this.na(t, w, _, S);
+        return this.ea(t, w, _, S);
     }
-    Xo(t, e) {
+    Wo(t, e) {
         const n = this.symbolDef[0];
-        let i = this.ia ? this.ia(t, e) : n.modelHeight;
+        let i = this.na ? this.na(t, e) : n.modelHeight;
         if (rt(i)) return 1;
-        const r = this.ra[0];
+        const r = this.ia[0];
         return i / Math.abs(r.max[1] - r.min[1]);
     }
     getShaderConfig() {
@@ -10566,40 +10571,40 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         return t.positionAttribute = "POSITION", t.normalAttribute = "NORMAL", t;
     }
     init(t) {
-        super.init(t), this.Fo();
+        super.init(t), this.Io();
     }
-    Io() {
+    Oo() {
         const t = this.symbolDef[0];
-        p(t.modelHeight) && (this.ia = g(t.modelHeight)), p(t.translationX) && (this.Yo = g(t.translationX)), 
-        p(t.translationY) && (this.$o = g(t.translationY)), p(t.translationZ) && (this.qo = g(t.translationZ)), 
-        p(t.rotationX) && (this.Jo = g(t.rotationX)), p(t.rotationY) && (this.Ko = g(t.rotationY)), 
-        p(t.rotationZ) && (this.Zo = g(t.rotationZ)), p(t.scaleX) && (this.Qo = g(t.scaleX)), 
-        p(t.scaleY) && (this.ta = g(t.scaleY)), p(t.scaleZ) && (this.ea = g(t.scaleZ));
+        p(t.modelHeight) && (this.na = g(t.modelHeight)), p(t.translationX) && (this.Xo = g(t.translationX)), 
+        p(t.translationY) && (this.Yo = g(t.translationY)), p(t.translationZ) && (this.$o = g(t.translationZ)), 
+        p(t.rotationX) && (this.qo = g(t.rotationX)), p(t.rotationY) && (this.Jo = g(t.rotationY)), 
+        p(t.rotationZ) && (this.Ko = g(t.rotationZ)), p(t.scaleX) && (this.Zo = g(t.scaleX)), 
+        p(t.scaleY) && (this.Qo = g(t.scaleY)), p(t.scaleZ) && (this.ta = g(t.scaleZ));
     }
-    Ro() {
-        return !!(this.ia && !this.ia.isFeatureConstant || this.Yo && !this.Yo.isFeatureConstant || this.$o && !this.$o.isFeatureConstant || this.qo && !this.qo.isFeatureConstant || this.Jo && !this.Jo.isFeatureConstant || this.Ko && !this.Ko.isFeatureConstant || this.Zo && !this.Zo.isFeatureConstant || this.Qo && !this.Qo.isFeatureConstant || this.ta && !this.ta.isFeatureConstant || this.ea && !this.ea.isFeatureConstant);
+    Do() {
+        return !!(this.na && !this.na.isFeatureConstant || this.Xo && !this.Xo.isFeatureConstant || this.Yo && !this.Yo.isFeatureConstant || this.$o && !this.$o.isFeatureConstant || this.qo && !this.qo.isFeatureConstant || this.Jo && !this.Jo.isFeatureConstant || this.Ko && !this.Ko.isFeatureConstant || this.Zo && !this.Zo.isFeatureConstant || this.Qo && !this.Qo.isFeatureConstant || this.ta && !this.ta.isFeatureConstant);
     }
-    Fo() {
-        if (this.Co) return;
-        this.Co = [], this.Go = [], this.ra = [], this.No = [];
+    Io() {
+        if (this.Fo) return;
+        this.Fo = [], this.Bo = [], this.ia = [], this.Lo = [];
         const t = this.getSymbols();
-        this.sa = 0;
+        this.ra = 0;
         for (let e = 0; e < t.length; e++) {
             const n = t[e].url || "pyramid";
-            this.Oo.loginGLTF(n);
-            const i = this.Oo.getGLTF(n);
+            this.ko.loginGLTF(n);
+            const i = this.ko.getGLTF(n);
             if (i.then) i.then(n => {
-                if (!n.gltfPack) return this.sa++, void (this.sa >= t.length && (this.ko = !0, this.setToRedraw(!0)));
+                if (!n.gltfPack) return this.ra++, void (this.ra >= t.length && (this.To = !0, this.setToRedraw(!0)));
                 const {gltfPack: i, json: r, bbox: s} = n;
-                this.Co[e] = [ i ], this.No[e] = i.getMeshesInfo(), this.Go[e] = r, this.ra[e] = s, 
-                this.sa++, this.sa >= t.length && (this.ko = !0), this.setToRedraw(!0);
+                this.Fo[e] = [ i ], this.Lo[e] = i.getMeshesInfo(), this.Bo[e] = r, this.ia[e] = s, 
+                this.ra++, this.ra >= t.length && (this.To = !0), this.setToRedraw(!0);
             }); else {
                 const {gltfPack: t, json: n, bbox: r} = i;
-                t && (this.Co[e] = [ t ], this.No[e] = t.getMeshesInfo(), this.Go[e] = n, this.ra[e] = r, 
-                this.sa++);
+                t && (this.Fo[e] = [ t ], this.Lo[e] = t.getMeshesInfo(), this.Bo[e] = n, this.ia[e] = r, 
+                this.ra++);
             }
         }
-        this.sa >= t.length && (this.ko = !0);
+        this.ra >= t.length && (this.To = !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    }";
@@ -10608,10 +10613,10 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         if (t) {
             this.scene.removeMesh(t);
             for (let e = 0; e < t.length; e++) {
-                const n = this.Bo && this.Bo[t[e].uuid];
+                const n = this.jo && this.jo[t[e].uuid];
                 if (n) {
                     for (const t in n) n[t].jointTexture && n[t].jointTexture.destroy();
-                    delete this.Bo[t[e].uuid];
+                    delete this.jo[t[e].uuid];
                 }
                 t[e].disposeInstanceData(), t[e].dispose();
             }
@@ -10622,18 +10627,18 @@ const $o = [], qo = [], Jo = [], Ko = [], Zo = [], Qo = [ 0, 0, 0 ], ta = [ 0, 0
         const t = this.getSymbols();
         for (let e = 0; e < t.length; e++) {
             const n = t[e].url || "pyramid";
-            this.Oo.logoutGLTF(n);
+            this.ko.logoutGLTF(n);
         }
-        if (this.Bo) {
-            for (const t in this.Bo) {
-                const e = this.Bo[t];
+        if (this.jo) {
+            for (const t in this.jo) {
+                const e = this.jo[t];
                 for (const t in e) e[t].jointTexture && e[t].jointTexture.destroy();
             }
-            delete this.Bo;
+            delete this.jo;
         }
-        delete this.jo;
+        delete this.Uo;
     }
-    na(t, e, n, s) {
+    ea(t, e, n, s) {
         const o = i.set($o, ...e || Qo), a = n || ta, l = s || ea, h = c.fromEuler(Zo, a[0], a[1], a[2]);
         return r.fromRotationTranslationScale(t, h, o, l);
     }
@@ -10686,8 +10691,8 @@ class pa extends Bi {
     }
     callShader(t, e) {
         super.callShader(t, e), this.transformWater();
-        const n = this.oa(this.getMap(), e);
-        this.Gi += this.renderer.render(this.aa, n, this.la, this.getRenderFBO(e));
+        const n = this.sa(this.getMap(), e);
+        this.Gi += this.renderer.render(this.oa, n, this.aa, this.getRenderFBO(e));
     }
     addMesh(t, e) {
         this._r(t, e), super.addMesh(...arguments);
@@ -10697,14 +10702,14 @@ class pa extends Bi {
         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.aa.dispose(), 
+        t.states && t.states.includesChanged && (this.shader.dispose(), this.oa.dispose(), 
         this.br(t));
-        const e = !!t.ssr && this.getSymbol(ca).ssr, n = this.aa, i = n.shaderDefines;
+        const e = !!t.ssr && this.getSymbol(ca).ssr, n = this.oa, i = n.shaderDefines;
         if (e) {
             const e = Tt({}, i, t.ssr.defines);
             n.shaderDefines = e;
         }
-        this.updateIBLDefines(n), this.ha.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
+        this.updateIBLDefines(n), this.la.ssr = e ? 1 : 0, super.paint(t), e && (n.shaderDefines = i);
     }
     init(t) {
         this.createIBLTextures();
@@ -10722,38 +10727,38 @@ class pa extends Bi {
             extraCommandProps: {
                 viewport: this.pickingViewport
             }
-        }, this.pickingFBO, this.getMap()) ]), this.ua();
+        }, this.pickingFBO, this.getMap()) ]), this.ha();
     }
-    ua() {
+    ha() {
         const t = this.regl;
-        this.ca || (this.ca = t.texture(2));
+        this.ua || (this.ua = t.texture(2));
         const e = this.getSymbol({
             index: 0
         }), n = e.texWaveNormal, i = this.getCachedTexture(n), r = this;
-        if (i) this.fa || (i.isLoading ? setTimeout(() => {
-            this.shader && this.ua();
-        }, 20) : this.fa = this.da(t, i)); else {
+        if (i) this.ca || (i.isLoading ? setTimeout(() => {
+            this.shader && this.ha();
+        }, 20) : this.ca = this.fa(t, i)); else {
             const e = new Image;
             e.isLoading = !0, e.onload = function() {
-                delete this.isLoading, r.fa = r.da(t, this), r.setToRedraw();
+                delete this.isLoading, r.ca = r.fa(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.pa || (o.isLoading ? setTimeout(() => {
-            this.ua(), this.shader;
-        }, 20) : this.pa = this.da(t, o)); else {
+        if (o) this.da || (o.isLoading ? setTimeout(() => {
+            this.ha(), this.shader;
+        }, 20) : this.da = this.fa(t, o)); else {
             const e = new Image;
             e.isLoading = !0, e.onload = function() {
-                delete this.isLoading, r.pa = r.da(t, this), r.setToRedraw();
+                delete this.isLoading, r.da = r.fa(t, this), r.setToRedraw();
             }, e.onerror = () => {
                 console.error("invalid water wave perturbation texture:" + s);
             }, this.addCachedTexture(s, e), e.src = s;
         }
     }
-    da(t, e) {
-        return this.ca ? t.texture({
+    fa(t, e) {
+        return this.ua ? t.texture({
             width: e.width,
             height: e.height,
             mag: "linear",
@@ -10859,7 +10864,7 @@ class pa extends Bi {
                 enable: !1
             }
         };
-        s.push(...n.SsrPass.getUniformDeclares()), this.aa = new n.MeshShader({
+        s.push(...n.SsrPass.getUniformDeclares()), this.oa = 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\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: o,
@@ -10875,10 +10880,10 @@ class pa extends Bi {
             projViewMatrix: t.projViewMatrix
         };
     }
-    oa(t, e) {
+    sa(t, e) {
         const {iblTexes: n, dfgLUT: i} = this.getIBLRes(), r = ha(t, n, i, e && e.ssr, e && e.jitter), s = t.getLightManager();
         let o = s && s.getDirectionalLight() || {};
-        const l = s && s.getAmbientLight() || {}, h = this.getSymbol(ca), u = this.ma = this.ma || [], c = this.ya = this.ya || [];
+        const l = s && s.getAmbientLight() || {}, h = this.getSymbol(ca), u = this.pa = this.pa || [], c = this.ma = this.ma || [];
         a.set(c, .09, h.uvScale || 3, .03, -.5);
         Tt(r, {
             ambientColor: l.color || [ .2, .2, .2 ],
@@ -10887,8 +10892,8 @@ class pa extends Bi {
             lightColor: o.color || ua.color,
             camPos: t.cameraPosition,
             timeElapsed: h.animation ? (this.layer.getRenderer().getFrameTimestamp() || 0) / (1 / (h.waterSpeed || 1) * 1e4) : 0,
-            normalTexture: this.fa || this.ca,
-            heightTexture: this.pa || this.ca,
+            normalTexture: this.ca || this.ua,
+            heightTexture: this.da || this.ua,
             waveParams: c,
             waterDir: ma(u, h.waterDirection || 0),
             waterBaseColor: h.waterBaseColor || [ .1451, .2588, .4863, 1 ],
@@ -10900,24 +10905,24 @@ class pa extends Bi {
         r;
     }
     delete() {
-        super.delete(), this.ca && (this.ca.destroy(), delete this.ca), this.fa && this.fa.destroy(), 
-        this.pa && this.pa.destroy(), this.shader && (this.shader.dispose(), delete this.shader), 
-        this.aa && this.aa.dispose(), this.ha && (this.ha.geometry.dispose(), this.ha.material && this.ha.material.dispose(), 
-        this.ha.dispose(), delete this.ha), this.disposeIBLTextures();
+        super.delete(), this.ua && (this.ua.destroy(), delete this.ua), this.ca && this.ca.destroy(), 
+        this.da && this.da.destroy(), this.shader && (this.shader.dispose(), delete this.shader), 
+        this.oa && this.oa.dispose(), this.la && (this.la.geometry.dispose(), this.la.material && this.la.material.dispose(), 
+        this.la.dispose(), delete this.la), 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.ha = new n.Mesh(t, null, {
+        this.la = new n.Mesh(t, null, {
             castShadow: !1
-        }), this.la = new n.Scene([ this.ha ]);
+        }), this.aa = new n.Scene([ this.la ]);
     }
     transformWater() {
-        const t = this.getMap(), e = s.getGroundTransform(this.ha.localTransform, t);
-        this.ha.setLocalTransform(e);
+        const t = this.getMap(), e = s.getGroundTransform(this.la.localTransform, t);
+        this.la.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 = a / da[0], u = l / da[1], c = h % 1, f = u % 1, d = .3737 * h % 1, p = .3737 * u % 1, m = i / da[0] * 2, y = r / da[1] * 2;
-        this.ha.setUniform("uvOffset", [ c, f ]), this.ha.setUniform("noiseUvOffset", [ d, p ]), 
-        this.ha.setUniform("uvScale", [ m, -y ]);
+        this.la.setUniform("uvOffset", [ c, f ]), this.la.setUniform("noiseUvOffset", [ d, p ]), 
+        this.la.setUniform("uvScale", [ m, -y ]);
     }
 }
 
@@ -11013,7 +11018,7 @@ const ka = ei("heatmap", class extends Bi {
     }
     callRenderer(t, e, n) {
         const i = this.getRenderFBO(n);
-        this.Gi += this.ga.render(this.scene, e, i);
+        this.Gi += this.ya.render(this.scene, e, i);
     }
     getUniformValues(t) {
         const e = this.getSymbol({
@@ -11030,13 +11035,13 @@ const ka = ei("heatmap", class extends Bi {
         return this.scene.getMeshes();
     }
     delete() {
-        super.delete(...arguments), this.ga.dispose(), delete this.ga;
+        super.delete(...arguments), this.ya.dispose(), delete this.ya;
     }
     init() {
         const t = this.regl;
         this.renderer = new n.Renderer(t);
         const e = this.getPolygonOffset(), i = this.getSymbols()[0];
-        this.ga = new d(this.regl, this.sceneConfig, this.layer, i.heatmapColor, null, e);
+        this.ya = new d(this.regl, this.sceneConfig, this.layer, i.heatmapColor, null, e);
     }
 });
 
@@ -11047,7 +11052,7 @@ const Oa = ei("water", pa);
 Oa.registerAt(he), we.registerPainter("lit", Go), we.registerPainter("icon", Cs), 
 we.registerPainter("fill", nr), we.registerPainter("line", or), we.registerPainter("line-gradient", ar), 
 we.registerPainter("water", pa), we.registerPainter("tube", Yo), n.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"), 
-he.VERSION = "0.92.1", we.VERSION = "0.92.1";
+he.VERSION = "0.92.2", we.VERSION = "0.92.2";
 
 if (e.mat4.create(), e.transcoders) {
     const n = t.Map.VERSION;
@@ -11061,4 +11066,4 @@ if (e.mat4.create(), e.transcoders) {
 
 export { $n as ExtrudePolygonLayer, nr as FillPainter, ya as FillPlugin, Pa as GLTFPhongPlugin, Ta as GLTFStandardPlugin, ve as GeoJSONVectorTileLayer, ka as HeatmapPlugin, Cs as IconPainter, xa as IconPlugin, va as LineGradientPlugin, or as LinePainter, ga as LinePlugin, $e as LineStringLayer, Sa as LitPlugin, ye as MapboxVectorTileLayer, Po as NativeLinePainter, Aa as NativeLinePlugin, _o as NativePointPainter, Vo as PhongPainter, wa as PhongPlugin, Ye as PointLayer, Je as PolygonLayer, vo as TextPainter, ba as TextPlugin, Ma as TubePlugin, we as Vector3DLayer, he as VectorTileLayer, Jt as VectorTileLayerRenderer, Oa as WaterPlugin, jo as WireframePainter, _a as WireframePlugin };
 
-"undefined" != typeof console && console.log("@maptalks/vt v0.92.1");
+"undefined" != typeof console && console.log("@maptalks/vt v0.92.2");