gl-draw 0.11.21 → 0.11.23

package/dist/objects/index.module.js

@@ -1,25 +1,25 @@
 var xe = Object.defineProperty, we = Object.defineProperties;
 var Ae = Object.getOwnPropertyDescriptors;
-var vt = Object.getOwnPropertySymbols;
+var bt = Object.getOwnPropertySymbols;
 var $t = Object.prototype.hasOwnProperty, qt = Object.prototype.propertyIsEnumerable;
-var Zt = Math.pow, Ht = (o, t, e) => t in o ? xe(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e, R = (o, t) => {
+var Zt = Math.pow, Ht = (o, t, e) => t in o ? xe(o, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[t] = e, U = (o, t) => {
   for (var e in t || (t = {}))
     $t.call(t, e) && Ht(o, e, t[e]);
-  if (vt)
-    for (var e of vt(t))
+  if (bt)
+    for (var e of bt(t))
       qt.call(t, e) && Ht(o, e, t[e]);
   return o;
-}, bt = (o, t) => we(o, Ae(t));
+}, ft = (o, t) => we(o, Ae(t));
 var _t = (o, t) => {
   var e = {};
   for (var i in o)
     $t.call(o, i) && t.indexOf(i) < 0 && (e[i] = o[i]);
-  if (o != null && vt)
-    for (var i of vt(o))
+  if (o != null && bt)
+    for (var i of bt(o))
       t.indexOf(i) < 0 && qt.call(o, i) && (e[i] = o[i]);
   return e;
 };
-var ht = (o, t, e) => new Promise((i, s) => {
+var pt = (o, t, e) => new Promise((i, s) => {
   var n = (u) => {
     try {
       r(e.next(u));
@@ -38,7 +38,7 @@ var ht = (o, t, e) => new Promise((i, s) => {
 import { B as ot } from "../BaseObject.module.js";
 import { G as ki } from "../index.module2.js";
 import * as b from "three";
-import { BufferGeometry as he, BufferAttribute as Me, Vector4 as pt, Vector3 as $, Matrix4 as Se, Line3 as _e, Box3 as Pe, Sphere as Te, Mesh as Le, InstancedInterleavedBuffer as Ie, InterleavedBufferAttribute as Jt, MathUtils as Ce, Float32BufferAttribute as Xt, ShapeUtils as Pt, Shape as Be, Vector2 as D } from "three";
+import { BufferGeometry as he, BufferAttribute as Me, Vector4 as dt, Vector3 as $, Matrix4 as Se, Line3 as _e, Box3 as Pe, Sphere as Te, Mesh as Le, InstancedInterleavedBuffer as Ie, InterleavedBufferAttribute as Jt, MathUtils as Be, Float32BufferAttribute as Xt, ShapeUtils as Pt, Shape as Ce, Vector2 as R } from "three";
 import * as lt from "@tweenjs/tween.js";
 import { RectAreaLightUniformsLib as Ee } from "three/examples/jsm/lights/RectAreaLightUniformsLib";
 import { LineSegments2 as ze } from "three/examples/jsm/lines/LineSegments2";
@@ -58,7 +58,7 @@ import { scaleLinear as Kt } from "d3-scale";
 import { Brush as Qt, Evaluator as qe, INTERSECTION as Ze } from "three-bvh-csg";
 class Ei extends ot {
   constructor(t) {
-    super(), this.objectType = "BaseObject#Node", this.onNodePointerIndex = [], this.options = R({
+    super(), this.objectType = "BaseObject#Node", this.onNodePointerIndex = [], this.options = U({
       type: "2d"
     }, t);
   }
@@ -105,7 +105,7 @@ class Ei extends ot {
 }
 class zi extends ot {
   constructor(t) {
-    super(), this.options = R({
+    super(), this.options = U({
       maxDepth: 10,
       percentDepth: !1,
       innerRadius: 25,
@@ -114,17 +114,17 @@ class zi extends ot {
     }, t);
   }
   create() {
-    return ht(this, null, function* () {
+    return pt(this, null, function* () {
       this.createGroup();
       const { data: t, maxDepth: e, colors: i, material: s, percentDepth: n, activeIndex: a } = this.options, r = Math.max(...t), u = t.reduce((l, c) => l + c, 0);
       let h = Math.PI / 2;
       t.forEach((l, c) => {
         if (l === 0) return;
-        const p = Math.PI * 2 * (l / u), f = i[c], d = n ? e * (l / r) : e, g = this.createGeometry(d, p), w = s ? s.clone() : new b.MeshBasicMaterial({
+        const p = Math.PI * 2 * (l / u), f = i[c], d = n ? e * (l / r) : e, x = this.createGeometry(d, p), g = s ? s.clone() : new b.MeshBasicMaterial({
           color: f
         });
-        s && w.color.set(f);
-        const S = new b.Mesh(g, w);
+        s && g.color.set(f);
+        const S = new b.Mesh(x, g);
         S.userData.depth = d, S.userData.index = c, S.rotateZ(h), h += p, this.add(S);
       }), a !== -1 && this.setActive(a);
     });
@@ -168,7 +168,7 @@ class Vi extends ot {
     super(), this.rectAreaLightUniformsLibInit = !1, this.options = t;
   }
   create() {
-    var e, i, s, n, a, r, u, h, l, c, p, f, d, g, w, S, B;
+    var e, i, s, n, a, r, u, h, l, c, p, f, d, x, g, S, I;
     const t = this.options;
     if (t.type === "AmbientLight") {
       const A = new b.AmbientLight(t.color);
@@ -204,10 +204,10 @@ class Vi extends ot {
     } else if (t.type === "RectAreaLight") {
       this.rectAreaLightUniformsLibInit || (Ee.init(), this.rectAreaLightUniformsLibInit = !0);
       const A = new b.RectAreaLight(
-        (g = t.color) != null ? g : 16777215,
-        (w = t.intensity) != null ? w : 1,
+        (x = t.color) != null ? x : 16777215,
+        (g = t.intensity) != null ? g : 1,
         (S = t.width) != null ? S : 10,
-        (B = t.height) != null ? B : 10
+        (I = t.height) != null ? I : 10
       );
       A.name = "矩形区域光", this.object3d = A, this.rectAreaLight = A;
     }
@@ -274,11 +274,11 @@ function Y(o, t = 0) {
         u.addGroup(h, f, l);
       else if (t === 2 && c.groups.length > 0)
         for (let d of c.groups) {
-          let g = d.materialIndex;
+          let x = d.materialIndex;
           u.addGroup(
             h + d.start,
             Math.min(d.count, f),
-            g
+            x
           );
         }
       h += f;
@@ -309,8 +309,8 @@ function Y(o, t = 0) {
     u.morphAttributes = u.morphAttributes || {}, u.morphAttributes[l] = [];
     for (let p = 0; p < c; ++p) {
       const f = [];
-      for (let g = 0; g < a[l].length; ++g)
-        f.push(a[l][g][p]);
+      for (let x = 0; x < a[l].length; ++x)
+        f.push(a[l][x][p]);
       const d = te(f);
       if (!d)
         return console.error(
@@ -351,8 +351,8 @@ function te(o) {
       const c = u / e;
       for (let p = 0, f = l.count; p < f; p++)
         for (let d = 0; d < e; d++) {
-          const g = l.getComponent(p, d);
-          r.setComponent(p + c, d, g);
+          const x = l.getComponent(p, d);
+          r.setComponent(p + c, d, x);
         }
     } else
       a.set(l.array, u);
@@ -392,7 +392,7 @@ function Je(o) {
   }
   return o;
 }
-const Tt = new pt(), ee = new $(), ie = new $(), U = new pt(), W = new pt(), Z = new pt(), Lt = new $(), It = new Se(), j = new _e(), se = new $(), xt = new Pe(), wt = new Te(), J = new pt();
+const Tt = new dt(), ee = new $(), ie = new $(), W = new dt(), j = new dt(), Z = new dt(), Lt = new $(), It = new Se(), D = new _e(), se = new $(), xt = new Pe(), wt = new Te(), J = new dt();
 let X, rt;
 function ne(o, t, e) {
   return J.set(0, 0, -t, 1).applyMatrix4(o.projectionMatrix), J.multiplyScalar(1 / J.w), J.x = rt / e.width, J.y = rt / e.height, J.applyMatrix4(o.projectionMatrixInverse), J.multiplyScalar(1 / J.w), Math.abs(Math.max(J.x, J.y));
@@ -400,9 +400,9 @@ function ne(o, t, e) {
 function Xe(o, t) {
   const e = o.matrixWorld, i = o.geometry, s = i.attributes.instanceStart, n = i.attributes.instanceEnd, a = Math.min(i.instanceCount, s.count);
   for (let r = 0, u = a; r < u; r++) {
-    j.start.fromBufferAttribute(s, r), j.end.fromBufferAttribute(n, r), j.applyMatrix4(e);
+    D.start.fromBufferAttribute(s, r), D.end.fromBufferAttribute(n, r), D.applyMatrix4(e);
     const h = new $(), l = new $();
-    X.distanceSqToSegment(j.start, j.end, l, h), l.distanceTo(h) < rt * 0.5 && t.push({
+    X.distanceSqToSegment(D.start, D.end, l, h), l.distanceTo(h) < rt * 0.5 && t.push({
       point: l,
       pointOnLine: h,
       distance: X.origin.distanceTo(l),
@@ -418,26 +418,26 @@ function Ye(o, t, e) {
   const i = t.projectionMatrix, n = o.material.resolution, a = o.matrixWorld, r = o.geometry, u = r.attributes.instanceStart, h = r.attributes.instanceEnd, l = Math.min(r.instanceCount, u.count), c = -t.near;
   X.at(1, Z), Z.w = 1, Z.applyMatrix4(t.matrixWorldInverse), Z.applyMatrix4(i), Z.multiplyScalar(1 / Z.w), Z.x *= n.x / 2, Z.y *= n.y / 2, Z.z = 0, Lt.copy(Z), It.multiplyMatrices(t.matrixWorldInverse, a);
   for (let p = 0, f = l; p < f; p++) {
-    if (U.fromBufferAttribute(u, p), W.fromBufferAttribute(h, p), U.w = 1, W.w = 1, U.applyMatrix4(It), W.applyMatrix4(It), U.z > c && W.z > c)
+    if (W.fromBufferAttribute(u, p), j.fromBufferAttribute(h, p), W.w = 1, j.w = 1, W.applyMatrix4(It), j.applyMatrix4(It), W.z > c && j.z > c)
       continue;
-    if (U.z > c) {
-      const A = U.z - W.z, E = (U.z - c) / A;
-      U.lerp(W, E);
-    } else if (W.z > c) {
-      const A = W.z - U.z, E = (W.z - c) / A;
-      W.lerp(U, E);
+    if (W.z > c) {
+      const A = W.z - j.z, B = (W.z - c) / A;
+      W.lerp(j, B);
+    } else if (j.z > c) {
+      const A = j.z - W.z, B = (j.z - c) / A;
+      j.lerp(W, B);
     }
-    U.applyMatrix4(i), W.applyMatrix4(i), U.multiplyScalar(1 / U.w), W.multiplyScalar(1 / W.w), U.x *= n.x / 2, U.y *= n.y / 2, W.x *= n.x / 2, W.y *= n.y / 2, j.start.copy(U), j.start.z = 0, j.end.copy(W), j.end.z = 0;
-    const g = j.closestPointToPointParameter(Lt, !0);
-    j.at(g, se);
-    const w = Ce.lerp(U.z, W.z, g), S = w >= -1 && w <= 1, B = Lt.distanceTo(se) < rt * 0.5;
-    if (S && B) {
-      j.start.fromBufferAttribute(u, p), j.end.fromBufferAttribute(h, p), j.start.applyMatrix4(a), j.end.applyMatrix4(a);
-      const A = new $(), E = new $();
-      X.distanceSqToSegment(j.start, j.end, E, A), e.push({
-        point: E,
+    W.applyMatrix4(i), j.applyMatrix4(i), W.multiplyScalar(1 / W.w), j.multiplyScalar(1 / j.w), W.x *= n.x / 2, W.y *= n.y / 2, j.x *= n.x / 2, j.y *= n.y / 2, D.start.copy(W), D.start.z = 0, D.end.copy(j), D.end.z = 0;
+    const x = D.closestPointToPointParameter(Lt, !0);
+    D.at(x, se);
+    const g = Be.lerp(W.z, j.z, x), S = g >= -1 && g <= 1, I = Lt.distanceTo(se) < rt * 0.5;
+    if (S && I) {
+      D.start.fromBufferAttribute(u, p), D.end.fromBufferAttribute(h, p), D.start.applyMatrix4(a), D.end.applyMatrix4(a);
+      const A = new $(), B = new $();
+      X.distanceSqToSegment(D.start, D.end, B, A), e.push({
+        point: B,
         pointOnLine: A,
-        distance: X.origin.distanceTo(E),
+        distance: X.origin.distanceTo(B),
         object: o,
         face: null,
         faceIndex: p,
@@ -522,14 +522,14 @@ const re = (o) => {
 };
 let Gi = class extends ot {
   constructor(t = {}) {
-    super(), this.options = R({}, t);
+    super(), this.options = U({}, t);
   }
   get material() {
     var t;
     return (t = this.object3d) == null ? void 0 : t.material;
   }
   create() {
-    return ht(this, null, function* () {
+    return pt(this, null, function* () {
       const {
         points: t,
         pointsArr: e,
@@ -568,12 +568,12 @@ let Gi = class extends ot {
     });
   }
   getMaterial(t) {
-    return new Ve(R({
+    return new Ve(U({
       color: new b.Color("#ffffff")
     }, t));
   }
 };
-function Ct(o, t, e, i, s) {
+function Bt(o, t, e, i, s) {
   let n;
   if (o = o.subarray || o.slice ? o : o.buffer, e = e.subarray || e.slice ? e : e.buffer, o = t ? (
     // @ts-ignore
@@ -670,7 +670,7 @@ class ti extends b.BufferGeometry {
    */
   advance({ x: t, y: e, z: i }) {
     const s = this._attributes.position.array, n = this._attributes.previous.array, a = this._attributes.next.array, r = s.length;
-    Ct(s, 0, n, 0, r), Ct(s, 6, s, 0, r - 6), s[r - 6] = t, s[r - 5] = e, s[r - 4] = i, s[r - 3] = t, s[r - 2] = e, s[r - 1] = i, Ct(s, 6, a, 0, r - 6), a[r - 6] = t, a[r - 5] = e, a[r - 4] = i, a[r - 3] = t, a[r - 2] = e, a[r - 1] = i, this._attributes.position.needsUpdate = !0, this._attributes.previous.needsUpdate = !0, this._attributes.next.needsUpdate = !0;
+    Bt(s, 0, n, 0, r), Bt(s, 6, s, 0, r - 6), s[r - 6] = t, s[r - 5] = e, s[r - 4] = i, s[r - 3] = t, s[r - 2] = e, s[r - 1] = i, Bt(s, 6, a, 0, r - 6), a[r - 6] = t, a[r - 5] = e, a[r - 4] = i, a[r - 3] = t, a[r - 2] = e, a[r - 1] = i, this._attributes.position.needsUpdate = !0, this._attributes.previous.needsUpdate = !0, this._attributes.next.needsUpdate = !0;
   }
 }
 const oe = ["encodings_fragment", "colorspace_fragment"], ei = (
@@ -828,7 +828,7 @@ const oe = ["encodings_fragment", "colorspace_fragment"], ei = (
 class si extends b.ShaderMaterial {
   constructor(t) {
     super({
-      uniforms: bt(R({}, b.UniformsLib.fog), {
+      uniforms: ft(U({}, b.UniformsLib.fog), {
         lineWidth: { value: 1 },
         map: { value: null },
         useMap: { value: 0 },
@@ -1087,11 +1087,11 @@ function Wi(o, t) {
   e.copy(this.matrixWorld).invert(), i.copy(o.ray).applyMatrix4(e);
   const r = new b.Vector3(), u = new b.Vector3(), h = new b.Vector3(), l = this instanceof b.LineSegments ? 2 : 1, c = a.index, p = a.attributes;
   if (c !== null) {
-    const f = c.array, d = p.position.array, g = p.width.array;
-    for (let w = 0, S = f.length - 1; w < S; w += l) {
-      const B = f[w], A = f[w + 1];
-      r.fromArray(d, B * 3), u.fromArray(d, A * 3);
-      const E = g[Math.floor(w / 3)] != null ? g[Math.floor(w / 3)] : 1, T = o.params.Line.threshold + this.material.lineWidth * E / 2, L = T * T;
+    const f = c.array, d = p.position.array, x = p.width.array;
+    for (let g = 0, S = f.length - 1; g < S; g += l) {
+      const I = f[g], A = f[g + 1];
+      r.fromArray(d, I * 3), u.fromArray(d, A * 3);
+      const B = x[Math.floor(g / 3)] != null ? x[Math.floor(g / 3)] : 1, T = o.params.Line.threshold + this.material.lineWidth * B / 2, L = T * T;
       if (i.distanceSqToSegment(
         r,
         u,
@@ -1099,34 +1099,34 @@ function Wi(o, t) {
         h
       ) > L) continue;
       n.applyMatrix4(this.matrixWorld);
-      const I = o.ray.origin.distanceTo(n);
-      I < o.near || I > o.far || (t.push({
-        distance: I,
+      const C = o.ray.origin.distanceTo(n);
+      C < o.near || C > o.far || (t.push({
+        distance: C,
         // What do we want? intersection point on the ray or on the segment??
         // point: raycaster.ray.at( distance ),
         point: h.clone().applyMatrix4(this.matrixWorld),
-        index: w,
+        index: g,
         face: null,
         faceIndex: void 0,
         object: this
-      }), w = S);
+      }), g = S);
     }
   }
 }
-const Bt = (o) => {
+const Ct = (o) => {
   const { setPointWidth: t, nodes: e } = o, i = new ti();
   return i.setPoints(e, t), i;
 };
 class ji extends ot {
   constructor(t = {}) {
-    super(), this.options = R({}, t);
+    super(), this.options = U({}, t);
   }
   get material() {
     var t;
     return (t = this.object3d) == null ? void 0 : t.material;
   }
   create() {
-    return ht(this, null, function* () {
+    return pt(this, null, function* () {
       const {
         nodes: t,
         nodesArr: e,
@@ -1139,16 +1139,16 @@ class ji extends ot {
         materialParameters: h
       } = this.options;
       let l = n, c = i;
-      !l && h && (l = this.getMaterial(h)), !c && t ? c = Bt({
+      !l && h && (l = this.getMaterial(h)), !c && t ? c = Ct({
         nodes: t,
         setPointWidth: r
       }) : !c && e ? c = Y(
         e.map((p, f) => {
           let d = r;
           return !d && u && (d = () => {
-            var g;
-            return (g = u[f]) != null ? g : u[0];
-          }), Bt({
+            var x;
+            return (x = u[f]) != null ? x : u[0];
+          }), Ct({
             nodes: p,
             setPointWidth: d
           });
@@ -1161,7 +1161,7 @@ class ji extends ot {
     });
   }
   setGeometry(t, e) {
-    const i = Bt({
+    const i = Ct({
       nodes: t,
       setPointWidth: e
     }), s = this.object3d, n = s.geometry;
@@ -1169,7 +1169,7 @@ class ji extends ot {
   }
   getMaterial(t) {
     const { width: e, height: i } = this.pencil.getSize();
-    return new si(R({
+    return new si(U({
       color: new b.Color("#ffffff"),
       resolution: new b.Vector2(e, i)
     }, t));
@@ -1275,11 +1275,11 @@ function ai(o, { resolution: t = 1 / 0, bbox: e, projection: i } = {}) {
   let d = [];
   if (f) {
     const T = $e(r).triangles(), L = new Map(
-      r.map(([z, I], N) => [`${z}-${I}`, N])
+      r.map(([z, C], N) => [`${z}-${C}`, N])
     );
     T.features.forEach((z) => {
-      const I = z.geometry.coordinates[0].slice(0, 3).reverse(), N = [];
-      if (I.forEach(([V, k]) => {
+      const C = z.geometry.coordinates[0].slice(0, 3).reverse(), N = [];
+      if (C.forEach(([V, k]) => {
         const nt = `${V}-${k}`;
         L.has(nt) && N.push(L.get(nt));
       }), N.length === 3) {
@@ -1298,8 +1298,8 @@ function ai(o, { resolution: t = 1 / 0, bbox: e, projection: i } = {}) {
   } else if (a.length) {
     const T = Oe.from(r);
     for (let L = 0, z = T.triangles.length; L < z; L += 3) {
-      const I = [2, 1, 0].map((V) => T.triangles[L + V]), N = I.map((V) => r[V]);
-      if (I.some((V) => V < n.length)) {
+      const C = [2, 1, 0].map((V) => T.triangles[L + V]), N = C.map((V) => r[V]);
+      if (C.some((V) => V < n.length)) {
         const V = [0, 1].map(
           (k) => Ge(N, (nt) => nt[k])
         );
@@ -1310,23 +1310,23 @@ function ai(o, { resolution: t = 1 / 0, bbox: e, projection: i } = {}) {
         ))
           continue;
       }
-      d.push(...I);
+      d.push(...C);
     }
   } else {
     const { vertices: T, holes: L = [] } = pe(s);
     d = Ue(T, L, 2);
   }
-  let g = e ? [e[0], e[2]] : Yt(r, (T) => T[0]), w = e ? [e[1], e[3]] : Yt(r, (T) => T[1]);
+  let x = e ? [e[0], e[2]] : Yt(r, (T) => T[0]), g = e ? [e[1], e[3]] : Yt(r, (T) => T[1]);
   if (i) {
-    const [T, L] = i([g[0], w[0]]), [z, I] = i([g[1], w[1]]);
-    g = [T, z], w = [-L, -I];
+    const [T, L] = i([x[0], g[0]]), [z, C] = i([x[1], g[1]]);
+    x = [T, z], g = [-L, -C];
   }
-  const S = Kt(g, [0, 1]), B = Kt(w, [0, 1]), A = r.map(([T, L]) => {
+  const S = Kt(x, [0, 1]), I = Kt(g, [0, 1]), A = r.map(([T, L]) => {
     if (i) {
-      const [z, I] = i([T, L]);
-      return [S(z), B(-I)];
+      const [z, C] = i([T, L]);
+      return [S(z), I(-C)];
     } else
-      return [S(T), B(L)];
+      return [S(T), I(L)];
   });
   return { contour: s, triangles: { points: r, indices: d, uvs: A } };
 }
@@ -1358,18 +1358,18 @@ function li(o, t, e, i, s) {
   let c = 0;
   const p = [];
   for (let d = 0; d < h; d++) {
-    let g = d + 1;
-    if (g === h)
-      g = c;
-    else if (l.has(g)) {
-      const w = g;
-      g = c, c = w;
+    let x = d + 1;
+    if (x === h)
+      x = c;
+    else if (l.has(x)) {
+      const g = x;
+      x = c, c = g;
     }
-    p.push(d, d + h, g + h), p.push(g + h, g, d);
+    p.push(d, d + h, x + h), p.push(x + h, x, d);
   }
   const f = [];
   for (let d = 1; d >= 0; d--)
-    for (let g = 0; g < h; g += 1) f.push(g / (h - 1), d);
+    for (let x = 0; x < h; x += 1) f.push(x / (h - 1), d);
   return { indices: p, vertices: u, uvs: f, topVerts: r };
 }
 function le(o, t, e, i, s, n) {
@@ -1414,8 +1414,8 @@ const ui = ({
   ), f = p.topVerts);
   let d = [];
   (a || r) && (d = zt(c.uvs));
-  let g = {};
-  a && (g = le(
+  let x = {};
+  a && (x = le(
     c,
     t,
     d,
@@ -1423,19 +1423,19 @@ const ui = ({
     s,
     u
   ));
-  let w = {};
-  return r && (w = le(
+  let g = {};
+  return r && (g = le(
     c,
     e,
     d,
     !0,
     s,
     u
-  )), { contour: l, triangles: c, sideTorso: p, bottomCap: g, topCap: w, topVerts: f };
+  )), { contour: l, triangles: c, sideTorso: p, bottomCap: x, topCap: g, topVerts: f };
 };
 class ci extends b.BufferGeometry {
   constructor(t, e = {}) {
-    super(), this.type = "PolygonBufferGeometry", this.parameters = R({
+    super(), this.type = "PolygonBufferGeometry", this.parameters = U({
       polygonGeoJson: t,
       startHeight: 0,
       endHeight: 1,
@@ -1456,36 +1456,36 @@ class ci extends b.BufferGeometry {
       cartesian: u,
       userDataRsoOffset: h,
       projection: l
-    } = this.parameters, { contour: c, sideTorso: p, topVerts: f, bottomCap: d, topCap: g } = ui(R({}, this.parameters));
-    let w = [], S = [], B = [], A = 0;
-    const E = (T) => {
-      const L = Math.round(w.length / 3), z = B.length;
-      w = w.concat(T.vertices), S = S.concat(T.uvs), B = B.concat(
-        L ? T.indices.map((I) => I + L) : T.indices
-      ), this.addGroup(z, B.length - z, A++);
+    } = this.parameters, { contour: c, sideTorso: p, topVerts: f, bottomCap: d, topCap: x } = ui(U({}, this.parameters));
+    let g = [], S = [], I = [], A = 0;
+    const B = (T) => {
+      const L = Math.round(g.length / 3), z = I.length;
+      g = g.concat(T.vertices), S = S.concat(T.uvs), I = I.concat(
+        L ? T.indices.map((C) => C + L) : T.indices
+      ), this.addGroup(z, I.length - z, A++);
     };
-    s && n && E(g), r && (E(p), this.userData.topVerts = h ? At(
+    s && n && B(x), r && (B(p), this.userData.topVerts = h ? At(
       c,
       i + h,
       u,
       l
-    ).vertices : f), a && E(d), s && !n && E(g), this.setIndex(B), this[ae](
+    ).vertices : f), a && B(d), s && !n && B(x), this.setIndex(I), this[ae](
       "position",
-      new b.Float32BufferAttribute(w, 3)
+      new b.Float32BufferAttribute(g, 3)
     ), this[ae]("uv", new b.Float32BufferAttribute(S, 2)), this.computeVertexNormals();
   }
 }
 const ue = (o) => {
   const r = o, { coordinate: t, startHeight: e, height: i } = r, s = _t(r, ["coordinate", "startHeight", "height"]);
   let n = e || 0;
-  return typeof e != "undefined" && typeof i != "undefined" && (n = e + i), new ci([t], bt(R({}, s), {
+  return typeof e != "undefined" && typeof i != "undefined" && (n = e + i), new ci([t], ft(U({}, s), {
     startHeight: e,
     endHeight: n
   }));
 };
 class Di extends ot {
   constructor(t) {
-    super(), this.options = R({}, t);
+    super(), this.options = U({}, t);
   }
   create() {
     const u = this.options, {
@@ -1503,12 +1503,12 @@ class Di extends ot {
     ]);
     let r = t;
     if (!r && i)
-      r = ue(R({
+      r = ue(U({
         coordinate: i
       }, a));
     else if (!r && e) {
       const h = e.map(
-        (l) => ue(R({
+        (l) => ue(U({
           coordinate: l
         }, a))
       );
@@ -1520,12 +1520,12 @@ class Di extends ot {
     this.createMesh(r, s);
   }
 }
-class ft extends he {
-  constructor(t = new Be([
-    new D(0.5, 0.5),
-    new D(-0.5, 0.5),
-    new D(-0.5, -0.5),
-    new D(0.5, -0.5)
+class ut extends he {
+  constructor(t = new Ce([
+    new R(0.5, 0.5),
+    new R(-0.5, 0.5),
+    new R(-0.5, -0.5),
+    new R(0.5, -0.5)
   ]), e = {}) {
     super(), this.type = "ExtrudeGeometry", this.parameters = {
       shapes: t,
@@ -1540,10 +1540,10 @@ class ft extends he {
     function a(r) {
       var Wt, jt, Dt;
       const u = [], h = e.curveSegments !== void 0 ? e.curveSegments : 12, l = e.steps !== void 0 ? e.steps : 1, c = e.depth !== void 0 ? e.depth : 1;
-      let p = e.bevelEnabled !== void 0 ? e.bevelEnabled : !0, f = e.bevelThickness !== void 0 ? e.bevelThickness : 0.2, d = e.bevelSize !== void 0 ? e.bevelSize : f - 0.1, g = e.bevelOffset !== void 0 ? e.bevelOffset : 0, w = e.bevelSegments !== void 0 ? e.bevelSegments : 3;
-      const S = e.extrudePath, B = e.UVGenerator !== void 0 ? e.UVGenerator : hi, A = (Wt = e.hasTop) != null ? Wt : !0, E = (jt = e.hasBottom) != null ? jt : !0, T = (Dt = e.hasSide) != null ? Dt : !0;
-      let L, z = !1, I, N, V, k;
-      S && (L = S.getSpacedPoints(l), z = !0, p = !1, I = S.computeFrenetFrames(l, !1), N = new $(), V = new $(), k = new $()), p || (w = 0, f = 0, d = 0, g = 0);
+      let p = e.bevelEnabled !== void 0 ? e.bevelEnabled : !0, f = e.bevelThickness !== void 0 ? e.bevelThickness : 0.2, d = e.bevelSize !== void 0 ? e.bevelSize : f - 0.1, x = e.bevelOffset !== void 0 ? e.bevelOffset : 0, g = e.bevelSegments !== void 0 ? e.bevelSegments : 3;
+      const S = e.extrudePath, I = e.UVGenerator !== void 0 ? e.UVGenerator : hi, A = (Wt = e.hasTop) != null ? Wt : !0, B = (jt = e.hasBottom) != null ? jt : !0, T = (Dt = e.hasSide) != null ? Dt : !0;
+      let L, z = !1, C, N, V, k;
+      S && (L = S.getSpacedPoints(l), z = !0, p = !1, C = S.computeFrenetFrames(l, !1), N = new $(), V = new $(), k = new $()), p || (g = 0, f = 0, d = 0, x = 0);
       const nt = r.extractPoints(h);
       let H = nt.shape;
       const F = nt.holes;
@@ -1554,7 +1554,7 @@ class ft extends he {
           Pt.isClockWise(v) && (F[m] = v.reverse());
         }
       }
-      const ut = Pt.triangulateShape(H, F), q = H;
+      const ct = Pt.triangulateShape(H, F), q = H;
       for (let m = 0, y = F.length; m < y; m++) {
         const v = F[m];
         H = H.concat(v);
@@ -1562,73 +1562,73 @@ class ft extends he {
       function at(m, y, v) {
         return y || console.error("THREE.ExtrudeGeometry: vec does not exist"), m.clone().addScaledVector(y, v);
       }
-      const K = H.length, dt = ut.length;
+      const K = H.length, mt = ct.length;
       function Vt(m, y, v) {
-        let M, x, _;
-        const P = m.x - y.x, C = m.y - y.y, O = v.x - m.x, G = v.y - m.y, ct = P * P + C * C, St = P * G - C * O;
+        let M, w, _;
+        const P = m.x - y.x, E = m.y - y.y, O = v.x - m.x, G = v.y - m.y, ht = P * P + E * E, St = P * G - E * O;
         if (Math.abs(St) > Number.EPSILON) {
-          const it = Math.sqrt(ct), Rt = Math.sqrt(
+          const it = Math.sqrt(ht), Rt = Math.sqrt(
             O * O + G * G
-          ), Ot = y.x - C / it, Nt = y.y + P / it, ve = v.x - G / Rt, be = v.y + O / Rt, Ft = ((ve - Ot) * G - (be - Nt) * O) / (P * G - C * O);
-          M = Ot + P * Ft - m.x, x = Nt + C * Ft - m.y;
-          const kt = M * M + x * x;
+          ), Ot = y.x - E / it, Nt = y.y + P / it, ve = v.x - G / Rt, be = v.y + O / Rt, Ft = ((ve - Ot) * G - (be - Nt) * O) / (P * G - E * O);
+          M = Ot + P * Ft - m.x, w = Nt + E * Ft - m.y;
+          const kt = M * M + w * w;
           if (kt <= 2)
-            return new D(M, x);
+            return new R(M, w);
           _ = Math.sqrt(kt / 2);
         } else {
           let it = !1;
-          P > Number.EPSILON ? O > Number.EPSILON && (it = !0) : P < -Number.EPSILON ? O < -Number.EPSILON && (it = !0) : Math.sign(C) === Math.sign(G) && (it = !0), it ? (M = -C, x = P, _ = Math.sqrt(ct)) : (M = P, x = C, _ = Math.sqrt(ct / 2));
+          P > Number.EPSILON ? O > Number.EPSILON && (it = !0) : P < -Number.EPSILON ? O < -Number.EPSILON && (it = !0) : Math.sign(E) === Math.sign(G) && (it = !0), it ? (M = -E, w = P, _ = Math.sqrt(ht)) : (M = P, w = E, _ = Math.sqrt(ht / 2));
         }
-        return new D(M / _, x / _);
+        return new R(M / _, w / _);
       }
-      const mt = [];
+      const gt = [];
       for (let m = 0, y = q.length, v = y - 1, M = m + 1; m < y; m++, v++, M++)
-        v === y && (v = 0), M === y && (M = 0), mt[m] = Vt(q[m], q[v], q[M]);
+        v === y && (v = 0), M === y && (M = 0), gt[m] = Vt(q[m], q[v], q[M]);
       const Mt = [];
-      let st, gt = mt.concat();
+      let st, yt = gt.concat();
       for (let m = 0, y = F.length; m < y; m++) {
         const v = F[m];
         st = [];
-        for (let M = 0, x = v.length, _ = x - 1, P = M + 1; M < x; M++, _++, P++)
-          _ === x && (_ = 0), P === x && (P = 0), st[M] = Vt(v[M], v[_], v[P]);
-        Mt.push(st), gt = gt.concat(st);
+        for (let M = 0, w = v.length, _ = w - 1, P = M + 1; M < w; M++, _++, P++)
+          _ === w && (_ = 0), P === w && (P = 0), st[M] = Vt(v[M], v[_], v[P]);
+        Mt.push(st), yt = yt.concat(st);
       }
-      for (let m = 0; m < w; m++) {
-        const y = m / w, v = f * Math.cos(y * Math.PI / 2), M = d * Math.sin(y * Math.PI / 2) + g;
-        for (let x = 0, _ = q.length; x < _; x++) {
-          const P = at(q[x], mt[x], M);
+      for (let m = 0; m < g; m++) {
+        const y = m / g, v = f * Math.cos(y * Math.PI / 2), M = d * Math.sin(y * Math.PI / 2) + x;
+        for (let w = 0, _ = q.length; w < _; w++) {
+          const P = at(q[w], gt[w], M);
           Q(P.x, P.y, -v);
         }
-        for (let x = 0, _ = F.length; x < _; x++) {
-          const P = F[x];
-          st = Mt[x];
-          for (let C = 0, O = P.length; C < O; C++) {
-            const G = at(P[C], st[C], M);
+        for (let w = 0, _ = F.length; w < _; w++) {
+          const P = F[w];
+          st = Mt[w];
+          for (let E = 0, O = P.length; E < O; E++) {
+            const G = at(P[E], st[E], M);
             Q(G.x, G.y, -v);
           }
         }
       }
-      const Gt = d + g;
+      const Gt = d + x;
       for (let m = 0; m < K; m++) {
-        const y = p ? at(H[m], gt[m], Gt) : H[m];
-        z ? (V.copy(I.normals[0]).multiplyScalar(y.x), N.copy(I.binormals[0]).multiplyScalar(y.y), k.copy(L[0]).add(V).add(N), Q(k.x, k.y, k.z)) : Q(y.x, y.y, 0);
+        const y = p ? at(H[m], yt[m], Gt) : H[m];
+        z ? (V.copy(C.normals[0]).multiplyScalar(y.x), N.copy(C.binormals[0]).multiplyScalar(y.y), k.copy(L[0]).add(V).add(N), Q(k.x, k.y, k.z)) : Q(y.x, y.y, 0);
       }
       for (let m = 1; m <= l; m++)
         for (let y = 0; y < K; y++) {
-          const v = p ? at(H[y], gt[y], Gt) : H[y];
-          z ? (V.copy(I.normals[m]).multiplyScalar(v.x), N.copy(I.binormals[m]).multiplyScalar(v.y), k.copy(L[m]).add(V).add(N), Q(k.x, k.y, k.z)) : Q(v.x, v.y, c / l * m);
+          const v = p ? at(H[y], yt[y], Gt) : H[y];
+          z ? (V.copy(C.normals[m]).multiplyScalar(v.x), N.copy(C.binormals[m]).multiplyScalar(v.y), k.copy(L[m]).add(V).add(N), Q(k.x, k.y, k.z)) : Q(v.x, v.y, c / l * m);
         }
-      for (let m = w - 1; m >= 0; m--) {
-        const y = m / w, v = f * Math.cos(y * Math.PI / 2), M = d * Math.sin(y * Math.PI / 2) + g;
-        for (let x = 0, _ = q.length; x < _; x++) {
-          const P = at(q[x], mt[x], M);
+      for (let m = g - 1; m >= 0; m--) {
+        const y = m / g, v = f * Math.cos(y * Math.PI / 2), M = d * Math.sin(y * Math.PI / 2) + x;
+        for (let w = 0, _ = q.length; w < _; w++) {
+          const P = at(q[w], gt[w], M);
           Q(P.x, P.y, c + v);
         }
-        for (let x = 0, _ = F.length; x < _; x++) {
-          const P = F[x];
-          st = Mt[x];
-          for (let C = 0, O = P.length; C < O; C++) {
-            const G = at(P[C], st[C], M);
+        for (let w = 0, _ = F.length; w < _; w++) {
+          const P = F[w];
+          st = Mt[w];
+          for (let E = 0, O = P.length; E < O; E++) {
+            const G = at(P[E], st[E], M);
             z ? Q(
               G.x,
               G.y + L[l - 1].y,
@@ -1642,26 +1642,26 @@ class ft extends he {
         const m = s.length / 3;
         if (p) {
           let y = 0, v = K * y;
-          if (E)
-            for (let M = 0; M < dt; M++) {
-              const x = ut[M];
-              yt(x[2] + v, x[1] + v, x[0] + v);
+          if (B)
+            for (let M = 0; M < mt; M++) {
+              const w = ct[M];
+              vt(w[2] + v, w[1] + v, w[0] + v);
             }
-          if (y = l + w * 2, v = K * y, A)
-            for (let M = 0; M < dt; M++) {
-              const x = ut[M];
-              yt(x[0] + v, x[1] + v, x[2] + v);
+          if (y = l + g * 2, v = K * y, A)
+            for (let M = 0; M < mt; M++) {
+              const w = ct[M];
+              vt(w[0] + v, w[1] + v, w[2] + v);
             }
         } else {
-          if (E)
-            for (let y = 0; y < dt; y++) {
-              const v = ut[y];
-              yt(v[2], v[1], v[0]);
+          if (B)
+            for (let y = 0; y < mt; y++) {
+              const v = ct[y];
+              vt(v[2], v[1], v[0]);
             }
           if (A)
-            for (let y = 0; y < dt; y++) {
-              const v = ut[y];
-              yt(
+            for (let y = 0; y < mt; y++) {
+              const v = ct[y];
+              vt(
                 v[0] + K * l,
                 v[1] + K * l,
                 v[2] + K * l
@@ -1675,8 +1675,8 @@ class ft extends he {
         let y = 0;
         Ut(q, y), y += q.length;
         for (let v = 0, M = F.length; v < M; v++) {
-          const x = F[v];
-          Ut(x, y), y += x.length;
+          const w = F[v];
+          Ut(w, y), y += w.length;
         }
         i.addGroup(m, s.length / 3 - m, 1);
       }
@@ -1684,37 +1684,37 @@ class ft extends he {
         let v = m.length;
         for (; --v >= 0; ) {
           const M = v;
-          let x = v - 1;
-          x < 0 && (x = m.length - 1);
-          for (let _ = 0, P = l + w * 2; _ < P; _++) {
-            const C = K * _, O = K * (_ + 1), G = y + M + C, ct = y + x + C, St = y + x + O, it = y + M + O;
-            ye(G, ct, St, it);
+          let w = v - 1;
+          w < 0 && (w = m.length - 1);
+          for (let _ = 0, P = l + g * 2; _ < P; _++) {
+            const E = K * _, O = K * (_ + 1), G = y + M + E, ht = y + w + E, St = y + w + O, it = y + M + O;
+            ye(G, ht, St, it);
           }
         }
       }
       function Q(m, y, v) {
         u.push(m), u.push(y), u.push(v);
       }
-      function yt(m, y, v) {
+      function vt(m, y, v) {
         tt(m), tt(y), tt(v);
-        const M = s.length / 3, x = B.generateTopUV(
+        const M = s.length / 3, w = I.generateTopUV(
           i,
           s,
           M - 3,
           M - 2,
           M - 1
         );
-        et(x[0]), et(x[1]), et(x[2]);
+        et(w[0]), et(w[1]), et(w[2]);
       }
       function ye(m, y, v, M) {
         tt(m), tt(y), tt(M), tt(y), tt(v), tt(M);
-        const x = s.length / 3, _ = B.generateSideWallUV(
+        const w = s.length / 3, _ = I.generateSideWallUV(
           i,
           s,
-          x - 6,
-          x - 3,
-          x - 2,
-          x - 1
+          w - 6,
+          w - 3,
+          w - 2,
+          w - 1
         );
         et(_[0]), et(_[1]), et(_[3]), et(_[1]), et(_[2]), et(_[3]);
       }
@@ -1740,30 +1740,30 @@ class ft extends he {
       i.push(r);
     }
     const s = t.options.extrudePath;
-    return console.log(s.type), s !== void 0 && (t.options.extrudePath = new b[`${s.type}Curve`]().fromJSON(s)), new ft(i, t.options);
+    return console.log(s.type), s !== void 0 && (t.options.extrudePath = new b[`${s.type}Curve`]().fromJSON(s)), new ut(i, t.options);
   }
 }
 const hi = {
   generateTopUV: function(o, t, e, i, s) {
     const n = t[e * 3], a = t[e * 3 + 1], r = t[i * 3], u = t[i * 3 + 1], h = t[s * 3], l = t[s * 3 + 1];
     return [
-      new D(n, a),
-      new D(r, u),
-      new D(h, l)
+      new R(n, a),
+      new R(r, u),
+      new R(h, l)
     ];
   },
   generateSideWallUV: function(o, t, e, i, s, n) {
-    const a = t[e * 3], r = t[e * 3 + 1], u = t[e * 3 + 2], h = t[i * 3], l = t[i * 3 + 1], c = t[i * 3 + 2], p = t[s * 3], f = t[s * 3 + 1], d = t[s * 3 + 2], g = t[n * 3], w = t[n * 3 + 1], S = t[n * 3 + 2];
+    const a = t[e * 3], r = t[e * 3 + 1], u = t[e * 3 + 2], h = t[i * 3], l = t[i * 3 + 1], c = t[i * 3 + 2], p = t[s * 3], f = t[s * 3 + 1], d = t[s * 3 + 2], x = t[n * 3], g = t[n * 3 + 1], S = t[n * 3 + 2];
     return Math.abs(r - l) < Math.abs(a - h) ? [
-      new D(a, 1 - u),
-      new D(h, 1 - c),
-      new D(p, 1 - d),
-      new D(g, 1 - S)
+      new R(a, 1 - u),
+      new R(h, 1 - c),
+      new R(p, 1 - d),
+      new R(x, 1 - S)
     ] : [
-      new D(r, 1 - u),
-      new D(l, 1 - c),
-      new D(f, 1 - d),
-      new D(w, 1 - S)
+      new R(r, 1 - u),
+      new R(l, 1 - c),
+      new R(f, 1 - d),
+      new R(g, 1 - S)
     ];
   }
 };
@@ -1777,10 +1777,15 @@ function fi(o, t, e) {
     e.shapes.push(o.uuid);
   return e.options = Object.assign({}, t), t.extrudePath !== void 0 && (e.options.extrudePath = t.extrudePath.toJSON()), e;
 }
-class pi extends ft {
+class pi extends ut {
   constructor(t, e) {
     super(t, e);
-    const i = new Qt(this);
+    const i = new Qt(
+      new ut(t, ft(U({}, e), {
+        hasTop: !0,
+        hasSide: !0
+      }))
+    );
     i.updateMatrixWorld();
     const s = new b.Box3().setFromObject(i), n = new b.Vector3();
     s.getSize(n);
@@ -1793,8 +1798,8 @@ class pi extends ft {
     if (e.box3) {
       const g = new b.Vector3();
       e.box3.getSize(g);
-      const w = Math.max(n.x / g.x, n.y / g.y);
-      r = Math.ceil(e.topSegments * w);
+      const S = Math.max(n.x / g.x, n.y / g.y);
+      r = Math.ceil(e.topSegments * S);
     }
     if (r < 4)
       return this;
@@ -1805,19 +1810,30 @@ class pi extends ft {
       r
     ), h = new Qt(u);
     h.position.set(a.x, a.y, a.z), h.updateMatrixWorld();
-    const c = new qe().evaluate(h, i, Ze), p = c.geometry.getAttribute("position");
+    const c = new qe().evaluate(h, i, Ze), p = c.geometry.getAttribute("position"), f = new b.Float32BufferAttribute(
+      p.count * 2,
+      2
+    );
     for (let g = 0; g < p.count; g++) {
-      const w = p.getZ(g);
-      p.setZ(g, w * 2);
+      const S = p.getZ(g);
+      p.setZ(g, S * 2);
+    }
+    if (e.box3) {
+      const g = e.box3.min, S = e.box3.max, I = new b.Vector3().subVectors(S, g);
+      for (let A = 0; A < p.count; A++) {
+        const B = p.getX(A), T = p.getY(A), L = (B - g.x) / I.x, z = (T - g.y) / I.y;
+        f.setXY(A, L, z);
+      }
+      c.geometry.setAttribute("uv", f);
     }
     p.needsUpdate = !0;
-    const f = new ft(t, bt(R({}, e), {
+    const d = new ut(t, ft(U({}, e), {
       hasTop: !1
-    })), d = Y(
-      [c.geometry, f],
+    })), x = Y(
+      [c.geometry, d],
       2
     );
-    this.copy(d.toNonIndexed());
+    this.copy(x.toNonIndexed());
   }
 }
 const ce = (o) => {
@@ -1831,7 +1847,7 @@ const ce = (o) => {
     hasSide: r,
     sideRepeat: u,
     topSegments: h
-  } = o, l = h ? pi : ft, c = new l(new b.Shape(i), {
+  } = o, l = h ? pi : ut, c = new l(new b.Shape(i), {
     depth: e,
     bevelEnabled: !1,
     box3: s,
@@ -1849,12 +1865,12 @@ const ce = (o) => {
 };
 class Ri extends ot {
   constructor(t) {
-    super(), this.options = R({
+    super(), this.options = U({
       depth: 1
     }, t);
   }
   create() {
-    return ht(this, null, function* () {
+    return pt(this, null, function* () {
       const {
         points: t,
         pointsArr: e,
@@ -1868,9 +1884,9 @@ class Ri extends ot {
         hasTop: l,
         hasBottom: c,
         hasSide: p
-      } = this.options, f = Array.isArray(s) ? s : [s], d = Array.isArray(u) ? u : [u], g = r;
-      let w = n;
-      g || console.log("material is null"), !w && t ? w = ce({
+      } = this.options, f = Array.isArray(s) ? s : [s], d = Array.isArray(u) ? u : [u], x = r;
+      let g = n;
+      x || console.log("material is null"), !g && t ? g = ce({
         points: t,
         depth: f[0],
         box3: d[0],
@@ -1878,14 +1894,14 @@ class Ri extends ot {
         hasTop: l,
         hasBottom: c,
         hasSide: p
-      }) : !w && e ? w = Y(
+      }) : !g && e ? g = Y(
         e.map(
-          (S, B) => {
-            var A, E;
+          (S, I) => {
+            var A, B;
             return ce({
               points: S,
-              depth: (A = f[B]) != null ? A : f[0],
-              box3: (E = d[B]) != null ? E : d[0],
+              depth: (A = f[I]) != null ? A : f[0],
+              box3: (B = d[I]) != null ? B : d[0],
               split: h,
               hasTop: l,
               hasBottom: c,
@@ -1894,10 +1910,10 @@ class Ri extends ot {
           }
         ),
         i != null ? i : 0
-      ) : !w && a && a.length > 1 ? w = Y(
+      ) : !g && a && a.length > 1 ? g = Y(
         a,
         i != null ? i : 0
-      ) : !w && a && a.length === 1 && ([w] = a), this.createMesh(w, g);
+      ) : !g && a && a.length === 1 && ([g] = a), this.createMesh(g, x);
     });
   }
   addGeometries(t) {