gl-draw 0.15.23 → 0.15.25

package/dist/objects/index.module.js

@@ -41,14 +41,14 @@ import { LineSegmentsGeometry as Ke } from "three/examples/jsm/lines/LineSegment
 import { LineSegmentsGeometry as un } from "three/examples/jsm/lines/LineSegmentsGeometry";
 import { P as et, a as Z, M as tt, L as nt } from "../WebGPULineSegments2.module.js";
 import { g as fn } from "../WebGPULineSegments2.module.js";
-import { BufferGeometry as fe, Float32BufferAttribute as be, Vector3 as _, ShapeUtils as de, Shape as xe, Vector2 as G, ArcCurve as st, CatmullRomCurve3 as ot, CubicBezierCurve as it, CubicBezierCurve3 as rt, EllipseCurve as at, LineCurve as ct, LineCurve3 as lt, QuadraticBezierCurve as ht, QuadraticBezierCurve3 as ut, SplineCurve as dt, Box3 as ft, PlaneGeometry as pt, CanvasTexture as mt, AmbientLight as gt, DirectionalLight as yt, PointLight as bt, SpotLight as xt, HemisphereLight as wt, RectAreaLight as vt, Matrix4 as Ve, BufferAttribute as Y, Ray as St, Sphere as At, LineSegments as Xe, Color as Ne, MeshBasicMaterial as Mt, Mesh as Lt } from "three";
+import { BufferGeometry as fe, Float32BufferAttribute as be, Vector3 as _, ShapeUtils as de, Shape as xe, Vector2 as G, ArcCurve as st, CatmullRomCurve3 as ot, CubicBezierCurve as it, CubicBezierCurve3 as rt, EllipseCurve as at, LineCurve as ct, LineCurve3 as lt, QuadraticBezierCurve as ht, QuadraticBezierCurve3 as ut, SplineCurve as dt, Box3 as ft, PlaneGeometry as pt, CanvasTexture as mt, AmbientLight as gt, DirectionalLight as yt, PointLight as bt, SpotLight as xt, HemisphereLight as wt, RectAreaLight as vt, Matrix4 as De, BufferAttribute as Y, Ray as St, Sphere as At, LineSegments as Xe, Color as Ne, MeshBasicMaterial as Mt, Mesh as Lt } from "three";
 import { mergeAttributes as Re, mergeGroups as Tt } from "three/examples/jsm/utils/BufferGeometryUtils";
 import { g as Et, c as Ct } from "../uvGenerator.module.js";
 import { Brush as Oe, Evaluator as Gt, INTERSECTION as Pt } from "three-bvh-csg";
 import { RectAreaLightUniformsLib as _t } from "three/examples/jsm/lights/RectAreaLightUniformsLib";
 import * as ne from "@tweenjs/tween.js";
 import { LineSegments2 as jt } from "three/examples/jsm/lines/LineSegments2";
-function H(m, e = 0) {
+function V(m, e = 0) {
   const t = m[0].index !== null, n = new Set(Object.keys(m[0].attributes)), s = new Set(
     Object.keys(m[0].morphAttributes)
   ), i = {}, a = {}, f = m[0].morphTargetsRelative, r = new fe();
@@ -180,7 +180,7 @@ class Zt extends Z {
           coordinate: o
         }, a))
       );
-      f = H(h, i != null ? i : 0);
+      f = V(h, i != null ? i : 0);
     }
     this.createMesh(f, s);
   }
@@ -225,8 +225,8 @@ class K extends fe {
       const r = [], h = t.curveSegments !== void 0 ? t.curveSegments : 12, o = t.steps !== void 0 ? t.steps : 1, c = t.depth !== void 0 ? t.depth : 1;
       let y = t.bevelEnabled !== void 0 ? t.bevelEnabled : !0, u = t.bevelThickness !== void 0 ? t.bevelThickness : 0.2, g = t.bevelSize !== void 0 ? t.bevelSize : u - 0.1, L = t.bevelOffset !== void 0 ? t.bevelOffset : 0, S = t.bevelSegments !== void 0 ? t.bevelSegments : 3;
       const A = t.extrudePath, P = t.UVGenerator !== void 0 ? t.UVGenerator : It, v = (Le = t.hasTop) != null ? Le : !0, z = (Te = t.hasBottom) != null ? Te : !0, ee = (Ee = t.hasSide) != null ? Ee : !0;
-      let V, $ = !1, U, se, oe, X;
-      A && (V = A.getSpacedPoints(o), $ = !0, y = !1, U = A.computeFrenetFrames(o, !1), se = new _(), oe = new _(), X = new _()), y || (S = 0, u = 0, g = 0, L = 0);
+      let D, $ = !1, U, se, oe, X;
+      A && (D = A.getSpacedPoints(o), $ = !0, y = !1, U = A.computeFrenetFrames(o, !1), se = new _(), oe = new _(), X = new _()), y || (S = 0, u = 0, g = 0, L = 0);
       const we = f.extractPoints(h);
       let O = we.shape;
       const I = we.holes;
@@ -255,7 +255,7 @@ class K extends fe {
         }
       }
       ve(O), I.forEach(ve);
