@realsee/dnalogel 3.75.1 → 3.76.0-alpha.1

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

@@ -1,6 +1,6 @@
 import type { Five } from '@realsee/five';
 import { PointSelectorHelper, type PointIntersection, type PointSelectorHelperConfig } from './utils/PointSelectorHelper';
-import type { Vector3 } from 'three';
+import type { Intersection, Vector3 } from 'three';
 import * as THREE from 'three';
 import { Subscribe } from '../../Subscribe';
 import type { LiteralString } from '../../../typings/utils.type';
@@ -39,6 +39,10 @@ interface Config {
      * @default false
      */
     skipPanorama: boolean;
+    /**
+     * five 6.7.0 特性，可配置是否自定义拾取点过滤函数
+     */
+    hitFilter: (intersect: Intersection) => boolean;
 }
 export type PointSelectorConfig = Partial<Config>;
 type EventMap = {

package/libs/PanoMeasurePlugin/Controller/ShortcutKeyController.js

@@ -1,7 +1,7 @@
-var s = Object.defineProperty;
-var i = (o, e, t) => e in o ? s(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
-var n = (o, e, t) => (i(o, typeof e != "symbol" ? e + "" : e, t), t);
-class u {
+var o = Object.defineProperty;
+var s = (r, e, t) => e in r ? o(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
+var n = (r, e, t) => (s(r, typeof e != "symbol" ? e + "" : e, t), t);
+class l {
   constructor(e, t) {
     n(this, "five");
     n(this, "measureController");
@@ -16,18 +16,15 @@ class u {
     n(this, "onMouseDown", (e) => {
       e.button === 2 && (e.preventDefault(), this.measureController.save().changeMode("Watch"));
     });
-    this.five = t, this.measureController = e;
-    const r = this.five.getElement();
-    r && (document.body.addEventListener("keydown", this.onKeyDown), r.addEventListener("mousedown", this.onMouseDown));
+    this.five = t, this.measureController = e, this.five.getElement() && document.body.addEventListener("keydown", this.onKeyDown);
   }
   dispose() {
-    const e = this.five.getElement();
-    e && (document.body.removeEventListener("keydown", this.onKeyDown), e.removeEventListener("mousedown", this.onMouseDown));
+    this.five.getElement() && document.body.removeEventListener("keydown", this.onKeyDown);
   }
   escape() {
     return this.measureController.getCurrentMode() === "Watch" ? this.measureController.disable() : this.measureController.save().changeMode("Watch");
   }
 }
 export {
-  u as ShortcutKeyController
+  l as ShortcutKeyController
 };

package/libs/Sculpt/index.d.ts

@@ -32,7 +32,7 @@ export interface SculptConfig {
     /**
      * @description 放大镜配置
      * 设置为 null 或 false 可禁用放大镜功能
-     * @default { width: 190, height: 190, scale: 2, dragEnabled: true }
+     * @default *{ width: 190, height: 190, scale: 2, dragEnabled: true }*
      */
     magnifier?: MagnifierParameter | null | false;
     /**
@@ -41,6 +41,11 @@ export interface SculptConfig {
      * @default false
      */
     hideCursorCircle?: boolean;
+    /**
+     * @description 是否自定义拾取点过滤函数
+     * @default false
+     */
+    hitFilter?: (intersect: THREE.Intersection) => boolean;
 }
 interface Data {
     items: Array<BuiltInData>;
@@ -236,7 +241,11 @@ export declare const SculptPlugin: (five: Five, themeOrParams?: Partial<{
     polyline: Partial<import("./typings").LineMeshStyle>;
     polygon: Partial<import("./typings").AreaStyle>;
     prism: Partial<import("./typings").PrismStyle>;
-    rectangle: Partial<import("./typings").RectangleStyle>;
+    rectangle: Partial<import("./typings").RectangleStyle>; /**
+     * @description prism 检测到自相交时的回调
+     * @param item Prism 实例
+     * @param point 尝试添加但被拒绝的点坐标
+     */
     circle: Partial<import("./typings").CircleStyle>;
     cylinder: Partial<import("./typings").CircleStyle>;
     box: Partial<import("./typings").BoxStyle>;

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

@@ -43,7 +43,8 @@ class D {
     let i = e === null || e === !1 ? { magnifier: null } : { magnifierParams: e };
     return (s = this.config) != null && s.hideCursorCircle && (i = f(h({}, i), { pointHelper: null })), this._pointSelector = new a(this.five, {
       mode: "cursor",
-      helper: i
+      helper: i,
+      hitFilter: this.config.hitFilter
     }), this._pointSelector;
   }
   get fiveDomEvents() {

package/libs/base/BasePlugin.js

@@ -1,7 +1,7 @@
 var e = Object.defineProperty;
 var s = (o, t, i) => t in o ? e(o, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[t] = i;
 var r = (o, t, i) => (s(o, typeof t != "symbol" ? t + "" : t, i), i);
-import { Subscribe as m } from "../shared-utils/Subscribe.js";
+import { Subscribe as l } from "../shared-utils/Subscribe.js";
 import "../shared-utils/tag.js";
 import "three";
 import "../vendor/hammerjs/hammer.js";
@@ -15,7 +15,7 @@ import "../shared-utils/three/blink.js";
 import "../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../vendor/earcut/src/earcut.js";
-import { FiveUtil as l } from "../shared-utils/Utils/FiveUtil.js";
+import { FiveUtil as m } from "../shared-utils/Utils/FiveUtil.js";
 import { DEFAULT_STATIC_PREFIX as p } from "../shared-utils/url/defaultUrls.js";
 import "../shared-utils/five/FivePuppet.js";
 let I = class {
@@ -23,7 +23,7 @@ let I = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    r(this, "VERSION", "3.75.1");
+    r(this, "VERSION", "3.76.0-alpha.1");
     r(this, "NAME");
     r(this, "five");
     r(this, "workUtil");
@@ -31,9 +31,9 @@ let I = class {
     /**
      * @description: 插件事件钩子
      */
-    r(this, "hooks", new m());
+    r(this, "hooks", new l());
     r(this, "staticPrefix", p);
-    this.five = t, this.fiveUtil = new l(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
+    this.five = t, this.fiveUtil = new m(t), this.workUtil = this.fiveUtil.workUtil, i != null && i.staticPrefix && (this.staticPrefix = i.staticPrefix);
   }
   set workCode(t) {
     this.workUtil.workCode = t, this.onWorkCodeChange();

package/libs/shared-utils/logger.js

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

@@ -1,6 +1,6 @@
 import type { Five } from '@realsee/five';
 import { PointSelectorHelper, type PointIntersection, type PointSelectorHelperConfig } from './utils/PointSelectorHelper';
-import type { Vector3 } from 'three';
+import type { Intersection, Vector3 } from 'three';
 import * as THREE from 'three';
 import { Subscribe } from '../../Subscribe';
 import type { LiteralString } from '../../../typings/utils.type';
@@ -39,6 +39,10 @@ interface Config {
      * @default false
      */
     skipPanorama: boolean;
+    /**
+     * five 6.7.0 特性，可配置是否自定义拾取点过滤函数
+     */
+    hitFilter: (intersect: Intersection) => boolean;
 }
 export type PointSelectorConfig = Partial<Config>;
 type EventMap = {

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

@@ -18,8 +18,8 @@ import { Subscribe as j } from "../../Subscribe.js";
 import { getIntersectByRaycaster as A, getVirtualIntersectByRaycaster as G } from "../../five/getPosition.js";
 import { getRaycasterByNdcPosition as W } from "../../five/getRaycasterByNdcPosition.js";
 import { CURSOR_NOT_ALLOW_URL as V } from "./utils/contents.js";
-import { rayOnLine as z } from "../../../Sculpt/utils/three/rayOnLine.js";
-import { THREERaycaster as K } from "../core/Raycaster.js";
+import { rayOnLine as g } from "../../../Sculpt/utils/three/rayOnLine.js";
+import { THREERaycaster as z } from "../core/Raycaster.js";
 const _ = new o.Vector3(), w = () => !1;
 class se extends j {
   constructor(e, t) {
@@ -182,6 +182,7 @@ class se extends j {
     i(this, "updateByNdcPosition", (e) => {
       var c, u, d;
       const t = W(this.five, e);
+      this.config.hitFilter && (t.hitFilter = this.config.hitFilter);
       let s = A(this.five, t);
       if (s) {
         if (this.plane && this.planeMode === "vertical" && (s = T(P({}, s), {
@@ -251,8 +252,8 @@ class se extends j {
             if (a.distanceTo(e.point) < this.adhereRadius)
               (!this.plane || this.plane.distanceToPoint(a) < 0.01) && (a = (d = (u = this.plane) == null ? void 0 : u.projectPoint(a, new o.Vector3())) != null ? d : a, t.point = a.clone(), t.adhereLine = r.clone(), t.isAdsorbed = !0);
             else {
-              const p = z({
-                raycaster: new K(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
+              const p = g({
+                raycaster: new z(this.five.camera.position, e.point.clone().sub(this.five.camera.position).normalize()),
                 line: r,
                 clampToLine: !1
               }), v = p.clone().project(this.five.camera);

package/package.json

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