@realsee/dnalogel 2.28.6 → 2.29.0-dev.1

package/libs/index.js

@@ -1,58 +1,58 @@
 import { consoleVersion as o } from "./shared-utils/logger.js";
 import { autoFixOffscreenCanvas as r } from "./shared-utils/offscreenCanvas.js";
-import { PaintBrush as cp } from "./components/PaintBrush/index.js";
-import { PaintBrushTypeEnum as Np } from "./components/PaintBrush/typings.js";
-import { ModelViewPlugin as wp } from "./ModelViewPlugin/Plugin.js";
-import { CSS3DRenderPlugin as Hp } from "./CSS3DRenderPlugin/index.js";
-import { PanoCursorRaycasterPlugin as jp } from "./PanoCursorRaycasterPlugin/index.js";
-import { ModelRoomLabelPlugin as kp, modelRoomLabelPluginServerParams as qp } from "./ModelRoomLabelPlugin/index.js";
-import { FLOOR_PLAN_ATTACHED_TO as Jp } from "./floorplan/constant.js";
-import { ModelFloorplanPlugin as Qp } from "./floorplan/ModelFloorplanPlugin/index.js";
-import { MapviewFloorplanPlugin as Xp } from "./floorplan/MapviewFloorplanPlugin/index.js";
-import { TopviewFloorplanPlugin as oe } from "./floorplan/TopviewFloorplanPlugin/index.js";
-import { PanoFloorplanRadarPlugin as te } from "./floorplan/PanoFloorplanRadarPlugin/index.js";
-import { FLOOR_TYPE_MAP as me, ROOM_FETILE_TYPE_MAP as pe, ROOM_TYPE_MAP as ee } from "./floorplan/typings/floorplanServerData.js";
-import { ModelChassisCompassPlugin as le } from "./ModelChassisCompassPlugin/Plugin.js";
-import { ModelEntryDoorGuidePlugin as Pe } from "./ModelEntryDoorGuidePlugin/Plugin.js";
-import { CameraMovementPlugin as ue } from "./CameraMovementPlugin/CameraMovementPlugin.js";
-import { CameraMovementEffect as ge, Rotation as se } from "./CameraMovementPlugin/typing.js";
-import { PanoRulerPlugin as Me } from "./PanoRulerPlugin/Plugin.js";
-import { PanoRulerProPlugin as Le } from "./PanoRulerProPlugin/index.js";
-import { PanoCompassPlugin as _e } from "./PanoCompassPlugin/index.js";
-import { PanoMeasurePlugin as Re } from "./PanoMeasurePlugin/index.js";
-import { PanoSpatialTagPlugin as Oe } from "./PanoSpatialTagPlugin/Plugin.js";
-import { modelItemLabelPluginServerParams as Ae } from "./ModelItemLabelPlugin/index.js";
-import { ModelTVVideoPlugin as De } from "./ModelTVVideoPlugin/Plugin.js";
-import { DIRECTION as be } from "./ModelTVVideoPlugin/typings.js";
-import { itemLabelPluginServerParams as Ye } from "./ItemLabelPlugin/index.js";
-import { PanoDoorLabelPlugin as ce } from "./PanoDoorLabelPlugin/index.js";
-import { GuideLinePlugin as Ne } from "./GuideLinePlugin/index.js";
-import { CruisePlugin as we } from "./CruisePlugin/index.js";
-import { PanoTagPlugin as He } from "./PanoTagPlugin/index.js";
-import { Object3DHelperPlugin as je } from "./Object3DHelperPlugin/index.js";
-import { PanoVideoPlugin as ke } from "./PanoVideoPlugin/index.js";
-import { PipelinePlugin as ze } from "./PipelinePlugin/index.js";
-import { AreaMakerPlugin as Ke } from "./AreaMakerPlugin/index.js";
-import { index as We } from "./shared-utils/index.js";
-import { CSS3DRender as Ze } from "./CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-import { Model as rn } from "./PanoMeasurePlugin/Model/index.js";
-import { default as mn } from "./PanoMeasurePlugin/Model/point.js";
-import { default as en } from "./PanoMeasurePlugin/Model/line.js";
-import { Polyline as ln } from "./PanoMeasurePlugin/Model/polyline.js";
-import { default as Pn } from "./PanoMeasurePlugin/Modules/Magnifier.js";
-import { DISPLAY_STRATEGY_TYPE as un } from "./ModelItemLabelPlugin/typings.js";
-import { ModelItemLabelPlugin as gn } from "./ModelItemLabelPlugin/ModelItemLabelPlugin.js";
-import { ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE as dn } from "./ItemLabelPlugin/typings.js";
-import { Plugin as Tn } from "./ItemLabelPlugin/Plugin.js";
-import { GuideLineItem$1 as Cn } from "./GuideLinePlugin/GuideLineItem/index.js";
-import { GuideLineModeItem$1 as En } from "./GuideLinePlugin/GuideLineModeItem/index.js";
-import { default as In } from "./CruisePlugin/Controller.js";
-import { typing as yn } from "./CruisePlugin/typing/index.js";
-import { default as Sn, pluginFlag as Dn } from "./PanoTagPlugin/controller/index.js";
-import { defaultGlobalConfig as bn } from "./PanoTagPlugin/typings/tag/TagConfig.js";
-import { ContentType as Yn, DimensionType as vn, PointType as cn } from "./PanoTagPlugin/Archive/deprecated.js";
-import { Object3DHelperController as Nn, PLUGIN as hn } from "./Object3DHelperPlugin/Controller.js";
-import { typings as Bn } from "./PanoVideoPlugin/typings/index.js";
+import { PaintBrush as Vp } from "./components/PaintBrush/index.js";
+import { PaintBrushTypeEnum as hp } from "./components/PaintBrush/typings.js";
+import { ModelViewPlugin as Bp } from "./ModelViewPlugin/Plugin.js";
+import { CSS3DRenderPlugin as Up } from "./CSS3DRenderPlugin/index.js";
+import { PanoCursorRaycasterPlugin as $p } from "./PanoCursorRaycasterPlugin/index.js";
+import { ModelRoomLabelPlugin as qp, modelRoomLabelPluginServerParams as zp } from "./ModelRoomLabelPlugin/index.js";
+import { FLOOR_PLAN_ATTACHED_TO as Kp } from "./floorplan/constant.js";
+import { ModelFloorplanPlugin as Wp } from "./floorplan/ModelFloorplanPlugin/index.js";
+import { MapviewFloorplanPlugin as Zp } from "./floorplan/MapviewFloorplanPlugin/index.js";
+import { TopviewFloorplanPlugin as re } from "./floorplan/TopviewFloorplanPlugin/index.js";
+import { PanoFloorplanRadarPlugin as ie } from "./floorplan/PanoFloorplanRadarPlugin/index.js";
+import { FLOOR_TYPE_MAP as pe, ROOM_FETILE_TYPE_MAP as ee, ROOM_TYPE_MAP as ne } from "./floorplan/typings/floorplanServerData.js";
+import { ModelChassisCompassPlugin as ae } from "./ModelChassisCompassPlugin/Plugin.js";
+import { ModelEntryDoorGuidePlugin as fe } from "./ModelEntryDoorGuidePlugin/Plugin.js";
+import { CameraMovementPlugin as xe } from "./CameraMovementPlugin/CameraMovementPlugin.js";
+import { CameraMovementEffect as se, Rotation as de } from "./CameraMovementPlugin/typing.js";
+import { PanoRulerPlugin as Te } from "./PanoRulerPlugin/Plugin.js";
+import { PanoRulerProPlugin as Ce } from "./PanoRulerProPlugin/index.js";
+import { PanoCompassPlugin as Ee } from "./PanoCompassPlugin/index.js";
+import { PanoMeasurePlugin as Ie } from "./PanoMeasurePlugin/index.js";
+import { PanoSpatialTagPlugin as ye } from "./PanoSpatialTagPlugin/Plugin.js";
+import { modelItemLabelPluginServerParams as Se } from "./ModelItemLabelPlugin/index.js";
+import { ModelTVVideoPlugin as Ge } from "./ModelTVVideoPlugin/Plugin.js";
+import { DIRECTION as Fe } from "./ModelTVVideoPlugin/typings.js";
+import { itemLabelPluginServerParams as ve } from "./ItemLabelPlugin/index.js";
+import { PanoDoorLabelPlugin as Ve } from "./PanoDoorLabelPlugin/index.js";
+import { GuideLinePlugin as he } from "./GuideLinePlugin/index.js";
+import { CruisePlugin as Be } from "./CruisePlugin/index.js";
+import { PanoTagPlugin as Ue } from "./PanoTagPlugin/index.js";
+import { Object3DHelperPlugin as $e } from "./Object3DHelperPlugin/index.js";
+import { PanoVideoPlugin as qe } from "./PanoVideoPlugin/index.js";
+import { PipelinePlugin as Je } from "./PipelinePlugin/index.js";
+import { AreaMakerPlugin as Qe } from "./AreaMakerPlugin/index.js";
+import { index as Xe } from "./shared-utils/index.js";
+import { CSS3DRender as on } from "./CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import { Model as tn } from "./PanoMeasurePlugin/Model/index.js";
+import { default as pn } from "./PanoMeasurePlugin/Model/point.js";
+import { default as nn } from "./PanoMeasurePlugin/Model/line.js";
+import { Polyline as an } from "./PanoMeasurePlugin/Model/polyline.js";
+import { default as fn } from "./PanoMeasurePlugin/Modules/Magnifier.js";
+import { DISPLAY_STRATEGY_TYPE as xn } from "./ModelItemLabelPlugin/typings.js";
+import { ModelItemLabelPlugin as sn } from "./ModelItemLabelPlugin/ModelItemLabelPlugin.js";
+import { ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE as Mn } from "./ItemLabelPlugin/typings.js";
+import { Plugin as Ln } from "./ItemLabelPlugin/Plugin.js";
+import { GuideLineItem$1 as _n } from "./GuideLinePlugin/GuideLineItem/index.js";
+import { GuideLineModeItem$1 as Rn } from "./GuideLinePlugin/GuideLineModeItem/index.js";
+import { default as On } from "./CruisePlugin/Controller.js";
+import { typing as An } from "./CruisePlugin/typing/index.js";
+import { default as Dn, pluginFlag as Gn } from "./PanoTagPlugin/controller/index.js";
+import { defaultGlobalConfig as Fn } from "./PanoTagPlugin/typings/tag/TagConfig.js";
+import { ContentType as vn, DimensionType as cn, PointType as Vn } from "./PanoTagPlugin/Archive/deprecated.js";
+import { Object3DHelperController as hn, PLUGIN as wn } from "./Object3DHelperPlugin/Controller.js";
+import { typings as Hn } from "./PanoVideoPlugin/typings/index.js";
 import "./components/PaintBrush/Controller.js";
 import "./components/PaintBrush/utils.js";
 import "./components/PaintBrush/tween.js";
