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

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

@@ -1,12 +1,12 @@
 var R = Object.defineProperty, O = Object.defineProperties;
 var X = Object.getOwnPropertyDescriptors;
-var F = Object.getOwnPropertySymbols;
+var N = 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 (F)
-    for (var e of F(h))
+  if (N)
+    for (var e of N(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 g, getVirtualIntersectByRaycaster as k } from "../../five/getPosition.js";
+import { getIntersectByRaycaster as k, getVirtualIntersectByRaycaster as g } 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";
@@ -105,7 +105,7 @@ class se extends A {
      * @description: 鼠标离开five canvas时
      */
     i(this, "onMouseLeave", () => {
-      this.pointSelectorHelper.hide(), this.outOfFive = !0, this.emit("intersectionUpdate", null);
+      this.pointSelectorHelper.hide(), this.outOfFive = !0, this.emit("intersectionUpdate", void 0);
     });
     i(this, "onMouseDown", (e) => {
       this._mouseDownInfo = {
@@ -182,8 +182,8 @@ class se extends A {
     i(this, "updateByNdcPosition", (e) => {
       var c, u, d;
       const t = G(this.five, e);
-      let s = g(this.five, t);
-      if (console.log("updateByNdcPosition", s, this.actionIfNoIntersection), s) {
+      let s = k(this.five, t);
+      if (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,24 +219,24 @@ class se extends A {
       if (this.actionIfNoIntersection === "lastPoint")
         return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
       if (this.actionIfNoIntersection === "virtualPoint") {
-        const n = k(t, (c = this.lastIntersection) == null ? void 0 : c.distance);
+        const n = g(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), this.emit("disableSelect"), !1;
+        return this.updatePointSelectorHelperIntersect(null), !1;
     });
     /**
      * @description: 更新 pointSelectorHelper 的焦点位置
      */
     i(this, "updatePointSelectorHelperIntersect", (e) => {
-      var s, c, u, d, n, f, L, T;
+      var s, c, u, d, n, f, T, L;
       if (!e) {
-        this.onMouseLeave(), this.five.getElement().style.cursor = V;
+        this.pointSelectorHelper.hide(), this.pointSelectorHelper.position = e, this.emit("intersectionUpdate", e), this.five.getElement().style.cursor = V;
         return;
       }
       this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
       const t = P({}, e);
       if (this.adhereEnabled && this.mouseNdcPosition && this.five.renderer) {
-        const I = {
+        const S = {
           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 - I.x) * H.width,
-                  y: Math.abs(y.y - I.y) * H.height
+                  x: Math.abs(y.x - S.x) * H.width,
+                  y: Math.abs(y.y - S.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);
@@ -274,7 +274,7 @@ class se extends A {
             if (a.IsAlwaysVisible = r.IsAlwaysVisible, this.plane && this.plane.distanceToPoint(a) > 0.01)
               continue;
             if (a.distanceTo(e.point) < this.adhereRadius) {
-              t.point = (T = (L = this.plane) == null ? void 0 : L.projectPoint(a, new o.Vector3())) != null ? T : a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
+              t.point = (L = (T = this.plane) == null ? void 0 : T.projectPoint(a, new o.Vector3())) != null ? L : a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
               break;
             } else {
               const v = a.clone().project(this.five.camera);
@@ -284,20 +284,20 @@ class se extends A {
                 x: (v.x + 1) / 2,
                 y: (1 - v.y) / 2
               }, m = {
-                x: Math.abs(b.x - I.x) * y.width,
-                y: Math.abs(b.y - I.y) * y.height
+                x: Math.abs(b.x - S.x) * y.width,
+                y: Math.abs(b.y - S.y) * y.height
               };
               if (m.x < 10 && m.y < 10) {
-                let S = !1;
+                let I = !1;
                 if (a.IsAlwaysVisible)
-                  S = !0;
+                  I = !0;
                 else {
                   const D = new o.Raycaster();
                   D.setFromCamera(a.clone(), this.five.camera);
-                  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);
+                  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);
                 }
-                if (S) {
+                if (I) {
                   t.point = a.clone(), !this.plane && r instanceof o.Face3 && (t.face = r), t.isAdsorbed = !0;
                   break;
                 }
@@ -340,7 +340,8 @@ class se extends A {
     })), this.pointSelectorHelper.hide();
   }
   get position() {
-    return this.outOfFive ? null : this.pointSelectorHelper.position;
+    if (!this.outOfFive)
+      return this.pointSelectorHelper.position;
   }
   /**
    * @description: 不在 five canvas 上时为 true

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

@@ -50,7 +50,7 @@ export interface PointIntersection extends Intersection {
 export declare class PointSelectorHelper {
     five: Five;
     hooks: Subscribe<EventMap>;
-    position: PointIntersection | undefined;
+    position: PointIntersection | null;
     magnifier: Magnifier | null;
     pointHelper: PointHelperAbstract | null;
     state: {

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

@@ -13,7 +13,7 @@ class R {
   constructor(i, e) {
     t(this, "five");
     t(this, "hooks", new g());
-    t(this, "position");
+    t(this, "position", null);
     t(this, "magnifier", null);
     t(this, "pointHelper", null);
     t(this, "state", { enabled: !1, visible: !0 });
@@ -39,10 +39,10 @@ class R {
     });
     t(this, "abortUpdateMagnifier", () => {
     });
-    var s, n, h, l, f;
+    var s, n, l, h, f;
     this.five = i, this.magnifier = (e == null ? void 0 : e.magnifier) !== void 0 ? e.magnifier : new u(i, (s = e == null ? void 0 : e.magnifierParams) != null ? s : { dragEnabled: !0 });
     let r;
-    (e == null ? void 0 : e.pointHelper) === "default" || (e == null ? void 0 : e.pointHelper) === void 0 ? r = new b(i) : (e == null ? void 0 : e.pointHelper) === "highlight" ? r = new o(i) : r = e.pointHelper, this.pointHelper = r, this.group.name = "five-point-selector", this.five.scene.add(this.group), (f = this.magnifier) == null || f.appendTo((l = (h = e.container) != null ? h : (n = i.getElement()) == null ? void 0 : n.parentElement) != null ? l : document.body);
+    (e == null ? void 0 : e.pointHelper) === "default" || (e == null ? void 0 : e.pointHelper) === void 0 ? r = new b(i) : (e == null ? void 0 : e.pointHelper) === "highlight" ? r = new o(i) : r = e.pointHelper, this.pointHelper = r, this.group.name = "five-point-selector", this.five.scene.add(this.group), (f = this.magnifier) == null || f.appendTo((h = (l = e.container) != null ? l : (n = i.getElement()) == null ? void 0 : n.parentElement) != null ? h : document.body);
   }
   enable() {
     var i;

package/package.json

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

package/libs/Sculpt/utils/removeAllTag.js

@@ -1,13 +0,0 @@
-import { LightTag as a } from "../../shared-utils/tag.js";
-function s(o) {
-  n(o), o.traverse((r) => n(r));
-}
-function n(o) {
-  const r = o;
-  Array.isArray(r.doms) && r.doms[0] instanceof a && r.doms.forEach((t) => t.destroy());
-  const e = o;
-  e.dom && e.dom instanceof a && e.dom.destroy(), o.areaDom instanceof a && o.areaDom.destroy();
-}
-export {
-  s as removeAllTag
-};