@realsee/dnalogel 3.49.9 → 3.49.11

package/libs/Sculpt/Objects/Point/index.js

@@ -1,46 +1,46 @@
-var y = Object.defineProperty, b = Object.defineProperties;
-var u = Object.getOwnPropertyDescriptors;
+var g = Object.defineProperty, u = Object.defineProperties;
+var y = Object.getOwnPropertyDescriptors;
 var d = Object.getOwnPropertySymbols;
-var w = Object.prototype.hasOwnProperty, P = Object.prototype.propertyIsEnumerable;
-var a = (e, i, t) => i in e ? y(e, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[i] = t, n = (e, i) => {
+var P = Object.prototype.hasOwnProperty, w = Object.prototype.propertyIsEnumerable;
+var p = (e, i, t) => i in e ? g(e, i, { enumerable: !0, configurable: !0, writable: !0, value: t }) : e[i] = t, a = (e, i) => {
   for (var t in i || (i = {}))
-    w.call(i, t) && a(e, t, i[t]);
+    P.call(i, t) && p(e, t, i[t]);
   if (d)
     for (var t of d(i))
-      P.call(i, t) && a(e, t, i[t]);
+      w.call(i, t) && p(e, t, i[t]);
   return e;
-}, g = (e, i) => b(e, u(i));
-var M = (e, i, t) => (a(e, typeof i != "symbol" ? i + "" : i, t), t);
-var m = (e, i, t) => new Promise((o, h) => {
+}, m = (e, i) => u(e, y(i));
+var c = (e, i, t) => (p(e, typeof i != "symbol" ? i + "" : i, t), t);
+var b = (e, i, t) => new Promise((h, n) => {
   var r = (s) => {
     try {
-      l(t.next(s));
-    } catch (c) {
-      h(c);
+      o(t.next(s));
+    } catch (l) {
+      n(l);
     }
-  }, p = (s) => {
+  }, f = (s) => {
     try {
-      l(t.throw(s));
-    } catch (c) {
-      h(c);
+      o(t.throw(s));
+    } catch (l) {
+      n(l);
     }
-  }, l = (s) => s.done ? o(s.value) : Promise.resolve(s.value).then(r, p);
-  l((t = t.apply(e, i)).next());
+  }, o = (s) => s.done ? h(s.value) : Promise.resolve(s.value).then(r, f);
+  o((t = t.apply(e, i)).next());
 });
-import { PointMesh as f } from "../../Meshes/Point.js";
-import { BaseObject as x } from "../Base/index.js";
-import { PointEditor as j } from "./Editor.js";
-import { vector3ToArray as v } from "../../../shared-utils/three/vector3ToArray.js";
-class D extends x {
-  constructor(t, o) {
-    super(t, o);
-    M(this, "type", "Point");
-    M(this, "pointMesh");
-    this.editor = new j(this), t && (this.pointMesh = new f(n(n({}, t.style), t)), this.add(this.pointMesh));
+import { PointMesh as M } from "../../Meshes/Point.js";
+import { BaseObject as v } from "../Base/index.js";
+import { PointEditor as x } from "./Editor.js";
+import { vector3ToArray as E } from "../../../shared-utils/three/vector3ToArray.js";
+class C extends v {
+  constructor(t, h) {
+    super(t, h);
+    c(this, "type", "Point");
+    c(this, "pointMesh");
+    this.editor = new x(this), t && (this.pointMesh = new M(a(a({}, t.style), t)), this.add(this.pointMesh));
   }
   get data() {
-    return g(n({}, this.baseData), {
-      point: v(this.applyObjectMatrixWorld(this.pointMesh.position)),
+    return m(a({}, this.baseData), {
+      point: E(this.applyObjectMatrixWorld(this.pointMesh.position)),
       style: {
         color: this.pointMesh.color.getHex(),
         size: this.pointMesh.size
@@ -67,24 +67,27 @@ class D extends x {
    * @description: 创建点
    */
   create(t) {
-    return m(this, null, function* () {
-      this.pointMesh && this.remove(this.pointMesh), this.add(this.pointMesh = new f(t)), yield z(this.pointMesh, this.pointSelector), this.editor.enable();
+    return b(this, null, function* () {
+      this.pointMesh && this.remove(this.pointMesh), this.add(this.pointMesh = new M(t)), yield U(this.pointMesh, this.pointSelector), this.editor.enable();
     });
   }
 }
-function z(e, i) {
-  return new Promise((t, o) => {
-    i.enable();
-    const h = (r) => {
-      const { point: p } = r;
-      e.position.copy(p), t(), i.disable();
+function U(e, i) {
+  return new Promise((t, h) => {
+    i.enable(), e.visible = !1;
+    const n = (s) => {
+      s && (e.visible = !0, e.position.copy(s.point));
+    }, r = (s) => {
+      s && (e.position.copy(s.point), f());
+    }, f = () => {
+      i.off("select", r), i.off("disable", o), i.off("intersectionUpdate", n), i.disable(), t();
+    }, o = () => {
+      i.off("select", r), i.off("disable", o), i.off("intersectionUpdate", n), e.removeFromParent(), h(new Error("Cancelled"));
     };
-    i.on("disable", () => {
-      i.off("select", h), o(new Error("Cancelled"));
-    }), i.once("select", h);
+    i.on("intersectionUpdate", n), i.on("disable", o), i.once("select", r);
   });
 }
 export {
-  D as Point,
-  z as createPoint
+  C as Point,
+  U as createPoint
 };

package/libs/Sculpt/index.js

@@ -76,7 +76,7 @@ const h = class extends S {
     this.five = e, this.theme = t, this.group = new k(), this.group.name = "Sculpt", e.scene.add(this.group), h.modules.init(e), B("ctrl+z", this.undo), B("ctrl+shift+z", this.redo), h.modules.fiveDomEvents.addEventListener(this.group, "click", ({ intersects: n, origDomEvent: l }) => {
       var s;
       const o = M((s = n == null ? void 0 : n[0]) == null ? void 0 : s.object, (c) => c.isSculptObject);
-      return o ? this.emit("click", l, o) : !1;
+      return o && !o.editing ? this.emit("click", l, o) : !1;
     }), window.__SCULPT_DEBUG__ = this, window.__SCULPT_MODULES_DEBUG__ = h.modules;
   }
   get data() {

package/libs/Sculpt/typings/style.d.ts

@@ -57,4 +57,10 @@ export type OcclusionStyle = {
      */
     occlusionMode: 'translucence' | 'depthTest';
 };
+export type lengthConfig = {
+    lengthEnable: boolean;
+};
+export type DisplayInfoConfig = {
+    tip: string;
+};
 export type LineStyle = LineColorStyle & LineWidthStyle & OpacityStyle;

package/libs/base/BasePlugin.js

@@ -18,7 +18,7 @@ let P = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.49.9");
+    i(this, "VERSION", "3.49.11");
     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.49.9",
+    "%c %c@realsee/dnalogel %cv3.49.11",
     [
       "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

@@ -107,7 +107,7 @@ export declare class PointSelector extends Subscribe<EventMap> {
      * @description: 鼠标离开five canvas时
      */
     private onLeave;
-    private onTap;
+    private onClick;
     /**
      * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
      * 2. 如果有长按点，把长按点位置更新为当前位置

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

@@ -16,11 +16,11 @@ import { isTouchDevice as v } from "../../isTouchDevice.js";
 import M from "hammerjs";
 import * as d from "three";
 import { Subscribe as N } from "../../Subscribe.js";
-import { getIntersectByRaycaster as F, getVirtualIntersectByRaycaster as U } from "../../five/getPosition.js";
-import { getRaycasterByNdcPosition as T } from "../../five/getRaycasterByNdcPosition.js";
+import { getIntersectByRaycaster as F, getVirtualIntersectByRaycaster as L } from "../../five/getPosition.js";
+import { getRaycasterByNdcPosition as U } from "../../five/getRaycasterByNdcPosition.js";
 import { CURSOR_NOT_ALLOW_URL as P } from "./utils/contents.js";
-const L = new d.Vector3(), u = () => !1;
-class G extends N {
+const C = new d.Vector3(), u = () => !1;
+class k extends N {
   constructor(e, t) {
     var a, o, c;
     super();
@@ -73,11 +73,8 @@ class G extends N {
     i(this, "onLeave", () => {
       this.pointSelectorHelper.hide(), this.outOfFive = !0, this.emit("intersectionUpdate", null);
     });
-    i(this, "onTap", (e) => {
-      e != null && e.center && (this.mousePosition = {
-        clientX: e.center.x,
-        clientY: e.center.y
-      }), this.select();
+    i(this, "onClick", () => {
+      this.select();
     });
     /**
      * 1. 如果之前没有长按行为「即没有长按点时」-> 滑动全景
@@ -117,11 +114,11 @@ class G extends N {
      */
     i(this, "updateByNdcPosition", (e) => {
       var h, a;
-      const t = T(this.five, e), r = F(this.five, t);
+      const t = U(this.five, e), r = F(this.five, t);
       if (r)
         return this.updatePointSelectorHelperIntersect(r), this.lastIntersection = r, !0;
       if (this.plane) {
-        const o = t.ray.intersectPlane(this.plane, L);
+        const o = t.ray.intersectPlane(this.plane, C);
         if (o) {
           const c = {
             distance: this.five.camera.position.distanceTo(o),
@@ -137,7 +134,7 @@ class G extends N {
       if (this.actionIfNoModelUnderMouse === "lastPoint")
         return this.updatePointSelectorHelperIntersect(this.lastIntersection), !0;
       if (this.actionIfNoModelUnderMouse === "virtualPoint") {
-        const o = U(t, (h = this.lastIntersection) == null ? void 0 : h.distance);
+        const o = L(t, (h = this.lastIntersection) == null ? void 0 : h.distance);
         return o.face = new d.Face3(0, 0, 0, (a = this.lastIntersection) == null ? void 0 : a.face.normal), o.isVirtual = !0, this.lastIntersection = o, this.updatePointSelectorHelperIntersect(o), !0;
       } else if (this.actionIfNoModelUnderMouse === "disable")
         return this.updatePointSelectorHelperIntersect(null), !1;
@@ -227,14 +224,14 @@ class G extends N {
     const e = this.five.getElement();
     if (!e)
       throw new Error("five element not found");
-    this.hammer || (this.hammer = new M(e)), this.mode === "cursor" ? (this.five.on("wantsMoveToPano", u), this.five.on("wantsChangeMode", u), this.five.on("wantsTapGesture", u), e.addEventListener("mousemove", this.updateByMousePosition), v || e.addEventListener("wheel", this.onMouseWheel), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.hammer.on("tap", this.onTap), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : this.mode === "fixed" && (this.five.on("panoArrived", this.renderScreenCenter), this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate), this.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, this.emit("enable");
+    this.hammer || (this.hammer = new M(e)), this.mode === "cursor" ? (this.five.on("wantsMoveToPano", u), this.five.on("wantsChangeMode", u), this.five.on("wantsTapGesture", u), e.addEventListener("mousemove", this.updateByMousePosition), v || e.addEventListener("wheel", this.onMouseWheel), e.addEventListener("click", this.onClick), e.addEventListener("mouseenter", this.onEnter), e.addEventListener("mouseout", this.onLeave), this.five.on("wantsPanGesture", this.onFiveWantsPanGesture), this.hammer.on("pan", this.onPan), this.hammer.on("press", this.onPress), this.hammer.on("panend", this.onPanEnd)) : this.mode === "fixed" && (this.five.on("panoArrived", this.renderScreenCenter), this.five.on("panGesture", this.renderScreenCenter), this.five.on("interiaPan", this.renderScreenCenter), this.renderScreenCenter(), this.pointSelectorHelper.show()), this.pointSelectorHelper.hooks.on("intersectionUpdate", this.emitIntersectionUpdate), this.lastFiveHelperVisible = this.five.helperVisible, this.five.helperVisible = !1, this.emit("enable");
   }
   disable() {
     if (!this.enabled)
       return;
     this.enabled = !1, this.pointSelectorHelper.disable(), this.five.getElement().style.cursor = "";
     const e = this.five.getElement();
-    this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", u), this.five.off("wantsChangeMode", u), this.five.off("wantsTapGesture", u), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.onMouseWheel), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), this.hammer.off("tap", this.onTap), this.hammer.off("pan", this.onPan), this.hammer.off("press", this.onPress), this.hammer.off("panend", this.onPanEnd), this.five.off("panoArrived", this.renderScreenCenter), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate), this.emit("disable");
+    this.five.off("wantsPanGesture", this.onFiveWantsPanGesture), this.five.off("wantsMoveToPano", u), this.five.off("wantsChangeMode", u), this.five.off("wantsTapGesture", u), this.five.helperVisible = this.lastFiveHelperVisible, e == null || e.removeEventListener("mousemove", this.updateByMousePosition), e == null || e.removeEventListener("wheel", this.onMouseWheel), e == null || e.removeEventListener("mouseenter", this.onEnter), e == null || e.removeEventListener("mouseout", this.onLeave), e == null || e.removeEventListener("click", this.onClick), this.hammer.off("pan", this.onPan), this.hammer.off("press", this.onPress), this.hammer.off("panend", this.onPanEnd), this.five.off("panoArrived", this.renderScreenCenter), this.five.off("panGesture", this.renderScreenCenter), this.five.off("interiaPan", this.renderScreenCenter), this.pointSelectorHelper.hooks.off("intersectionUpdate", this.emitIntersectionUpdate), this.emit("disable");
   }
   dispose() {
     this.disable(), this.pointSelectorHelper.dispose();
@@ -244,5 +241,5 @@ class G extends N {
   }
 }
 export {
-  G as PointSelector
+  k as PointSelector
 };

package/package.json

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