@@ -278,7 +278,7 @@ import "./shared-utils/three/loadVideoTexture.js";
 import "./shared-utils/three/getPositionsByObjectFit.js";
 import "./shared-utils/three/FragmentTransparencyMaterial.js";
 import "./shared-utils/five/FiveDomEvents.js";
-import "./shared-utils/threex/domevents/index.js";
+import "./shared-utils/three/getObjectVisible.js";
 import "./shared-utils/five/getFloorIndex.js";
 import "./shared-utils/util.js";
 import "./PanoTagPlugin/Components/TagContainer.js";
@@ -372,6 +372,7 @@ import "./shared-utils/Object3DHelper/Helper/BoundingBoxHelper.js";
 import "./shared-utils/Object3DHelper/utils/boundingBox.js";
 import "./shared-utils/Object3DHelper/Controller/MoveController.js";
 import "./shared-utils/Object3DHelper/Base/BaseController.js";
+import "./shared-utils/threex/domevents/index.js";
 import "./shared-utils/Object3DHelper/utils/getMouseRaycaster.js";
 import "./shared-utils/Object3DHelper/utils/calculateThreeMouse.js";
 import "./Object3DHelperPlugin/FiveControllerWrapper.js";
@@ -408,65 +409,65 @@ import "./shared-utils/three/getRaycaster.js";
 r();
 o();
 export {
-  Ke as AreaMakerPlugin,
-  Ze as CSS3DRender,
-  Hp as CSS3DRenderPlugin,
-  ge as CameraMovementEffect,
-  ue as CameraMovementPlugin,
-  Yn as ContentType,
-  we as CruisePlugin,
-  In as CruisePluginController,
-  yn as CruisePluginTypes,
-  be as DIRECTION,
-  un as DISPLAY_STRATEGY_TYPE,
-  vn as DimensionType,
-  Jp as FLOOR_PLAN_ATTACHED_TO,
-  me as FLOOR_TYPE_MAP,
-  Cn as GuideLineItem,
-  En as GuideLineModeItem,
-  Ne as GuideLinePlugin,
-  dn as ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE,
-  Tn as ItemLabelPlugin,
-  Pn as Magnifier,
-  Xp as MapviewFloorplanPlugin,
-  le as ModelChassisCompassPlugin,
-  Pe as ModelEntryDoorGuidePlugin,
-  Qp as ModelFloorplanPlugin,
-  gn as ModelItemLabelPlugin,
-  kp as ModelRoomLabelPlugin,
-  De as ModelTVVideoPlugin,
-  wp as ModelViewPlugin,
-  Nn as Object3DHelperController,
-  je as Object3DHelperPlugin,
-  hn as PLUGIN,
-  cp as PaintBrush,
-  Np as PaintBrushTypeEnum,
-  _e as PanoCompassPlugin,
-  jp as PanoCursorRaycasterPlugin,
-  ce as PanoDoorLabelPlugin,
-  te as PanoFloorplanRadarPlugin,
-  Re as PanoMeasurePlugin,
-  en as PanoMeasurePluginLine,
-  rn as PanoMeasurePluginModel,
-  mn as PanoMeasurePluginPoint,
-  ln as PanoMeasurePluginPolyline,
-  Me as PanoRulerPlugin,
-  Le as PanoRulerProPlugin,
-  Oe as PanoSpatialTagPlugin,
-  He as PanoTagPlugin,
-  Sn as PanoTagPluginController,
-  ke as PanoVideoPlugin,
-  Bn as PanoVideoPluginType,
-  ze as PipelinePlugin,
-  cn as PointType,
-  pe as ROOM_FETILE_TYPE_MAP,
-  ee as ROOM_TYPE_MAP,
-  se as Rotation,
-  oe as TopviewFloorplanPlugin,
-  We as Util,
-  bn as defaultGlobalConfig,
-  Ye as itemLabelPluginServerParams,
-  Ae as modelItemLabelPluginServerParams,
-  qp as modelRoomLabelPluginServerParams,
-  Dn as pluginFlag
+  Qe as AreaMakerPlugin,
+  on as CSS3DRender,
+  Up as CSS3DRenderPlugin,
+  se as CameraMovementEffect,
+  xe as CameraMovementPlugin,
+  vn as ContentType,
+  Be as CruisePlugin,
+  On as CruisePluginController,
+  An as CruisePluginTypes,
+  Fe as DIRECTION,
+  xn as DISPLAY_STRATEGY_TYPE,
+  cn as DimensionType,
+  Kp as FLOOR_PLAN_ATTACHED_TO,
+  pe as FLOOR_TYPE_MAP,
+  _n as GuideLineItem,
+  Rn as GuideLineModeItem,
+  he as GuideLinePlugin,
+  Mn as ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE,
+  Ln as ItemLabelPlugin,
+  fn as Magnifier,
+  Zp as MapviewFloorplanPlugin,
+  ae as ModelChassisCompassPlugin,
+  fe as ModelEntryDoorGuidePlugin,
+  Wp as ModelFloorplanPlugin,
+  sn as ModelItemLabelPlugin,
+  qp as ModelRoomLabelPlugin,
+  Ge as ModelTVVideoPlugin,
+  Bp as ModelViewPlugin,
+  hn as Object3DHelperController,
+  $e as Object3DHelperPlugin,
+  wn as PLUGIN,
+  Vp as PaintBrush,
+  hp as PaintBrushTypeEnum,
+  Ee as PanoCompassPlugin,
+  $p as PanoCursorRaycasterPlugin,
+  Ve as PanoDoorLabelPlugin,
+  ie as PanoFloorplanRadarPlugin,
+  Ie as PanoMeasurePlugin,
+  nn as PanoMeasurePluginLine,
+  tn as PanoMeasurePluginModel,
+  pn as PanoMeasurePluginPoint,
+  an as PanoMeasurePluginPolyline,
+  Te as PanoRulerPlugin,
+  Ce as PanoRulerProPlugin,
+  ye as PanoSpatialTagPlugin,
+  Ue as PanoTagPlugin,
+  Dn as PanoTagPluginController,
+  qe as PanoVideoPlugin,
+  Hn as PanoVideoPluginType,
+  Je as PipelinePlugin,
+  Vn as PointType,
+  ee as ROOM_FETILE_TYPE_MAP,
+  ne as ROOM_TYPE_MAP,
+  de as Rotation,
+  re as TopviewFloorplanPlugin,
+  Xe as Util,
+  Fn as defaultGlobalConfig,
+  ve as itemLabelPluginServerParams,
+  Se as modelItemLabelPluginServerParams,
+  zp as modelRoomLabelPluginServerParams,
+  Gn as pluginFlag
 };

