@realsee/dnalogel 3.61.0 → 3.61.1-alpha.0

package/libs/Sculpt/utils/Modules/Global.js

@@ -1,11 +1,11 @@
 var r = Object.defineProperty;
-var n = (i, e, o) => e in i ? r(i, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : i[e] = o;
-var t = (i, e, o) => (n(i, typeof e != "symbol" ? e + "" : e, o), o);
-import { Cursor as s } from "./Cursor.js";
+var s = (i, e, o) => e in i ? r(i, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : i[e] = o;
+var t = (i, e, o) => (s(i, typeof e != "symbol" ? e + "" : e, o), o);
+import { Cursor as n } from "./Cursor.js";
 import { Object3DHelperController as l } from "../../../Object3DHelperPlugin/Controller.js";
 import { FiveDomEvents as h } from "../../../shared-utils/five/FiveDomEvents.js";
 import { PointSelector as c } from "../../../shared-utils/three/PointSelector/index.js";
-class f {
+class v {
   constructor() {
     t(this, "five");
     t(this, "_cursor");
@@ -19,27 +19,39 @@ class f {
   }
   get cursor() {
     if (!this.inited)
-      throw new Error("Global not inited");
-    return this._cursor ? this._cursor : (this._cursor = new s(this.five.getElement()), this._cursor);
+      throw new Error("请先调用 Sculpt.modules.init(five)");
+    return this._cursor ? this._cursor : (this._cursor = new n(this.five.getElement()), this._cursor);
+  }
+  set cursor(e) {
+    this._cursor = e;
   }
   get pointSelector() {
     if (!this.inited)
-      throw new Error("Global not inited");
+      throw new Error("请先调用 Sculpt.modules.init(five)");
     return this._pointSelector ? this._pointSelector : (this._pointSelector = new c(this.five, { mode: "cursor" }), this._pointSelector);
   }
+  set pointSelector(e) {
+    this._pointSelector = e;
+  }
   get fiveDomEvents() {
     if (!this.inited)
-      throw new Error("Global not inited");
+      throw new Error("请先调用 Sculpt.modules.init(five)");
     return this._fiveDomEvents ? this._fiveDomEvents : (this._fiveDomEvents = new h(this.five, { noEmitWhenNotInScene: !0 }), this._fiveDomEvents);
   }
+  set fiveDomEvents(e) {
+    this._fiveDomEvents = e;
+  }
   get object3DHelper() {
     if (!this.inited)
-      throw new Error("Global not inited");
+      throw new Error("请先调用 Sculpt.modules.init(five)");
     return this._object3DHelper ? this._object3DHelper : (this._object3DHelper = new l(this.five), this._object3DHelper);
   }
+  set object3DHelper(e) {
+    this._object3DHelper = e;
+  }
 }
-const v = new f();
-window.globalModules = v;
+const f = new v();
+window.globalModules = f;
 export {
-  v as globalModules
+  f as globalModules
 };

package/libs/base/BasePlugin.js

@@ -11,8 +11,8 @@ 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 { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
-import { absoluteUrl as a } from "../shared-utils/url/absoluteUrl.js";
+import { FiveUtil as a } from "../shared-utils/Utils/FiveUtil.js";
+import { absoluteUrl as m } from "../shared-utils/url/absoluteUrl.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../shared-utils/five/FivePuppet.js";
 let S = class {
@@ -20,7 +20,7 @@ let S = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    i(this, "VERSION", "3.61.0");
+    i(this, "VERSION", "3.61.1-alpha.0");
     i(this, "NAME");
     i(this, "five");
     i(this, "workUtil");
@@ -30,7 +30,7 @@ let S = class {
      */
     i(this, "hooks", new l());
     i(this, "staticPrefix", "//vr-image-4.realsee-cdn.cn");
-    this.five = t, this.fiveUtil = new m(t), this.workUtil = this.fiveUtil.workUtil, r != null && r.staticPrefix && (this.staticPrefix = r.staticPrefix);
+    this.five = t, this.fiveUtil = new a(t), this.workUtil = this.fiveUtil.workUtil, r != null && r.staticPrefix && (this.staticPrefix = r.staticPrefix);
   }
   set workCode(t) {
     this.workUtil.workCode = t, this.onWorkCodeChange();
@@ -51,7 +51,7 @@ let S = class {
    * @description: 获取静态资源的url
    */
   absoluteUrl(t) {
-    return a(this.staticPrefix, t);
+    return m(this.staticPrefix, t);
   }
   onWorkCodeChange() {
   }

package/libs/shared-utils/logger.js

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

@@ -91,6 +91,31 @@ export declare class PointSelector extends Subscribe<EventMap> {
     enable(): void;
     disable(): void;
     dispose(): void;
+    /**
+     * @description 设置吸附点
+     * @param points 吸附点，Vector3[] 或 () => Vector3[]
+     * @param radius 吸附半径，单位 m
+     * @example
+     * ```typescript
+     * // 在 (0,0,0) 点附近( 到 0,0,0 点距离小于0.1 )时，自动吸附到 (0,0,0)
+     * setAdherePoints([new THREE.Vector3(0, 0, 0)], 0.1)
+     *
+     * // 在 (1,1,1) 点或者 (2,2,2) 点附近时，自动吸附
+     * setAdherePoints([
+     *  new THREE.Vector3(1, 1, 1),
+     *  new THREE.Vector3(2, 2, 2),
+     * ])
+     *
+     * // 动态判断吸附点
+     * setAdherePoints((intersection) => {
+     *  if (intersection.y < 0) {
+     *    return [intersection.x, 0, intersection.z]
+     *  } else {
+     *    return []
+     *  }
+     * })
+     * ```
+     */
     setAdherePoints(points: Vector3[] | ((params: {
         intersection: PointIntersection;
         pointSelectorInstance: PointSelector;

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

@@ -19,7 +19,7 @@ import { getIntersectByRaycaster as D, getVirtualIntersectByRaycaster as L } fro
 import { getRaycasterByNdcPosition as T } from "../../five/getRaycasterByNdcPosition.js";
 import { CURSOR_NOT_ALLOW_URL as P } from "./utils/contents.js";
 const N = new d.Vector3(), c = () => !1;
-class V extends y {
+class g extends y {
   constructor(e, t) {
     var a, l, n;
     super();
@@ -168,13 +168,14 @@ class V extends y {
       this.onEnter(), this.cursorError || (this.five.getElement().style.cursor = "");
       const t = u({}, e);
       let o = !1;
-      if (typeof this.adherePoints == "function" && typeof this.adherePointsRadius == "number") {
-        for (const h of this.adherePoints({ intersection: e, pointSelectorInstance: this }))
-          if (h.distanceTo(e.point) < this.adherePointsRadius) {
+      if (typeof this.adherePoints == "function" && typeof this.adherePointsRadius == "number")
+        for (const h of this.adherePoints({ intersection: e, pointSelectorInstance: this })) {
+          const a = h.distanceTo(e.point);
+          if (console.log("distance: " + a, e.point), a < this.adherePointsRadius) {
             t.point = h.clone(), o = !0;
             break;
           }
-      }
+        }
       this.pointSelectorHelper.updateWithIntersect(t, { emitEvent: !1 }), this.emit("intersectionUpdate", t, o);
     });
     s(this, "mousePositionToNdcPosition", (e) => {
@@ -254,10 +255,35 @@ class V extends y {
   dispose() {
     this.disable(), this.pointSelectorHelper.dispose();
   }
+  /**
+   * @description 设置吸附点
+   * @param points 吸附点，Vector3[] 或 () => Vector3[]
+   * @param radius 吸附半径，单位 m
+   * @example
+   * ```typescript
+   * // 在 (0,0,0) 点附近( 到 0,0,0 点距离小于0.1 )时，自动吸附到 (0,0,0)
+   * setAdherePoints([new THREE.Vector3(0, 0, 0)], 0.1)
+   *
+   * // 在 (1,1,1) 点或者 (2,2,2) 点附近时，自动吸附
+   * setAdherePoints([
+   *  new THREE.Vector3(1, 1, 1),
+   *  new THREE.Vector3(2, 2, 2),
+   * ])
+   *
+   * // 动态判断吸附点
+   * setAdherePoints((intersection) => {
+   *  if (intersection.y < 0) {
+   *    return [intersection.x, 0, intersection.z]
+   *  } else {
+   *    return []
+   *  }
+   * })
+   * ```
+   */
   setAdherePoints(e, t) {
     e ? typeof e == "function" ? this.adherePoints = e : this.adherePoints = () => e : this.adherePoints = null, typeof t == "number" && (this.adherePointsRadius = t);
   }
 }
 export {
-  V as PointSelector
+  g as PointSelector
 };

package/package.json

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