@realsee/dnalogel 3.63.4-alpha.1 → 3.63.4-alpha.3

package/libs/MeasurePlugin/Controller.js

@@ -1,38 +1,38 @@
 var _ = Object.defineProperty, D = Object.defineProperties;
 var F = Object.getOwnPropertyDescriptors;
-var b = Object.getOwnPropertySymbols;
+var w = Object.getOwnPropertySymbols;
 var L = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
-var M = (n, o, e) => o in n ? _(n, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[o] = e, d = (n, o) => {
+var M = (s, o, e) => o in s ? _(s, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[o] = e, v = (s, o) => {
   for (var e in o || (o = {}))
-    L.call(o, e) && M(n, e, o[e]);
-  if (b)
-    for (var e of b(o))
-      H.call(o, e) && M(n, e, o[e]);
-  return n;
-}, v = (n, o) => D(n, F(o));
-var t = (n, o, e) => (M(n, typeof o != "symbol" ? o + "" : o, e), e);
+    L.call(o, e) && M(s, e, o[e]);
+  if (w)
+    for (var e of w(o))
+      H.call(o, e) && M(s, e, o[e]);
+  return s;
+}, f = (s, o) => D(s, F(o));
+var t = (s, o, e) => (M(s, typeof o != "symbol" ? o + "" : o, e), e);
 import * as r from "three";
 import "../shared-utils/tag.js";
 import "../vendor/hammerjs/hammer.js";
-import { Subscribe as V } from "../shared-utils/Subscribe.js";
-import { PointSelector as x } from "../shared-utils/three/PointSelector/index.js";
+import { Subscribe as I } from "../shared-utils/Subscribe.js";
+import { PointSelector as V } from "../shared-utils/three/PointSelector/index.js";
 import "../shared-utils/three/CSS3DRenderer/index.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
-import { IObject3D as U } from "../shared-utils/three/IObject3D.js";
+import { IObject3D as x } from "../shared-utils/three/IObject3D.js";
 import "@realsee/five/line";
 import "../shared-utils/three/core/Five_LineMaterial2.js";
 import "../shared-utils/three/core/Sphere.js";
 import "../vendor/animejs/lib/anime.es.js";
-import { FiveDomEvents as z } from "../shared-utils/five/FiveDomEvents.js";
+import { FiveDomEvents as U } from "../shared-utils/five/FiveDomEvents.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/five/FivePuppet.js";
-import { MeasureMesh as A } from "./utils/MeasureMesh.js";
+import { MeasureMesh as z } from "./utils/MeasureMesh.js";
 import { PointMesh as k } from "../Sculpt/Meshes/Point.js";
 import { LineWithDotsMesh as P } from "../Sculpt/Meshes/LineWithDots.js";
-import { hotkeys as u } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
-import { PolygonMesh as C } from "../Sculpt/Meshes/Polygon.js";
-import { validatePolygon as I } from "./utils/validatePolygon.js";
-import { Cursor as T } from "../Sculpt/utils/Modules/Cursor.js";
+import { hotkeys as a } from "../vendor/hotkeys-js/dist/hotkeys.esm.js";
+import { PolygonMesh as A } from "../Sculpt/Meshes/Polygon.js";
+import { validatePolygon as N } from "./utils/validatePolygon.js";
+import { Cursor as C } from "../Sculpt/utils/Modules/Cursor.js";
 import "../shared-utils/positionToVector3.js";
 import "../shared-utils/five/vector3ToScreen.js";
 import "../shared-utils/five/getFiveModel.js";
@@ -89,17 +89,17 @@ import "../PanoMeasurePlugin/utils/isIntersecting.js";
 import "../Sculpt/utils/three/ColoredMesh.js";
 import "../shared-utils/three/geometryUtil.js";
 import "../shared-utils/three/vectorIsEqual.js";
-const g = {
+const S = {
   lengthEnable: !0,
   occlusionVisibility: !0,
   lengthUnit: "m"
-}, N = {
+}, T = {
   lengthEnable: !0,
   occlusionVisibility: !0,
   opacity: 0.2,
   lengthUnit: "m"
 };
-class ct extends V {
+class mt extends I {
   constructor(e) {
     super();
     t(this, "name", "MeasurePlugin");
@@ -109,46 +109,47 @@ class ct extends V {
     t(this, "_pointSelector");
     t(this, "_fiveDomEvents");
     t(this, "_cursor");
+    t(this, "unbindHotKey");
     /**
      * @description 开始测量
      */
     t(this, "measure", () => {
       this.removeEventListener();
-      const e = new A();
-      this.currentMeasureMesh = e, this.updateSelectAdsorbedHelper();
-      const p = new k(), c = new P(v(d({}, g), { dashed: !0 })), m = new C(N), h = new P(v(d({}, g), { lineOpacity: 0.5, dashed: !0 })), l = new P(v(d({}, g), { lineOpacity: 0.5, dashed: !0 })), f = () => {
-        p.removeFromParent(), c.removeFromParent(), m.removeFromParent(), h.removeFromParent(), l.removeFromParent();
+      const e = new z();
+      this.currentMeasureMesh = e, this.pointSelector.actionIfNoIntersection = "disable", this.updateSelectAdsorbedHelper();
+      const p = new k(), m = new P(f(v({}, S), { dashed: !0 })), c = new A(T), h = new P(f(v({}, S), { lineOpacity: 0.5, dashed: !0 })), l = new P(f(v({}, S), { lineOpacity: 0.5, dashed: !0 })), d = () => {
+        p.removeFromParent(), m.removeFromParent(), c.removeFromParent(), h.removeFromParent(), l.removeFromParent();
       };
       this.group.add(e);
-      const S = (i) => {
+      const g = (i) => {
         if (!i) {
-          f();
+          d();
           return;
         }
-        if (e.points.length === 0 && (this.group.addIfNotExists(p), p.position.copy(i.point)), e.points.length >= 1)
-          if (p.removeFromParent(), this.group.addIfNotExists(c), c.setPoints([e.points.at(-1), i.point]), i.isAdsorbed)
+        if (e.points.length === 0 && (this.pointSelector.actionIfNoIntersection = "disable", this.group.addIfNotExists(p), p.position.copy(i.point)), e.points.length >= 1)
+          if (this.pointSelector.actionIfNoIntersection = "virtualPoint", p.removeFromParent(), this.group.addIfNotExists(m), m.setPoints([e.points.at(-1), i.point]), i.isAdsorbed)
             h.removeFromParent(), l.removeFromParent();
           else {
-            const s = e.points.at(-1);
-            if (Math.abs(i.point.y - s.y) > 0.2) {
-              const a = new r.Vector3(i.point.x, s.y, i.point.z);
-              h.setPoints([s, a]), l.setPoints([a, i.point]);
+            const n = e.points.at(-1);
+            if (Math.abs(i.point.y - n.y) > 0.2) {
+              const u = new r.Vector3(i.point.x, n.y, i.point.z);
+              h.setPoints([n, u]), l.setPoints([u, i.point]);
             } else {
-              let a = new r.Vector3();
-              Math.abs(i.point.x - s.x) < Math.abs(i.point.z - s.z) ? a = new r.Vector3(i.point.x, s.y, s.z) : a = new r.Vector3(s.x, s.y, i.point.z), h.setPoints([s, a]), l.setPoints([a, i.point]);
+              let u = new r.Vector3();
+              Math.abs(i.point.x - n.x) < Math.abs(i.point.z - n.z) ? u = new r.Vector3(i.point.x, n.y, n.z) : u = new r.Vector3(n.x, n.y, i.point.z), h.setPoints([n, u]), l.setPoints([u, i.point]);
             }
             this.group.addIfNotExists(h, l);
           }
         if (e.points.length >= 2) {
-          const s = [...e.points, i.point];
-          I(s) ? (m.setPoints(s), this.group.addIfNotExists(m)) : m.removeFromParent();
+          const n = [...e.points, i.point];
+          N(n) ? (c.setPoints(n), this.group.addIfNotExists(c)) : c.removeFromParent();
         }
       }, E = (i) => {
-        f(), e.setPoints([...e.points, i.point]), this.updateSelectAdsorbedHelper(), e.isPolygon && this.pointSelector.disable();
-      }, w = () => {
-        this.pointSelector.off("intersectionUpdate", S), this.pointSelector.off("select", E), this.pointSelector.off("disable", w), f(), e.points.length < 2 && e.removeFromParent(), this.currentMeasureMesh = null, this.addEventListener(), this.emit("measureEnd");
+        i && (d(), e.setPoints([...e.points, i.point]), this.updateSelectAdsorbedHelper(), e.isPolygon && this.pointSelector.disable());
+      }, b = () => {
+        this.pointSelector.off("intersectionUpdate", g), this.pointSelector.off("select", E), this.pointSelector.off("disable", b), d(), e.points.length < 2 && e.removeFromParent(), this.currentMeasureMesh = null, this.addEventListener(), this.emit("measureEnd");
       };
-      this.pointSelector.on("intersectionUpdate", S), this.pointSelector.on("select", E), this.pointSelector.on("disable", w), this.pointSelector.enable();
+      this.pointSelector.on("intersectionUpdate", g), this.pointSelector.on("select", E), this.pointSelector.on("disable", b), this.pointSelector.enable();
     });
     /**
      * @description 结束测量
@@ -177,7 +178,7 @@ class ct extends V {
       this.currentMeasureMesh = null, this.pointSelector.disable(), this.group.children.forEach((e) => e.removeFromParent());
     });
     t(this, "dispose", () => {
-      u.unbind("ctrl+z, command+z"), u.unbind("shift"), this.pointSelector.disable(), this.clear();
+      this.unbindHotKey(), this.pointSelector.disable(), this.clear();
     });
     t(this, "addEventListener", () => {
       this.group.children.forEach((e) => {
@@ -188,20 +189,24 @@ class ct extends V {
       this.fiveDomEvents.clear();
     });
     t(this, "onClick", ({ origDomEvent: e, target: p }) => {
-      const c = p;
-      if (!c)
+      const m = p;
+      if (!m)
         return;
-      let m, h;
-      e instanceof TouchEvent ? (m = e.changedTouches[0].clientX, h = e.changedTouches[0].clientY) : e instanceof MouseEvent && (m = e.clientX, h = e.clientY), !(m === void 0 || h === void 0) && (this.group.children.forEach((l) => l.unselect()), c.select(), this.cursor.showDeleteButton({
-        clientX: m,
+      let c, h;
+      if (e instanceof TouchEvent ? (c = e.changedTouches[0].clientX, h = e.changedTouches[0].clientY) : e instanceof MouseEvent && (c = e.clientX, h = e.clientY), c === void 0 || h === void 0)
+        return;
+      this.group.children.forEach((d) => d.unselect()), m.select();
+      const l = () => {
+        m.removeFromParent(), this.cursor.removeDeleteButton(), this.five.needsRender = !0, a.unbind("delete, backspace");
+      };
+      a("delete, backspace", l), this.cursor.showDeleteButton({
+        clientX: c,
         clientY: h,
         container: this.five.getElement().parentElement,
-        onClick: () => {
-          c.removeFromParent(), this.five.needsRender = !0;
-        }
+        onClick: l
       }), this.five.once("cameraUpdate", () => {
-        c.unselect(), this.cursor.removeDeleteButton();
-      }));
+        m.unselect(), this.cursor.removeDeleteButton();
+      });
     });
     t(this, "onHover", ({ target: e }) => {
       if (this.currentMeasureMesh)
@@ -239,20 +244,22 @@ class ct extends V {
       } else
         this.pointSelector.adherePlane = [];
     });
-    this.five = e, this.group = new U(), this.five.scene.add(this.group), u("ctrl+z, command+z", this.undo), u("esc", this.cancel), u("enter", this.endMeasure);
+    this.five = e, this.group = new x(), this.five.scene.add(this.group), a("ctrl+z, command+z", this.undo), a("esc", this.cancel), a("enter", this.endMeasure), this.unbindHotKey = () => {
+      a.unbind("ctrl+z, command+z"), a.unbind("esc"), a.unbind("enter");
+    };
   }
   get pointSelector() {
-    return this._pointSelector ? this._pointSelector : (this._pointSelector = new x(this.five, { mode: "cursor", helper: { pointHelper: "highlight" } }), this._pointSelector);
+    return this._pointSelector ? this._pointSelector : (this._pointSelector = new V(this.five, { mode: "cursor", helper: { pointHelper: "highlight" } }), this._pointSelector);
   }
   get fiveDomEvents() {
-    return this._fiveDomEvents ? this._fiveDomEvents : (this._fiveDomEvents = new z(this.five), this._fiveDomEvents);
+    return this._fiveDomEvents ? this._fiveDomEvents : (this._fiveDomEvents = new U(this.five), this._fiveDomEvents);
   }
   get cursor() {
-    return this._cursor ? this._cursor : (this._cursor = new T(), this._cursor);
+    return this._cursor ? this._cursor : (this._cursor = new C(), this._cursor);
   }
 }
 export {
-  ct as MeasureController,
-  g as lineStyle,
-  N as polygonStyle
+  mt as MeasureController,
+  S as lineStyle,
+  T as polygonStyle
 };

package/libs/base/BasePlugin.js

@@ -21,7 +21,7 @@ let E = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.63.4-alpha.1");
+    i(this, "VERSION", "3.63.4-alpha.3");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.63.4-alpha.1",
+    "%c %c@realsee/dnalogel %cv3.63.4-alpha.3",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/libs/shared-utils/three/PointSelector/index.d.ts

@@ -45,6 +45,10 @@ type EventMap = {
      * @description 试图打点，返回false则不打点
      */
     wantsSelect: (intersection: PointIntersection) => boolean | void;
+    /**
+     * @description 选则的位置禁止打点
+     */
+    disableSelect: () => void;
     /**
      * @description 打点成功
      */

package/libs/shared-utils/three/PointSelector/index.js

@@ -1,12 +1,12 @@
 var R = Object.defineProperty, O = Object.defineProperties;
 var X = Object.getOwnPropertyDescriptors;
-var N = Object.getOwnPropertySymbols;
+var F = Object.getOwnPropertySymbols;
 var Y = Object.prototype.hasOwnProperty, B = Object.prototype.propertyIsEnumerable;
 var E = (l, h, e) => h in l ? R(l, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[h] = e, P = (l, h) => {
   for (var e in h || (h = {}))
     Y.call(h, e) && E(l, e, h[e]);
-  if (N)
-    for (var e of N(h))
+  if (F)
+    for (var e of F(h))
       B.call(h, e) && E(l, e, h[e]);
   return l;
 }, M = (l, h) => O(l, X(h));
@@ -15,7 +15,7 @@ import { PointSelectorHelper as C } from "./utils/PointSelectorHelper.js";
 import { isTouchDevice as j } from "../../isTouchDevice.js";
 import * as o from "three";
 import { Subscribe as A } from "../../Subscribe.js";
-import { getIntersectByRaycaster as k, getVirtualIntersectByRaycaster as g } from "../../five/getPosition.js";
+import { getIntersectByRaycaster as g, getVirtualIntersectByRaycaster as k } from "../../five/getPosition.js";
 import { getRaycasterByNdcPosition as G } from "../../five/getRaycasterByNdcPosition.js";
 import { CURSOR_NOT_ALLOW_URL as V } from "./utils/contents.js";
 import { rayOnLine as W } from "../../../Sculpt/utils/three/rayOnLine.js";
@@ -182,8 +182,8 @@ class se extends A {
     i(this, "updateByNdcPosition", (e) => {
       var c, u, d;
       const t = G(this.five, e);
-      let s = k(this.five, t);
-      if (s) {
+      let s = g(this.five, t);
+      if (console.log("updateByNdcPosition", s, this.actionIfNoIntersection), s) {
         if (this.plane && this.planeMode === "vertical" && (s = M(P({}, s), {
           point: this.plane.projectPoint(s.point, new o.Vector3()),
           face: new o.Face3(0, 0, 0, this.plane.normal.clone()),
@@ -219,10 +219,10 @@ class se extends A {
       if (this.actionIfNoIntersection === "lastPoint")
         return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
       if (this.actionIfNoIntersection === "virtualPoint") {
-        const n = g(t, (c = this.lastIntersection) == null ? void 0 : c.distance);
+        const n = k(t, (c = this.lastIntersection) == null ? void 0 : c.distance);
         return n.face = new o.Face3(0, 0, 0, (d = (u = this.lastIntersection) == null ? void 0 : u.face) == null ? void 0 : d.normal), n.isVirtual = !0, this.lastIntersection = n, this.updatePointSelectorHelperIntersect(n), !0;
       } else if (this.actionIfNoIntersection === "disable")
-        return this.updatePointSelectorHelperIntersect(null), !1;
+        return this.updatePointSelectorHelperIntersect(null), this.emit("disableSelect"), !1;
     });
     /**
      * @description: 更新 pointSelectorHelper 的焦点位置
@@ -236,7 +236,7 @@ class se extends A {
       this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
       const t = P({}, e);
       if (this.adhereEnabled && this.mouseNdcPosition && this.five.renderer) {
-        const S = {
+        const I = {
           x: this.mouseNdcPosition.x,
           y: 1 - this.mouseNdcPosition.y
         }, H = this.five.renderer.getSize(new o.Vector2());
@@ -261,8 +261,8 @@ class se extends A {
                   x: (v.x + 1) / 2,
                   y: (1 - v.y) / 2
                 }, b = {
-                  x: Math.abs(y.x - S.x) * H.width,
-                  y: Math.abs(y.y - S.y) * H.height
+                  x: Math.abs(y.x - I.x) * H.width,
+                  y: Math.abs(y.y - I.y) * H.height
                 };
                 let m = p.clone();
                 b.x < 10 && b.y < 10 && (!this.plane || this.plane.distanceToPoint(m) < 0.01) && (m = (f = (n = this.plane) == null ? void 0 : n.projectPoint(m, new o.Vector3())) != null ? f : m, t.point = m.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
@@ -284,20 +284,20 @@ class se extends A {
                 x: (v.x + 1) / 2,
                 y: (1 - v.y) / 2
               }, m = {
-                x: Math.abs(b.x - S.x) * y.width,
-                y: Math.abs(b.y - S.y) * y.height
+                x: Math.abs(b.x - I.x) * y.width,
+                y: Math.abs(b.y - I.y) * y.height
               };
               if (m.x < 10 && m.y < 10) {
-                let I = !1;
+                let S = !1;
                 if (a.IsAlwaysVisible)
-                  I = !0;
+                  S = !0;
                 else {
                   const D = new o.Raycaster();
                   D.setFromCamera(a.clone(), this.five.camera);
-                  const F = this.five.model.intersectRaycaster(D, void 0, !0)[0], x = 0.1, U = this.five.camera.position.distanceTo(a);
-                  F && F.distance < U + x && (I = !0);
+                  const N = this.five.model.intersectRaycaster(D, void 0, !0)[0], x = 0.1, U = this.five.camera.position.distanceTo(a);
+                  N && N.distance < U + x && (S = !0);
                 }
-                if (I) {
+                if (S) {
                   t.point = a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
                   break;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.63.4-alpha.1",
+  "version": "3.63.4-alpha.3",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",