@realsee/dnalogel 3.48.7 → 3.49.0

package/libs/shared-utils/Object3DHelper/Controller/ScaleController.js

@@ -1,45 +1,48 @@
-var p = Object.defineProperty;
-var u = (h, r, t) => r in h ? p(h, r, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[r] = t;
-var l = (h, r, t) => (u(h, typeof r != "symbol" ? r + "" : r, t), t);
-import { BaseController as b } from "../Base/BaseController.js";
-import * as g from "three";
-import { getMouseRaycaster as P } from "../utils/getMouseRaycaster.js";
-import { rayOnLine as f } from "../../../Sculpt/utils/three/rayOnLine.js";
-class H extends b {
+var f = Object.defineProperty;
+var v = (d, a, t) => a in d ? f(d, a, { enumerable: !0, configurable: !0, writable: !0, value: t }) : d[a] = t;
+var c = (d, a, t) => (v(d, typeof a != "symbol" ? a + "" : a, t), t);
+import { BaseController as p } from "../Base/BaseController.js";
+import * as m from "three";
+import { getMouseRaycaster as E } from "../utils/getMouseRaycaster.js";
+import { rayOnLine as g } from "../../../Sculpt/utils/three/rayOnLine.js";
+class S extends p {
   constructor(...t) {
     super(...t);
-    l(this, "name", "ScaleController");
-    l(this, "startInfo");
-    l(this, "dragStart", (t) => {
+    c(this, "name", "ScaleController");
+    c(this, "startInfo");
+    c(this, "dragStart", (t) => {
       if (this.isDragging)
         return;
       this.isDragging = !0;
-      const { intersect: e } = t, a = this.camera.position, o = e.object, i = o.scalePosition.basePosition.clone(), s = o.scalePosition.handlePosition.clone().clone().sub(i).clone(), n = new g.Line3(i, i.clone().add(s.normalize().multiplyScalar(5)));
+      const { intersect: e } = t, o = this.camera.position, s = e.object, i = s.scalePosition.basePosition.clone(), r = s.scalePosition.handlePosition.clone().clone().sub(i).clone(), n = new m.Line3(i, i.clone().add(r.normalize().multiplyScalar(5)));
       n.applyMatrix4(this.helperObject3D.matrixWorld);
-      const c = new g.Raycaster(a, e.point.clone().sub(a)), m = f({ raycaster: c, line: n });
-      this.startInfo = { line: n, scaleStartPoint: m, draggingObject: o }, this.hooks.emit("scaleStart");
+      const h = new m.Raycaster(o, e.point.clone().sub(o)), u = g({ raycaster: h, line: n });
+      this.startInfo = { line: n, scaleStartPoint: u, draggingObject: s }, this.hooks.emit("scaleStart");
     });
-    l(this, "dragging", (t) => {
+    c(this, "dragging", (t) => {
       if (!this.isDragging || !this.startInfo)
         return;
-      const e = P(this.camera, t, this.container);
-      return e ? (this.scale(e), !1) : this.dragEnd();
+      const e = "touches" in t ? t.touches[0].clientX : t.x, o = "touches" in t ? t.touches[0].clientY : t.y, s = E(this.camera, { x: e, y: o }, this.container);
+      return s ? (this.scale(s), !1) : this.dragEnd();
     });
-    l(this, "scale", (t) => {
-      var n, c;
+    c(this, "scale", (t) => {
+      var n, h;
       if (!this.startInfo)
         return;
-      const { line: e, scaleStartPoint: a, draggingObject: o } = this.startInfo, { scalePosition: i } = o, { basePosition: d } = i, s = f({ raycaster: t, line: e });
-      s.applyMatrix4(new g.Matrix4().getInverse(this.helperObject3D.matrixWorld.clone())), (c = (n = this.config) == null ? void 0 : n.scaleCallback) == null || c.call(n, {
-        ratio: s.distanceTo(d) / a.distanceTo(d),
-        intersectPoint: s,
+      const { line: e, scaleStartPoint: o, draggingObject: s } = this.startInfo, { scalePosition: i } = s, { basePosition: l } = i, r = g({ raycaster: t, line: e });
+      r.applyMatrix4(new m.Matrix4().getInverse(this.helperObject3D.matrixWorld.clone())), (h = (n = this.config) == null ? void 0 : n.scaleCallback) == null || h.call(n, {
+        ratio: r.distanceTo(l) / o.distanceTo(l),
+        intersectPoint: r,
         scalePosition: i
-      }), o.position.copy(s.clone());
+      }), s.position.copy(r.clone());
     });
-    l(this, "dragEnd", () => {
+    c(this, "dragEnd", () => {
       this.isDragging && (this.startInfo = void 0, this.isDragging = !1, this.internalHooks.emit("initialHelperPosition"), this.hooks.emit("scaleEnd"));
     });
-    this.domEvents.addEventListener(this.helperObject3D, "mousedown", this.dragStart), document.addEventListener("mousemove", this.dragging), document.addEventListener("mouseup", this.dragEnd);
+    const e = this.show.bind(this), o = this.hide.bind(this);
+    this.domEvents.addEventListener(this.helperObject3D, "mousedown", this.dragStart), document.addEventListener("mousemove", this.dragging), document.addEventListener("mouseup", this.dragEnd), this.domEvents.addEventListener(this.helperObject3D, "touchstart", this.dragStart), document.addEventListener("touchmove", this.dragging), document.addEventListener("touchend", this.dragEnd), this.hooks.on("rotateStart", o), this.hooks.on("rotateEnd", e), this.hooks.on("moveStart", o), this.hooks.on("moveEnd", e), this.hooks.on("moveByMouseEnable", o), this.hooks.on("moveByMouseDisable", e), this.disposers.push(() => {
+      this.domEvents.removeEventListener(this.helperObject3D, "mousedown", this.dragStart), document.removeEventListener("mousemove", this.dragging), document.removeEventListener("mouseup", this.dragEnd), this.domEvents.removeEventListener(this.helperObject3D, "touchstart", this.dragStart), document.removeEventListener("touchmove", this.dragging), document.removeEventListener("touchend", this.dragEnd), this.hooks.off("rotateStart", o), this.hooks.off("rotateEnd", e), this.hooks.off("moveStart", o), this.hooks.off("moveEnd", e), this.hooks.off("moveByMouseEnable", o), this.hooks.off("moveByMouseDisable", e);
+    });
   }
   initialHelperQuaternion() {
     this.helperObject3D.initQuaternion();
@@ -50,13 +53,13 @@ class H extends b {
     t.offHoverListener && t.offHoverListener(), t.offHoverListener = this.hoverListener(this.helperObject3D.scaleMeshes);
   }
   setScale(t) {
-    var s, n, c;
-    let e = 1, a = 1, o = 1;
-    typeof t == "number" ? (e = t, a = t, o = t) : typeof t == "object" && (e = (s = t.x) != null ? s : 1, a = (n = t.y) != null ? n : 1, o = (c = t.z) != null ? c : 1);
-    const i = new g.Vector3(e, a, o);
+    var r, n, h;
+    let e = 1, o = 1, s = 1;
+    typeof t == "number" ? (e = t, o = t, s = t) : typeof t == "object" && (e = (r = t.x) != null ? r : 1, o = (n = t.y) != null ? n : 1, s = (h = t.z) != null ? h : 1);
+    const i = new m.Vector3(e, o, s);
     this.hooks.emit("wantToScale", i) || (this.originObject3D.scale.copy(i), this.internalHooks.emit("setObjectScale", i), this.hooks.emit("scale", i), this.render());
   }
 }
 export {
-  H as ScaleController
+  S as ScaleController
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.48.7",
+    "%c %c@realsee/dnalogel %cv3.49.0",
     [
       "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

@@ -6,12 +6,13 @@ import { Subscribe } from '../../Subscribe';
 import type { LiteralString } from '../../../typings/utils.type';
 export type { PointIntersection };
 export type ActionIfNoModelUnderMouse = LiteralString<'virtualPoint' | 'lastPoint' | 'disable'>;
+type PointerSelectorMode = 'fixed' | 'cursor';
 interface Config {
     /**
      * @description: 选点的两种模式, 'fixed' 为固定选点为屏幕中心点，拖动five画布来更新点，'cursor' 为跟随鼠标移动来更新点, 'auto' 则根据设备类型自动选择
      * @default: 'auto'
      */
-    mode: 'fixed' | 'cursor' | 'auto';
+    mode: PointerSelectorMode | 'auto';
     /**
      * @description 当鼠标位置没有模型时的行为
      * ```markdown

package/libs/shared-utils/three/generatePolygonGeometry.d.ts

@@ -1,7 +1,7 @@
 import type { Vector3 } from 'three';
 import * as THREE from 'three';
 /**
- * @description: 根据多边形的顶点数组生成多边形的 BufferGeometry
+ * @description 根据多边形的顶点数组生成多边形的 BufferGeometry
  * @param checkLinesIntersect 检查多边形边线是否相交,需要保证传入的顶点是有序的
  */
 export default function generatePolygonGeometry(_points: Vector3[], config?: {

package/libs/shared-utils/three/generatePolygonGeometry.js

@@ -1,23 +1,21 @@
 import * as i from "three";
-import { earcut3D as c } from "./earcut3D.js";
+import { earcut3D as f } from "./earcut3D.js";
 import { isIntersecting as m } from "../../PanoMeasurePlugin/utils/isIntersecting.js";
 function h(a, s) {
   const t = [...new Set(a)];
   if (t.length < 3)
     return;
   if (t.at(-1).equals(t[0]) || t.push(t[0]), s != null && s.checkLinesIntersect && t.length >= 5) {
-    const e = t.map((r, n) => {
-      if (n !== 0)
-        return { start: t[n - 1], end: t[n] };
+    const e = t.map((r, o) => {
+      if (o !== 0)
+        return { start: t[o - 1], end: t[o] };
     }).filter(Boolean);
-    for (let r = 0; r < e.length; r++) {
-      const n = m(e[r], e.slice(r));
-      if (n && console.log("多边形边线相交", r, t), n)
+    for (let r = 0; r < e.length; r++)
+      if (m(e[r], e.slice(r)))
         return;
-    }
   }
-  const l = t.flatMap((e) => [e.x, e.y, e.z]), u = new i.Float32BufferAttribute(l, 3), f = c(t), o = new i.BufferGeometry();
-  return o.setAttribute("position", u), o.setIndex(f), o.name = "PolygonGeometry", o;
+  const u = t.flatMap((e) => [e.x, e.y, e.z]), l = new i.Float32BufferAttribute(u, 3), c = f(t), n = new i.BufferGeometry();
+  return n.setAttribute("position", l), n.setIndex(c), n.name = "PolygonGeometry", n;
 }
 export {
   h as generatePolygonGeometry

package/package.json

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