package/libs/shared-utils/five/FiveDomEvents.d.ts

@@ -1,12 +1,42 @@
-import type { Five } from '@realsee/five';
-import DomEvents, { type DomEventInterface } from '../threex/domevents';
+/**
+ * @version 2.29.0
+ * 为什么重构？
+ * 1. 点击事件没有考虑Five模型
+ * 2. 为了在 mouseDown 的时候阻止 five tap 事件，需要提前做碰撞检测，但其实是没必要的，因为触发了 mouseDown 也不一定触发 点击事件 或者 Tap 事件，因为可能物体不可见或者有什么其他的判断
+ * 3. 基于第二点，废弃了之前使用浏览器原生事件监听点击的方式，改为使用 wantsTapGesture 的方式
+ * 4. 重构之后只会在 wantsTapGesture 事件触发的时候做射线检测
+ */
+import { type Five } from '@realsee/five';
 import type * as THREE from 'three';
-export declare class FiveDomEvents extends DomEvents {
+type EventName = 'click';
+type PreventFiveEvent = boolean;
+/**
+ * @return {PreventFiveEvent} 返回 false 可以不阻止 five 的 tap 事件; default: true
+ */
+type Callback = (event: CallbackEvent) => PreventFiveEvent | void;
+interface EventHandlerConfig {
+    /**
+     * @default true
+     */
+    checkVisible?: boolean;
+}
+interface CallbackEvent {
+    type: EventName;
+    target: THREE.Object3D;
+    origDomEvent?: Event;
+    intersect: THREE.Raycaster;
+    stopPropagation: () => void;
+}
+type Object3DWithEvent = THREE.Object3D & {
+    _domEvent?: {
+        [key in `${EventName}Handler`]?: Array<[Function, EventHandlerConfig]>;
+    };
+};
+export declare class FiveDomEvents {
     private five;
-    private mouseInfo?;
-    private clickHandlerMap;
+    private boundObject;
+    private extraObjects;
     constructor(five: Five);
-    dispose(): void;
     /**
      * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
      * @note: 注意：目前需要触发物体的 added 事件和 removed 事件才会生效
@@ -14,10 +44,18 @@ export declare class FiveDomEvents extends DomEvents {
      */
     addAutoBindEventListener(...params: Parameters<InstanceType<typeof FiveDomEvents>['addEventListener']>): void;
     /**
-     * @description 递归判断对象及其父对象是否可见
+     * @description: add event listener
+     * @param params.object: object
+     * @param params.event: event name
+     * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
+     * @return {void}
      */
-    getObjectVisible: (object?: THREE.Object3D | null) => boolean;
-    addEventListener<T extends 'click' | 'dblclick' | 'mouseover' | 'mouseout' | 'mousemove' | 'mousedown' | 'mouseup' | 'contextmenu' | 'touchstart' | 'touchend', K extends THREE.Object3D>(object: K, eventName: T, callback: (params: DomEventInterface<T, K>) => void, useCapture?: boolean): void;
-    removeEventListener(object: THREE.Object3D, eventName: 'click' | 'dblclick' | 'mouseover' | 'mouseout' | 'mousemove' | 'mousedown' | 'mouseup' | 'contextmenu' | 'touchstart' | 'touchend', callback: (params: any) => void, useCapture?: boolean): void;
-    private preventWhenMouseDown;
+    addEventListener(object: Object3DWithEvent, event: EventName, callback: Callback, config?: EventHandlerConfig): void;
+    removeEventListener(object: Object3DWithEvent, event: EventName, callback: (e: CallbackEvent) => any, ...args: any[]): void;
+    dispose(): void;
+    private handleWantsTapGesture;
+    private objectIsBound;
+    private notify;
+    private updateFiveMeshes;
 }
+export {};

package/libs/shared-utils/five/FiveDomEvents.js

@@ -1,26 +1,82 @@
-var a = Object.defineProperty;
-var l = (h, o, e) => o in h ? a(h, o, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[o] = e;
-var d = (h, o, e) => (l(h, typeof o != "symbol" ? o + "" : o, e), e);
-import { DomEvents as c } from "../threex/domevents/index.js";
-class D extends c {
+var p = Object.defineProperty, _ = Object.defineProperties;
+var O = Object.getOwnPropertyDescriptors;
+var E = Object.getOwnPropertySymbols;
+var b = Object.prototype.hasOwnProperty, L = Object.prototype.propertyIsEnumerable;
+var v = (s, e, t) => e in s ? p(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, m = (s, e) => {
+  for (var t in e || (e = {}))
+    b.call(e, t) && v(s, t, e[t]);
+  if (E)
+    for (var t of E(e))
+      L.call(e, t) && v(s, t, e[t]);
+  return s;
+}, c = (s, e) => _(s, O(e));
+var o = (s, e, t) => (v(s, typeof e != "symbol" ? e + "" : e, t), t);
+import { PBMMesh as x } from "@realsee/five";
+import { getObjectVisible as g } from "../three/getObjectVisible.js";
+class y {
   constructor(e) {
-    super(e.camera, e.getElement());
-    d(this, "five");
-    d(this, "mouseInfo");
-    d(this, "clickHandlerMap", /* @__PURE__ */ new Map());
-    /**
-     * @description 递归判断对象及其父对象是否可见
-     */
-    d(this, "getObjectVisible", (e) => e ? e.visible === !1 ? !1 : this.getObjectVisible(e.parent) : !0);
-    d(this, "preventWhenMouseDown", () => {
-      var e;
-      if ((e = this.mouseInfo) != null && e.isDown)
-        return console.debug("preventWhenMouseDown 1"), !1;
+    o(this, "five");
+    o(this, "boundObject", {});
+    o(this, "extraObjects", []);
+    o(this, "handleWantsTapGesture", (e) => {
+      var r;
+      const t = "click", n = this.boundObject[t];
+      if (!n || (n == null ? void 0 : n.length) === 0)
+        return;
+      console.debug("射线检测");
+      const i = (r = e.intersectObjects([...n, ...this.extraObjects], !0)[0]) == null ? void 0 : r.object;
+      if (!i || !this.objectIsBound(i))
+        return;
+      if (this.notify(t, i))
+        return !1;
     });
-    this.five = e, e.on("wantsMoveToPano", this.preventWhenMouseDown), e.on("wantsTapGesture", this.preventWhenMouseDown);
-  }
-  dispose() {
-    this.five.off("wantsMoveToPano", this.preventWhenMouseDown), this.five.off("wantsTapGesture", this.preventWhenMouseDown), this.clickHandlerMap.clear(), this.mouseInfo = void 0;
+    o(this, "objectIsBound", (e) => {
+      let t = e._domEvent, n = e.parent;
+      for (; typeof t == "undefined" && n; )
+        t = n._domEvent, n = n.parent;
+      return !!t;
+    });
+    // eslint-disable-next-line max-params
+    o(this, "notify", (e, t, n, f) => {
+      const i = t._domEvent;
+      if (!i)
+        return;
+      const h = i[`${e}Handler`];
+      if (!h)
+        return;
+      let r = !1, d = !1;
+      for (const [l, a] of h) {
+        if (r)
+          break;
+        if (a != null && a.checkVisible && !g(t))
+          continue;
+        const u = l({
+          type: e,
+          target: t,
+          origDomEvent: n,
+          intersect: f,
+          stopPropagation: () => {
+            r = !0;
+          }
+        });
+        d === !1 && (d = u != null ? u : !0);
+      }
+      if (!r) {
+        const l = t == null ? void 0 : t.parent;
+        if (l) {
+          const a = this.notify(e, l, n, f);
+          d === !1 && (d = a != null ? a : !0);
+        }
+      }
+      return d;
+    });
+    o(this, "updateFiveMeshes", () => {
+      var e, t;
+      this.extraObjects = [], (t = (e = this.five.model) == null ? void 0 : e.originModel) == null || t.traverse((n) => {
+        n instanceof x && this.extraObjects.push(n);
+      });
+    });
+    this.five = e, this.updateFiveMeshes(), e.on("modelLoaded", this.updateFiveMeshes), e.on("wantsTapGesture", this.handleWantsTapGesture);
   }
   /**
    * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
@@ -37,64 +93,31 @@ class D extends c {
       this.removeEventListener(...e);
     });
   }
-  // eslint-disable-next-line max-params
-  addEventListener(e, t, i, s) {
-    const r = (u) => {
-      if (this.getObjectVisible(e) === !1) {
-        this.mouseInfo = void 0;
-        return;
-      }
-      const n = u.origDomEvent;
-      this.mouseInfo = {
-        x: n.clientX,
-        y: n.clientY,
-        isDown: !0,
-        mouseDownTimestamp: Date.now()
-      };
-    }, m = (u) => {
-      if (this.getObjectVisible(e) === !1) {
-        this.mouseInfo = void 0;
-        return;
-      }
-      const n = u.origDomEvent;
-      this.mouseInfo && (this.mouseInfo.isDown && this.mouseInfo.x === n.clientX && this.mouseInfo.y === n.clientY && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && i(n), this.mouseInfo = void 0);
-    }, f = (u) => {
-      if (this.getObjectVisible(e) === !1) {
-        this.mouseInfo = void 0;
-        return;
-      }
-      const n = u.origDomEvent;
-      this.mouseInfo = {
-        x: Math.floor(n.touches[0].clientX),
-        y: Math.floor(n.touches[0].clientY),
-        isDown: !0,
-        mouseDownTimestamp: Date.now()
-      };
-    }, v = (u) => {
-      if (this.getObjectVisible(e) === !1) {
-        this.mouseInfo = void 0;
-        return;
-      }
-      const n = u.origDomEvent;
-      this.mouseInfo && (this.mouseInfo.isDown && this.mouseInfo.x === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientX) && this.mouseInfo.y === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientY) && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && i(n), this.mouseInfo = void 0);
-    };
-    t === "click" ? (super.addEventListener(e, "mousedown", r, s), super.addEventListener(e, "mouseup", m, s), super.addEventListener(e, "touchstart", f, s), super.addEventListener(e, "touchend", v, s), this.clickHandlerMap.set(i, {
-      mousedown: r,
-      mouseup: m,
-      touchstart: f,
-      touchend: v
-    })) : super.addEventListener(e, t, i, s);
+  /**
+   * @description: add event listener
+   * @param params.object: object
+   * @param params.event: event name
+   * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
+   * @return {void}
+   */
+  addEventListener(e, t, n, f) {
+    var i;
+    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, c(m({}, f), { checkVisible: !0 })]), (i = this.boundObject[t]) == null || i.push(e);
   }
-  // eslint-disable-next-line max-params
-  removeEventListener(e, t, i, s) {
-    if (t === "click") {
-      const r = this.clickHandlerMap.get(i);
-      r && (super.removeEventListener(e, "mousedown", r.mousedown, s), super.removeEventListener(e, "mouseup", r.mouseup, s), super.removeEventListener(e, "touchstart", r.touchstart, s), super.removeEventListener(e, "touchend", r.touchend, s), this.clickHandlerMap.delete(i));
-    } else
-      super.removeEventListener(e, t, i, s);
-    this.mouseInfo = void 0;
+  removeEventListener(e, t, n, ...f) {
+    var h, r;
+    if (!e._domEvent || !e._domEvent[`${t}Handler`])
+      return;
+    const i = e._domEvent[`${t}Handler`].findIndex((d) => d[0] === n);
+    if (i !== -1 && (e._domEvent[`${t}Handler`].splice(i, 1), e._domEvent[`${t}Handler`].length === 0 && delete e._domEvent[`${t}Handler`], e._domEvent && Object.keys(e._domEvent).length === 0 && delete e._domEvent, !e._domEvent)) {
+      const d = (h = this.boundObject[t]) == null ? void 0 : h.findIndex((l) => l === e);
+      d !== -1 && ((r = this.boundObject[t]) == null || r.splice(d, 1));
+    }
+  }
+  dispose() {
+    this.five.off("modelLoaded", this.updateFiveMeshes), this.five.off("wantsTapGesture", this.handleWantsTapGesture), this.boundObject = {}, this.extraObjects = [];
   }
 }
 export {
-  D as FiveDomEvents
+  y as FiveDomEvents
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv2.28.6",
+    "%c %c@realsee/dnalogel %cv2.29.0-dev.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/getObjectVisible.d.ts

@@ -0,0 +1,5 @@
+import type * as THREE from 'three';
+/**
+ * @description 递归判断对象及其父对象是否可见
+ */
+export declare const getObjectVisible: (object?: THREE.Object3D | null) => boolean;

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

@@ -0,0 +1,4 @@
+const r = (e) => e ? e.visible === !1 ? !1 : r(e.parent) : !0;
+export {
+  r as getObjectVisible
+};

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.28.6",
+  "version": "2.29.0-dev.1",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",