gl-draw 0.14.30 → 0.14.31

package/dist/index.module2.js

@@ -11,31 +11,31 @@ var H = Math.pow, Y = (a, t, e) => t in a ? dt(a, t, { enumerable: !0, configura
   return a;
 }, Z = (a, t) => pt(a, mt(t));
 var J = (a, t, e) => new Promise((i, s) => {
-  var n = (l) => {
+  var r = (l) => {
     try {
-      r(e.next(l));
+      n(e.next(l));
     } catch (c) {
       s(c);
     }
   }, o = (l) => {
     try {
-      r(e.throw(l));
+      n(e.throw(l));
     } catch (c) {
       s(c);
     }
-  }, r = (l) => l.done ? i(l.value) : Promise.resolve(l.value).then(n, o);
-  r((e = e.apply(a, t)).next());
+  }, n = (l) => l.done ? i(l.value) : Promise.resolve(l.value).then(r, o);
+  n((e = e.apply(a, t)).next());
 });
 import * as h from "three";
-import { Vector4 as k, Vector3 as B, Matrix4 as bt, Line3 as yt, Box3 as xt, Sphere as Mt, Mesh as wt, InstancedInterleavedBuffer as Pt, InterleavedBufferAttribute as tt, MathUtils as At } from "three";
+import { Vector4 as k, Vector3 as _, Matrix4 as bt, Line3 as yt, Box3 as xt, Sphere as Mt, Mesh as wt, InstancedInterleavedBuffer as Pt, InterleavedBufferAttribute as tt, MathUtils as At } from "three";
 import { CSS2DObject as jt } from "three/examples/jsm/renderers/CSS2DRenderer";
 import { CSS3DObject as St, CSS3DSprite as Ct } from "three/examples/jsm/renderers/CSS3DRenderer";
-import { geoBounds as ht, geoContains as zt, geoDistance as Dt, geoInterpolate as It } from "d3-geo";
+import { geoBounds as ht, geoContains as zt, geoDistance as Dt, geoInterpolate as Bt } from "d3-geo";
 import "d3-geo-projection";
-import { p as et, a as Tt } from "./parseVector.module.js";
-import { LineSegmentsGeometry as Wt } from "three/examples/jsm/lines/LineSegmentsGeometry";
-import { merge as K, mean as _t, extent as it } from "d3-array";
-import Bt, { flatten as ft } from "earcut";
+import { p as et, a as It } from "./parseVector.module.js";
+import { LineSegmentsGeometry as Tt } from "three/examples/jsm/lines/LineSegmentsGeometry";
+import { merge as K, mean as Wt, extent as it } from "d3-array";
+import _t, { flatten as ft } from "earcut";
 import Lt from "@turf/boolean-clockwise";
 import Ot from "delaunator";
 import Vt from "@turf/boolean-point-in-polygon";
@@ -102,10 +102,10 @@ const Et = (a, t = 1) => {
     alphaTest: i.alphaTest,
     sizeAttenuation: !1
   });