-      const pe = I.length, D = O;
+      const pe = I.length, H = O;
       for (let l = 0; l < pe; l++) {
         const d = I[l];
         O = O.concat(d);
@@ -283,8 +283,8 @@ class K extends fe {
         return new G(x / M, b / M);
       }
       const re = [];
-      for (let l = 0, d = D.length, p = d - 1, x = l + 1; l < d; l++, p++, x++)
-        p === d && (p = 0), x === d && (x = 0), re[l] = Se(D[l], D[p], D[x]);
+      for (let l = 0, d = H.length, p = d - 1, x = l + 1; l < d; l++, p++, x++)
+        p === d && (p = 0), x === d && (x = 0), re[l] = Se(H[l], H[p], H[x]);
       const me = [];
       let q, ae = re.concat();
       for (let l = 0, d = pe; l < d; l++) {
@@ -296,13 +296,13 @@ class K extends fe {
       }
       let J;
       if (S === 0)
-        J = de.triangulateShape(D, I);
+        J = de.triangulateShape(H, I);
       else {
         const l = [], d = [];
         for (let p = 0; p < S; p++) {
           const x = p / S, b = u * Math.cos(x * Math.PI / 2), M = g * Math.sin(x * Math.PI / 2) + L;
-          for (let w = 0, T = D.length; w < T; w++) {
-            const E = te(D[w], re[w], M);
+          for (let w = 0, T = H.length; w < T; w++) {
+            const E = te(H[w], re[w], M);
             W(E.x, E.y, -b), x === 0 && l.push(E);
           }
           for (let w = 0, T = pe; w < T; w++) {
@@ -324,17 +324,17 @@ class K extends fe {
       const ce = J.length, Ae = g + L;
       for (let l = 0; l < N; l++) {
         const d = y ? te(O[l], ae[l], Ae) : O[l];
-        $ ? (oe.copy(U.normals[0]).multiplyScalar(d.x), se.copy(U.binormals[0]).multiplyScalar(d.y), X.copy(V[0]).add(oe).add(se), W(X.x, X.y, X.z)) : W(d.x, d.y, 0);
+        $ ? (oe.copy(U.normals[0]).multiplyScalar(d.x), se.copy(U.binormals[0]).multiplyScalar(d.y), X.copy(D[0]).add(oe).add(se), W(X.x, X.y, X.z)) : W(d.x, d.y, 0);
       }
       for (let l = 1; l <= o; l++)
         for (let d = 0; d < N; d++) {
           const p = y ? te(O[d], ae[d], Ae) : O[d];
-          $ ? (oe.copy(U.normals[l]).multiplyScalar(p.x), se.copy(U.binormals[l]).multiplyScalar(p.y), X.copy(V[l]).add(oe).add(se), W(X.x, X.y, X.z)) : W(p.x, p.y, c / o * l);
+          $ ? (oe.copy(U.normals[l]).multiplyScalar(p.x), se.copy(U.binormals[l]).multiplyScalar(p.y), X.copy(D[l]).add(oe).add(se), W(X.x, X.y, X.z)) : W(p.x, p.y, c / o * l);
         }
       for (let l = S - 1; l >= 0; l--) {
         const d = l / S, p = u * Math.cos(d * Math.PI / 2), x = g * Math.sin(d * Math.PI / 2) + L;
-        for (let b = 0, M = D.length; b < M; b++) {
-          const w = te(D[b], re[b], x);
+        for (let b = 0, M = H.length; b < M; b++) {
+          const w = te(H[b], re[b], x);
           W(w.x, w.y, c + p);
         }
         for (let b = 0, M = I.length; b < M; b++) {
@@ -344,8 +344,8 @@ class K extends fe {
             const C = te(w[T], q[T], x);
             $ ? W(
               C.x,
-              C.y + V[o - 1].y,
-              V[o - 1].x + p
+              C.y + D[o - 1].y,
+              D[o - 1].x + p
             ) : W(C.x, C.y, c + p);
           }
         }
@@ -386,7 +386,7 @@ class K extends fe {
       function ke() {
         const l = s.length / 3;
         let d = 0;
-        Me(D, d), d += D.length;
+        Me(H, d), d += H.length;
         for (let p = 0, x = I.length; p < x; p++) {
           const b = I[p];
           Me(b, d), d += b.length;
@@ -549,7 +549,7 @@ class Rt extends K {
     if (r) {
       const A = r.min, P = r.max, v = new _().subVectors(P, A);
       for (let z = 0; z < u.count; z++) {
-        const ee = u.getX(z), V = u.getY(z), $ = (ee - A.x) / v.x, U = (V - A.y) / v.y;
+        const ee = u.getX(z), D = u.getY(z), $ = (ee - A.x) / v.x, U = (D - A.y) / v.y;
         g.setXY(z, $, U);
       }
       y.geometry.setAttribute("uv", g);
@@ -557,11 +557,11 @@ class Rt extends K {
     u.needsUpdate = !0;
     const L = new K(e, ue(j({}, t), {
       hasTop: !1
-    })), S = H([y.geometry, L], 2);
+    })), S = V([y.geometry, L], 2);
     this.copy(S.toNonIndexed());
   }
 }
-const De = (m) => {
+const He = (m) => {
   const {
     split: e,
     depth: t,
@@ -611,7 +611,7 @@ class $t extends Z {
         hasSide: y
       } = this.options, u = Array.isArray(s) ? s : [s], g = Array.isArray(r) ? r : [r], L = f;
       let S = i;
-      L || console.log("material is null"), !S && e ? S = De({
+      L || console.log("material is null"), !S && e ? S = He({
         points: e,
         depth: u[0],
         box3: g[0],
@@ -619,11 +619,11 @@ class $t extends Z {
         hasTop: o,
         hasBottom: c,
         hasSide: y
-      }) : !S && t ? S = H(
+      }) : !S && t ? S = V(
         t.map(
           (A, P) => {
             var v, z;
-            return De({
+            return He({
               points: A,
               depth: (v = u[P]) != null ? v : u[0],
               box3: (z = g[P]) != null ? z : g[0],
@@ -635,11 +635,11 @@ class $t extends Z {
           }
         ),
         n != null ? n : 0
-      ) : !S && a && a.length > 1 ? S = H(a, n != null ? n : 0) : !S && a && a.length === 1 && ([S] = a), this.createMesh(S, L);
+      ) : !S && a && a.length > 1 ? S = V(a, n != null ? n : 0) : !S && a && a.length === 1 && ([S] = a), this.createMesh(S, L);
     });
   }
   addGeometries(e) {
-    const t = this.object3d, n = H([t.geometry, ...e]);
+    const t = this.object3d, n = V([t.geometry, ...e]);
     t.geometry = n;
   }
   setTextureAnisotropic(e, t) {
@@ -743,7 +743,7 @@ class Kt extends Z {
 }
 class Ot extends fe {
   constructor(e = [], t = "none", n) {
-    super(), this.type = "MeshLineGeometry", this.pointCount = 0, this._points = [], this.shape = "none", this.shapeFunction = (s) => 1, this.matrixWorld = new Ve(), this.shape = t, n && (this.shapeFunction = n), e.length > 0 && this.setPoints(e);
+    super(), this.type = "MeshLineGeometry", this.pointCount = 0, this._points = [], this.shape = "none", this.shapeFunction = (s) => 1, this.matrixWorld = new De(), this.shape = t, n && (this.shapeFunction = n), e.length > 0 && this.setPoints(e);
   }
   convertToVector3Array(e) {
     if (typeof e[0] == "number") {
@@ -830,7 +830,7 @@ class Ot extends fe {
   }
 }
 function en(m, e) {
-  const t = new Ve(), n = new St(), s = new At(), i = new _(), a = this.geometry;
+  const t = new De(), n = new St(), s = new At(), i = new _(), a = this.geometry;
   if (s.copy(a.boundingSphere), s.applyMatrix4(this.matrixWorld), !m.ray.intersectSphere(s, i)) return;
   t.copy(this.matrixWorld).invert(), n.copy(m.ray).applyMatrix4(t);
   const f = new _(), r = new _(), h = new _(), o = this instanceof Xe ? 2 : 1, c = a.index, y = a.attributes;
@@ -839,13 +839,13 @@ function en(m, e) {
     for (let S = 0, A = u.length - 1; S < A; S += o) {
       const P = u[S], v = u[S + 1];
       f.fromArray(g, P * 3), r.fromArray(g, v * 3);
-      const z = L[Math.floor(S / 3)] !== void 0 ? L[Math.floor(S / 3)] : 1, ee = m.params.Line.threshold + this.material.lineWidth * z / 2, V = ee * ee;
+      const z = L[Math.floor(S / 3)] !== void 0 ? L[Math.floor(S / 3)] : 1, ee = m.params.Line.threshold + this.material.lineWidth * z / 2, D = ee * ee;
       if (n.distanceSqToSegment(
         f,
         r,
         i,
         h
-      ) > V) continue;
+      ) > D) continue;
       i.applyMatrix4(this.matrixWorld);
       const U = m.ray.origin.distanceTo(i);
       U < m.near || U > m.far || (e.push({
@@ -890,7 +890,7 @@ let tn = class extends Z {
       !o && h && (o = this.getMaterial(h)), !c && e ? c = ye({
         nodes: e,
         setPointWidth: f
-      }) : !c && t ? c = H(
+      }) : !c && t ? c = V(
         t.map((y, u) => {
           let g = f;
           return !g && r && (g = () => {
@@ -902,7 +902,7 @@ let tn = class extends Z {
           });
         }),
         a != null ? a : 0
-      ) : !c && s && s.length > 1 ? c = H(s, a != null ? a : 0) : !c && s && s.length === 1 && ([c] = s), this.createMesh(c, o);
+      ) : !c && s && s.length > 1 ? c = V(s, a != null ? a : 0) : !c && s && s.length === 1 && ([c] = s), this.createMesh(c, o);
     });
   }
   setGeometry(e, t) {
@@ -919,7 +919,7 @@ let tn = class extends Z {
     return s.uniforms.resolution.value.set(t, n), s;
   }
   addGeometries(e) {
-    const t = this.object3d, n = H([t.geometry, ...e]);
+    const t = this.object3d, n = V([t.geometry, ...e]);
     t.geometry = n;
   }
   resize(e, t) {
@@ -955,17 +955,16 @@ let tn = class extends Z {
     }).onComplete(() => {
       f && f();
     }).start();
-    this.material.userData.tween = u;
+    this.material.userData.tween = !0, this.material.addEventListener("dispose", () => {
+      u.stop(), ne.remove(u), this.material.userData.tween = null;
+    });
   }
   render() {
     const { width: e, height: t } = this.pencil.getSize();
     this.resize(e, t);
   }
-  dispose() {
-    this.material.userData.tween && (this.material.userData.tween.stop(), ne.remove(this.material.userData.tween)), super.dispose();
-  }
 };
-const He = (m) => {
+const Ve = (m) => {
   const { points: e } = m, t = e.reduce((s, i, a) => (a < e.length - 1 && s.push(i, e[a + 1]), s), []);
   return new fe().setFromPoints(t);
 };
@@ -992,14 +991,14 @@ class sn extends Z {
         instanceCount: o
       } = this.options;
       let c = i, y = n;
-      !c && h && (c = this.getMaterial(h)), !y && e ? y = He({
+      !c && h && (c = this.getMaterial(h)), !y && e ? y = Ve({
         points: e
-      }) : !y && t ? y = H(
-        t.map((g) => He({
+      }) : !y && t ? y = V(
+        t.map((g) => Ve({
           points: g
         })),
         a != null ? a : 0
-      ) : !y && s && s.length > 1 ? y = H(s, a != null ? a : 0) : !y && s && s.length === 1 && ([y] = s);
+      ) : !y && s && s.length > 1 ? y = V(s, a != null ? a : 0) : !y && s && s.length === 1 && ([y] = s);
       const u = new Ke().fromLineSegments(
         new Xe(y)
       );

package/dist/objects/line/index.d.ts

@@ -36,6 +36,5 @@ export default class Line extends BaseObject {
         startShow?: boolean;
     }): void;
     render(): void;
-    dispose(): void;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gl-draw",
-  "version": "0.15.23",
+  "version": "0.15.25",
   "author": "gitplus <hstits@gmail.com>",
   "scripts": {
     "start": "bundler-dev",