-  return s.onBeforeCompile = (n) => {
-    n.vertexShader = `
+  return s.onBeforeCompile = (r) => {
+    r.vertexShader = `
             attribute float scaleAtt;
-              ${n.vertexShader.replace(
+              ${r.vertexShader.replace(
       "gl_PointSize = size;",
       "gl_PointSize = size * scaleAtt;"
     )}
@@ -114,7 +114,7 @@ const Et = (a, t = 1) => {
 };
 class Rt extends V {
   constructor() {
-    super(...arguments), this.objectType = "BaseObject", this.userData = {}, this.prefab = !1, this.isInstantiate = !1, this.materialList = {}, this.useMaterialType = "origin", this.onPointerIndex = [];
+    super(...arguments), this.objectType = "BaseObject", this.userData = {}, this.prefab = !1, this.isInstantiate = !1, this.isBloom = !1, this.materialList = {}, this.useMaterialType = "origin", this.onPointerIndex = [];
   }
   get parent() {
     const t = this.object3d.parent;
@@ -213,44 +213,40 @@ class Rt extends V {
   }
   instantiate(t, e) {
     return J(this, null, function* () {
-      var m;
-      const i = t && t.length > 0, s = (m = e == null ? void 0 : e.recursive) != null ? m : !0, { objectType: n, objectOptions: o } = this, [, r] = n.split("#");
+      var p;
+      const i = t && t.length > 0, s = (p = e == null ? void 0 : e.recursive) != null ? p : !0, { objectType: r, objectOptions: o } = this, [, n] = r.split("#");
       let l = e == null ? void 0 : e.create;
       l === void 0 && (l = (u) => {
-        var v;
         if (this.object3d) {
           if (i) {
-            const f = t.length;
+            const v = t.length;
             if (this.object3d instanceof h.Sprite)
-              u.object3d = Et(this.object3d, f);
+              u.object3d = Et(this.object3d, v);
             else {
               const d = this.object3d;
               u.object3d = new h.InstancedMesh(
                 d.geometry,
                 d.material,
-                f
+                v
               ), u.setMaterialList("instantiate", "clone"), u.useMaterial("instantiate");
             }
-            const p = new h.Object3D();
-            t.forEach((d, b) => {
-              const P = et(d.position), z = et(d.scale || [1, 1, 1]);
-              p.position.copy(P), p.scale.copy(z), p.updateMatrix(), u.setInstancedMatrix(b, p.matrix.clone());
+            const f = new h.Object3D();
+            t.forEach((d, m) => {
+              const b = et(d.position), P = et(d.scale || [1, 1, 1]);
+              f.position.copy(b), f.scale.copy(P), f.updateMatrix(), u.setInstancedMatrix(m, f.matrix.clone());
             });
           } else
             u.object3d = this.object3d.clone(!1), u.setMaterialList("instantiate", "clone"), u.useMaterial("instantiate");
-          u.object3d.userData.bloom && ((v = this.pencil.composerController) == null || v.toggleBloomSelection(
-            u.object3d,
-            !0
-          )), u.object3d.userData.prefab && (u.object3d.userData.prefab = !1);
+          u.object3d.userData.prefab && delete u.object3d.userData.prefab;
         }
       });
-      const c = yield this.lead.draw(r, Z(O({}, o || {}), {
+      const c = yield this.lead.draw(n, Z(O({}, o || {}), {
         create: l,
         prefab: !1,
         key: (e == null ? void 0 : e.key) || (o == null ? void 0 : o.key),
         target: (e == null ? void 0 : e.target) || (o == null ? void 0 : o.target)
       }));
-      return s && (yield Promise.all(
+      return this.isBloom && c.enableBloom(), s && (yield Promise.all(
         this.children.map(
           (u) => u.instantiate(void 0, {
             target: c
@@ -263,8 +259,8 @@ class Rt extends V {
     if (this.object3d instanceof h.InstancedMesh || this.object3d.isInstantiate)
       this.object3d.setMatrixAt(t, e);
     else if (this.object3d instanceof h.Points || this.object3d.type === "Points") {
-      const s = this.object3d.geometry, n = s.attributes.position.array, o = s.attributes.scaleAtt.array, r = new h.Vector3(), l = new h.Vector3(), c = new h.Quaternion(), m = t * 3, u = t * 1;
-      e.decompose(r, c, l), n[m] = r.x, n[m + 1] = r.y, n[m + 2] = r.z, o[u] = Math.max(l.x, l.y, l.z), s.attributes.position.needsUpdate = !0, s.attributes.scaleAtt.needsUpdate = !0;
+      const s = this.object3d.geometry, r = s.attributes.position.array, o = s.attributes.scaleAtt.array, n = new h.Vector3(), l = new h.Vector3(), c = new h.Quaternion(), p = t * 3, u = t * 1;
+      e.decompose(n, c, l), r[p] = n.x, r[p + 1] = n.y, r[p + 2] = n.z, o[u] = Math.max(l.x, l.y, l.z), s.attributes.position.needsUpdate = !0, s.attributes.scaleAtt.needsUpdate = !0;
     }
   }
   erase() {
@@ -279,8 +275,8 @@ class Rt extends V {
       return e.map((i) => {
         const s = i.userData;
         i.userData = {};
-        const n = i.clone();
-        return i.userData = s, n;
+        const r = i.clone();
+        return i.userData = s, r;
       });
     {
       const i = e.userData;
@@ -295,12 +291,12 @@ class Rt extends V {
       return;
     if (this.materialList.origin || (this.materialList.origin = s.material), this.materialList[t])
       if (i) {
-        const o = this.materialList[t], r = new V();
-        r.track(o), r.dispose();
+        const o = this.materialList[t], n = new V();
+        n.track(o), n.dispose();
       } else
         return this.materialList[t];
-    const n = e === "clone" ? this.cloneMaterial() : e;
-    return this.materialList[t] = n, n;
+    const r = e === "clone" ? this.cloneMaterial() : e;
+    return this.materialList[t] = r, r;
   }
   useMaterial(t) {
     const e = this.object3d;
@@ -313,10 +309,19 @@ class Rt extends V {
     const i = this.lead.handlePick([this], t, e);
     this.onPointerIndex.push(i);
   }
+  enableBloom() {
+    var t;
+    (t = this.pencil.composerController) == null || t.setBloomSelection(this, !0), this.isBloom = !0;
+  }
+  disableBloom() {
+    var t;
+    (t = this.pencil.composerController) == null || t.setBloomSelection(this, !1), this.isBloom = !1;
+  }
   dispose() {
-    this.onPointerIndex.forEach((t) => {
-      this.lead.removePick(t);
-    }), this.lead && (this.lead.objects.delete(this.key), this.object3d && this.lead.objMap.delete(this.object3d)), this.track(this), super.dispose();
+    var t;
+    this.onPointerIndex.forEach((e) => {
+      this.lead.removePick(e);
+    }), (t = this.pencil.composerController) == null || t.bloomSelection.delete(this), this.lead && (this.lead.objects.delete(this.key), this.object3d && this.lead.objMap.delete(this.object3d)), this.track(this), super.dispose();
   }
   disposeWithOutMaterial() {
     this.disposeWithMaterial = !1, this.dispose();
@@ -327,32 +332,32 @@ class fe extends Rt {
     this.createGroup();
   }
 }
-const $ = new k(), rt = new B(), nt = new B(), y = new k(), x = new k(), I = new k(), q = new B(), N = new bt(), M = new yt(), at = new B(), R = new xt(), U = new Mt(), T = new k();
-let W, L;
+const $ = new k(), nt = new _(), rt = new _(), y = new k(), x = new k(), B = new k(), q = new _(), N = new bt(), M = new yt(), at = new _(), R = new xt(), U = new Mt(), I = new k();
+let T, L;
 function ot(a, t, e) {
-  return T.set(0, 0, -t, 1).applyMatrix4(a.projectionMatrix), T.multiplyScalar(1 / T.w), T.x = L / e.width, T.y = L / e.height, T.applyMatrix4(a.projectionMatrixInverse), T.multiplyScalar(1 / T.w), Math.abs(Math.max(T.x, T.y));
+  return I.set(0, 0, -t, 1).applyMatrix4(a.projectionMatrix), I.multiplyScalar(1 / I.w), I.x = L / e.width, I.y = L / e.height, I.applyMatrix4(a.projectionMatrixInverse), I.multiplyScalar(1 / I.w), Math.abs(Math.max(I.x, I.y));
 }
 function Ut(a, t) {
-  const e = a.matrixWorld, i = a.geometry, s = i.attributes.instanceStart, n = i.attributes.instanceEnd, o = Math.min(i.instanceCount, s.count);
-  for (let r = 0, l = o; r < l; r++) {
-    M.start.fromBufferAttribute(s, r), M.end.fromBufferAttribute(n, r), M.applyMatrix4(e);
-    const c = new B(), m = new B();
-    W.distanceSqToSegment(M.start, M.end, m, c), m.distanceTo(c) < L * 0.5 && t.push({
-      point: m,
+  const e = a.matrixWorld, i = a.geometry, s = i.attributes.instanceStart, r = i.attributes.instanceEnd, o = Math.min(i.instanceCount, s.count);
+  for (let n = 0, l = o; n < l; n++) {
+    M.start.fromBufferAttribute(s, n), M.end.fromBufferAttribute(r, n), M.applyMatrix4(e);
+    const c = new _(), p = new _();
+    T.distanceSqToSegment(M.start, M.end, p, c), p.distanceTo(c) < L * 0.5 && t.push({
+      point: p,
       pointOnLine: c,
-      distance: W.origin.distanceTo(m),
+      distance: T.origin.distanceTo(p),
       object: a,
       face: null,
-      faceIndex: r,
+      faceIndex: n,
       uv: null,
       uv1: null
     });
   }
 }
 function Gt(a, t, e) {
-  const i = t.projectionMatrix, n = a.material.resolution, o = a.matrixWorld, r = a.geometry, l = r.attributes.instanceStart, c = r.attributes.instanceEnd, m = Math.min(r.instanceCount, l.count), u = -t.near;
-  W.at(1, I), I.w = 1, I.applyMatrix4(t.matrixWorldInverse), I.applyMatrix4(i), I.multiplyScalar(1 / I.w), I.x *= n.x / 2, I.y *= n.y / 2, I.z = 0, q.copy(I), N.multiplyMatrices(t.matrixWorldInverse, o);
-  for (let v = 0, f = m; v < f; v++) {
+  const i = t.projectionMatrix, r = a.material.resolution, o = a.matrixWorld, n = a.geometry, l = n.attributes.instanceStart, c = n.attributes.instanceEnd, p = Math.min(n.instanceCount, l.count), u = -t.near;
+  T.at(1, B), B.w = 1, B.applyMatrix4(t.matrixWorldInverse), B.applyMatrix4(i), B.multiplyScalar(1 / B.w), B.x *= r.x / 2, B.y *= r.y / 2, B.z = 0, q.copy(B), N.multiplyMatrices(t.matrixWorldInverse, o);
+  for (let v = 0, f = p; v < f; v++) {
     if (y.fromBufferAttribute(l, v), x.fromBufferAttribute(c, v), y.w = 1, x.w = 1, y.applyMatrix4(N), x.applyMatrix4(N), y.z > u && x.z > u)
       continue;
     if (y.z > u) {
@@ -362,17 +367,17 @@ function Gt(a, t, e) {
       const D = x.z - y.z, A = (x.z - u) / D;
       x.lerp(y, A);
     }
-    y.applyMatrix4(i), x.applyMatrix4(i), y.multiplyScalar(1 / y.w), x.multiplyScalar(1 / x.w), y.x *= n.x / 2, y.y *= n.y / 2, x.x *= n.x / 2, x.y *= n.y / 2, M.start.copy(y), M.start.z = 0, M.end.copy(x), M.end.z = 0;
-    const d = M.closestPointToPointParameter(q, !0);
-    M.at(d, at);
-    const b = At.lerp(y.z, x.z, d), P = b >= -1 && b <= 1, z = q.distanceTo(at) < L * 0.5;
+    y.applyMatrix4(i), x.applyMatrix4(i), y.multiplyScalar(1 / y.w), x.multiplyScalar(1 / x.w), y.x *= r.x / 2, y.y *= r.y / 2, x.x *= r.x / 2, x.y *= r.y / 2, M.start.copy(y), M.start.z = 0, M.end.copy(x), M.end.z = 0;
+    const m = M.closestPointToPointParameter(q, !0);
+    M.at(m, at);
+    const b = At.lerp(y.z, x.z, m), P = b >= -1 && b <= 1, z = q.distanceTo(at) < L * 0.5;
     if (P && z) {
       M.start.fromBufferAttribute(l, v), M.end.fromBufferAttribute(c, v), M.start.applyMatrix4(o), M.end.applyMatrix4(o);
-      const D = new B(), A = new B();
-      W.distanceSqToSegment(M.start, M.end, A, D), e.push({
+      const D = new _(), A = new _();
+      T.distanceSqToSegment(M.start, M.end, A, D), e.push({
         point: A,
         pointOnLine: D,
-        distance: W.origin.distanceTo(A),
+        distance: T.origin.distanceTo(A),
         object: a,
         face: null,
         faceIndex: v,
@@ -383,25 +388,25 @@ function Gt(a, t, e) {
   }
 }
 class de extends wt {
-  constructor(t = new Wt(), e) {
+  constructor(t = new Tt(), e) {
     super(t, e), this.isLineSegments2 = !0, this.type = "LineSegments2";
   }
   // for backwards-compatibility, but could be a method of LineSegmentsGeometry...
   computeLineDistances() {
     const t = this.geometry, e = t.attributes.instanceStart, i = t.attributes.instanceEnd, s = new Float32Array(2 * e.count);
-    for (let o = 0, r = 0, l = e.count; o < l; o++, r += 2)
-      rt.fromBufferAttribute(e, o), nt.fromBufferAttribute(i, o), s[r] = r === 0 ? 0 : s[r - 1], s[r + 1] = s[r] + rt.distanceTo(nt);
-    const n = new Pt(
+    for (let o = 0, n = 0, l = e.count; o < l; o++, n += 2)
+      nt.fromBufferAttribute(e, o), rt.fromBufferAttribute(i, o), s[n] = n === 0 ? 0 : s[n - 1], s[n + 1] = s[n] + nt.distanceTo(rt);
+    const r = new Pt(
       s,
       2,
       1
     );
     return t.setAttribute(
       "instanceDistanceStart",
-      new tt(n, 1, 0)
+      new tt(r, 1, 0)
     ), t.setAttribute(
       "instanceDistanceEnd",
-      new tt(n, 1, 1)
+      new tt(r, 1, 1)
     ), this;
   }
   raycast(t, e) {
@@ -409,17 +414,17 @@ class de extends wt {
     s === null && !i && console.error(
       'LineSegments2: "Raycaster.camera" needs to be set in order to raycast against LineSegments2 while worldUnits is set to false.'
     );
-    const n = t.params.Line2 !== void 0 && t.params.Line2.threshold || 0;
-    W = t.ray;
-    const o = this.matrixWorld, r = this.geometry, l = this.material;
-    L = l.linewidth + n, r.boundingSphere === null && r.computeBoundingSphere(), U.copy(r.boundingSphere).applyMatrix4(o);
+    const r = t.params.Line2 !== void 0 && t.params.Line2.threshold || 0;
+    T = t.ray;
+    const o = this.matrixWorld, n = this.geometry, l = this.material;
+    L = l.linewidth + r, n.boundingSphere === null && n.computeBoundingSphere(), U.copy(n.boundingSphere).applyMatrix4(o);
     let c;
     if (i)
       c = L * 0.5;
     else {
       const u = Math.max(
         s.near,
-        U.distanceToPoint(W.origin)
+        U.distanceToPoint(T.origin)
       );
       c = ot(
         s,
@@ -427,24 +432,24 @@ class de extends wt {
         l.resolution
       );
     }
-    if (U.radius += c, W.intersectsSphere(U) === !1)
+    if (U.radius += c, T.intersectsSphere(U) === !1)
       return;
-    r.boundingBox === null && r.computeBoundingBox(), R.copy(r.boundingBox).applyMatrix4(o);
-    let m;
+    n.boundingBox === null && n.computeBoundingBox(), R.copy(n.boundingBox).applyMatrix4(o);
+    let p;
     if (i)
-      m = L * 0.5;
+      p = L * 0.5;
     else {
       const u = Math.max(
         s.near,
-        R.distanceToPoint(W.origin)
+        R.distanceToPoint(T.origin)
       );
-      m = ot(
+      p = ot(
         s,
         u,
         l.resolution
       );
     }
-    R.expandByScalar(m), W.intersectsBox(R) !== !1 && (i ? Ut(this, e) : Gt(this, s, e));
+    R.expandByScalar(p), T.intersectsBox(R) !== !1 && (i ? Ut(this, e) : Gt(this, s, e));
   }
   onBeforeRender(t) {
     const e = this.material.uniforms;
@@ -863,28 +868,28 @@ function $t(a, t) {
   return a.map((e) => {
     const i = [];
     let s;
-    return e.forEach((n) => {
+    return e.forEach((r) => {
       if (s) {
-        const o = Dt(n, s) * 180 / Math.PI;
+        const o = Dt(r, s) * 180 / Math.PI;
         if (o > t) {
-          const r = It(s, n), l = 1 / Math.ceil(o / t);
+          const n = Bt(s, r), l = 1 / Math.ceil(o / t);
           let c = l;
           for (; c < 1; )
-            i.push(r(c)), c += l;
+            i.push(n(c)), c += l;
         }
       }
-      i.push(s = n);
+      i.push(s = r);
     }), i;
   });
 }
 function qt(a, { minLng: t, maxLng: e, minLat: i, maxLat: s } = {}) {
-  const n = Math.round(H(360 / a, 2) / Math.PI), o = (1 + Math.sqrt(5)) / 2, r = (f) => f / o * 360 % 360 - 180, l = (f) => Math.acos(2 * f / n - 1) / Math.PI * 180 - 90, c = (f) => n * (Math.cos((f + 90) * Math.PI / 180) + 1) / 2, m = [
+  const r = Math.round(H(360 / a, 2) / Math.PI), o = (1 + Math.sqrt(5)) / 2, n = (f) => f / o * 360 % 360 - 180, l = (f) => Math.acos(2 * f / r - 1) / Math.PI * 180 - 90, c = (f) => r * (Math.cos((f + 90) * Math.PI / 180) + 1) / 2, p = [
     s !== void 0 ? Math.ceil(c(s)) : 0,
-    i !== void 0 ? Math.floor(c(i)) : n - 1
+    i !== void 0 ? Math.floor(c(i)) : r - 1
   ], u = t === void 0 && e === void 0 ? () => !0 : t === void 0 ? (f) => f <= e : e === void 0 ? (f) => f >= t : e >= t ? (f) => f >= t && f <= e : (f) => f >= t || f <= e, v = [];
-  for (let f = m[0]; f <= m[1]; f++) {
-    const p = r(f);
-    u(p) && v.push([p, l(f)]);
+  for (let f = p[0]; f <= p[1]; f++) {
+    const d = n(f);
+    u(d) && v.push([d, l(f)]);
   }
   return v;
 }
@@ -892,35 +897,35 @@ function Q(a, t, e = !1) {
   return e ? zt(t, a) : Vt(a, t);
 }
 function Nt(a, t) {
-  const e = { type: "Polygon", coordinates: a }, [[i, s], [n, o]] = ht(e);
-  if (Math.min(Math.abs(n - i), Math.abs(o - s)) < t)
+  const e = { type: "Polygon", coordinates: a }, [[i, s], [r, o]] = ht(e);
+  if (Math.min(Math.abs(r - i), Math.abs(o - s)) < t)
     return [];
-  const r = i > n || o >= 89 || s <= -89;
+  const n = i > r || o >= 89 || s <= -89;
   return qt(t, {
     minLng: i,
-    maxLng: n,
+    maxLng: r,
     minLat: s,
     maxLat: o
   }).filter(
-    (l) => Q(l, e, r)
+    (l) => Q(l, e, n)
   );
 }
 function Qt(a, { resolution: t = 1 / 0, bbox: e, projection: i } = {}) {
-  const s = $t(a, t), n = K(s), o = Nt(a, t), r = [...n, ...o], l = { type: "Polygon", coordinates: a }, [[c, m], [u, v]] = ht(l), f = c > u || // crosses antimeridian
+  const s = $t(a, t), r = K(s), o = Nt(a, t), n = [...r, ...o], l = { type: "Polygon", coordinates: a }, [[c, p], [u, v]] = ht(l), f = c > u || // crosses antimeridian
   v >= 89 || // crosses north pole
-  m <= -89;
-  let p = [];
+  p <= -89;
+  let d = [];
   if (f) {
-    const g = kt(r).triangles(), w = new Map(
-      r.map(([j, S], _) => [`${j}-${S}`, _])
+    const g = kt(n).triangles(), w = new Map(
+      n.map(([j, S], W) => [`${j}-${S}`, W])
     );
     g.features.forEach((j) => {
-      const S = j.geometry.coordinates[0].slice(0, 3).reverse(), _ = [];
+      const S = j.geometry.coordinates[0].slice(0, 3).reverse(), W = [];
       if (S.forEach(([C, F]) => {
         const E = `${C}-${F}`;
-        w.has(E) && _.push(w.get(E));
-      }), _.length === 3) {
-        if (_.some((C) => C < n.length)) {
+        w.has(E) && W.push(w.get(E));
+      }), W.length === 3) {
+        if (W.some((C) => C < r.length)) {
           const C = j.properties.circumcenter;
           if (!Q(
             C,
@@ -929,16 +934,16 @@ function Qt(a, { resolution: t = 1 / 0, bbox: e, projection: i } = {}) {
           ))
             return;
         }
-        p.push(..._);
+        d.push(...W);
       }
     });
   } else if (o.length) {
-    const g = Ot.from(r);
+    const g = Ot.from(n);
     for (let w = 0, j = g.triangles.length; w < j; w += 3) {
-      const S = [2, 1, 0].map((C) => g.triangles[w + C]), _ = S.map((C) => r[C]);
-      if (S.some((C) => C < n.length)) {
+      const S = [2, 1, 0].map((C) => g.triangles[w + C]), W = S.map((C) => n[C]);
+      if (S.some((C) => C < r.length)) {
         const C = [0, 1].map(
-          (F) => _t(_, (E) => E[F])
+          (F) => Wt(W, (E) => E[F])
         );
         if (!Q(
           C,
@@ -947,76 +952,76 @@ function Qt(a, { resolution: t = 1 / 0, bbox: e, projection: i } = {}) {
         ))
           continue;
       }
-      p.push(...S);
+      d.push(...S);
     }
   } else {
     const { vertices: g, holes: w = [] } = ft(s);
-    p = Bt(g, w, 2);
+    d = _t(g, w, 2);
   }
-  let d = e ? [e[0], e[2]] : it(r, (g) => g[0]), b = e ? [e[1], e[3]] : it(r, (g) => g[1]);
+  let m = e ? [e[0], e[2]] : it(n, (g) => g[0]), b = e ? [e[1], e[3]] : it(n, (g) => g[1]);
   if (i) {
-    const [g, w] = i([d[0], b[0]]), [j, S] = i([d[1], b[1]]);
-    d = [g, j], b = [-w, -S];
+    const [g, w] = i([m[0], b[0]]), [j, S] = i([m[1], b[1]]);
+    m = [g, j], b = [-w, -S];
   }
-  const P = st(d, [0, 1]), z = st(b, [0, 1]), D = r.map(([g, w]) => {
+  const P = st(m, [0, 1]), z = st(b, [0, 1]), D = n.map(([g, w]) => {
     if (i) {
       const [j, S] = i([g, w]);
       return [P(j), z(-S)];
     } else
       return [P(g), z(w)];
   });
-  return { contour: s, triangles: { points: r, indices: p, uvs: D } };
+  return { contour: s, triangles: { points: n, indices: d, uvs: D } };
 }
 const ct = new h.BufferGeometry().setAttribute ? "setAttribute" : "addAttribute";
 function G(a, t, e, i) {
   const s = a.map(
-    (n) => n.map(([o, r]) => {
+    (r) => r.map(([o, n]) => {
       if (i) {
-        const [l, c] = i([o, r]);
+        const [l, c] = i([o, n]);
         return [l, -c, t];
       }
-      return e ? Tt(o, r, t) : [o, r, t];
+      return e ? It(o, n, t) : [o, n, t];
     })
   );
   return ft(s);
 }
 function Kt(a, t, e, i, s) {
-  const { vertices: n, holes: o } = G(
+  const { vertices: r, holes: o } = G(
     a,
     t,
     i,
     s
-  ), { vertices: r } = G(
+  ), { vertices: n } = G(
     a,
     e,
     i,
     s
-  ), l = K([r, n]), c = Math.round(r.length / 3), m = new Set(o);
+  ), l = K([n, r]), c = Math.round(n.length / 3), p = new Set(o);
   let u = 0;
   const v = [];
-  for (let p = 0; p < c; p++) {
-    let d = p + 1;
-    if (d === c)
-      d = u;
-    else if (m.has(d)) {
-      const b = d;
-      d = u, u = b;
+  for (let d = 0; d < c; d++) {
+    let m = d + 1;
+    if (m === c)
+      m = u;
+    else if (p.has(m)) {
+      const b = m;
+      m = u, u = b;
     }
-    v.push(p, p + c, d + c), v.push(d + c, d, p);
+    v.push(d, d + c, m + c), v.push(m + c, m, d);
   }
   const f = [];
-  for (let p = 1; p >= 0; p--)
-    for (let d = 0; d < c; d += 1) f.push(d / (c - 1), p);
-  return { indices: v, vertices: l, uvs: f, topVerts: r };
+  for (let d = 1; d >= 0; d--)
+    for (let m = 0; m < c; m += 1) f.push(m / (c - 1), d);
+  return { indices: v, vertices: l, uvs: f, topVerts: n };
 }
-function ut(a, t, e, i, s, n) {
+function ut(a, t, e, i, s, r) {
   return {
     indices: i ? a.indices : a.indices.slice().reverse(),
     vertices: G(
       [a.points],
       t,
       s,
-      n
+      r
     ).vertices,
     uvs: e
   };
@@ -1027,48 +1032,48 @@ const Xt = ({
   endHeight: e,
   curvatureResolution: i = 1,
   cartesian: s = !0,
-  hasSide: n = !0,
+  hasSide: r = !0,
   hasBottom: o = !1,
-  hasTop: r = !1,
+  hasTop: n = !1,
   projection: l,
   bbox: c
 }) => {
   a.forEach((P) => {
     Lt(P) || P.reverse();
   });
-  const { contour: m, triangles: u } = Qt(a, {
+  const { contour: p, triangles: u } = Qt(a, {
     resolution: i,
     bbox: c,
     projection: l
   });
   let v = {}, f;
-  n && (v = Kt(
-    m,
+  r && (v = Kt(
+    p,
     t != null ? t : e,
     e != null ? e : t,
     s,
     l
   ), f = v.topVerts);
-  let p = [];
-  (o || r) && (p = K(u.uvs));
-  let d = {};
-  o && (d = ut(
+  let d = [];
+  (o || n) && (d = K(u.uvs));
+  let m = {};
+  o && (m = ut(
     u,
     t,
-    p,
+    d,
     !1,
     s,
     l
   ));
   let b = {};
-  return r && (b = ut(
+  return n && (b = ut(
     u,
     e,
-    p,
+    d,
     !0,
     s,
     l
-  )), { contour: m, triangles: u, sideTorso: v, bottomCap: d, topCap: b, topVerts: f };
+  )), { contour: p, triangles: u, sideTorso: v, bottomCap: m, topCap: b, topVerts: f };
 };
 class me extends h.BufferGeometry {
   constructor(t, e = {}) {
@@ -1087,13 +1092,13 @@ class me extends h.BufferGeometry {
     const {
       endHeight: i,
       hasTop: s,
-      topFirst: n,
+      topFirst: r,
       hasBottom: o,
-      hasSide: r,
+      hasSide: n,
       cartesian: l,
       userDataRsoOffset: c,
-      projection: m
-    } = this.parameters, { contour: u, sideTorso: v, topVerts: f, bottomCap: p, topCap: d } = Xt(O({}, this.parameters));
+      projection: p
+    } = this.parameters, { contour: u, sideTorso: v, topVerts: f, bottomCap: d, topCap: m } = Xt(O({}, this.parameters));
     let b = [], P = [], z = [], D = 0;
     const A = (g) => {
       const w = Math.round(b.length / 3), j = z.length;
@@ -1101,12 +1106,12 @@ class me extends h.BufferGeometry {
         w ? g.indices.map((S) => S + w) : g.indices
       ), this.addGroup(j, z.length - j, D++);
     };
-    s && n && A(d), r && (A(v), this.userData.topVerts = c ? G(
+    s && r && A(m), n && (A(v), this.userData.topVerts = c ? G(
       u,
       i + c,
       l,
-      m
-    ).vertices : f), o && A(p), s && !n && A(d), this.setIndex(z), this[ct](
+      p
+    ).vertices : f), o && A(d), s && !r && A(m), this.setIndex(z), this[ct](
       "position",
       new h.Float32BufferAttribute(b, 3)
     ), this[ct]("uv", new h.Float32BufferAttribute(P, 2)), this.computeVertexNormals();