@realsee/dnalogel 3.0.0-0 → 3.0.0-11

package/libs/index.js

@@ -1,59 +1,59 @@
 import { consoleVersion as o } from "./shared-utils/logger.js";
 import { autoFixOffscreenCanvas as r } from "./shared-utils/offscreenCanvas.js";
-import { PaintBrush as Hp } from "./components/PaintBrush/index.js";
-import { PaintBrushTypeEnum as jp } from "./components/PaintBrush/typings.js";
-import { ModelViewPlugin as kp } from "./ModelViewPlugin/Plugin.js";
-import { CSS3DRenderPlugin as zp } from "./CSS3DRenderPlugin/index.js";
-import { PanoCursorRaycasterPlugin as Kp } from "./PanoCursorRaycasterPlugin/index.js";
-import { ModelRoomLabelPlugin as Wp, modelRoomLabelPluginServerParams as Xp } from "./ModelRoomLabelPlugin/index.js";
-import { FLOOR_PLAN_ATTACHED_TO as oe } from "./floorplan/constant.js";
-import { ModelFloorplanPlugin as te } from "./floorplan/ModelFloorplanPlugin/index.js";
-import { MapviewFloorplanPlugin as me } from "./floorplan/MapviewFloorplanPlugin/index.js";
-import { TopviewFloorplanPlugin as ee } from "./floorplan/TopviewFloorplanPlugin/index.js";
-import { PanoFloorplanRadarPlugin as le } from "./floorplan/PanoFloorplanRadarPlugin/index.js";
-import { FLOOR_TYPE_MAP as Pe, ROOM_FETILE_TYPE_MAP as ue, ROOM_TYPE_MAP as fe } from "./floorplan/typings/floorplanServerData.js";
-import { ModelChassisCompassPlugin as ge } from "./ModelChassisCompassPlugin/Plugin.js";
-import { ModelEntryDoorGuidePlugin as de } from "./ModelEntryDoorGuidePlugin/Plugin.js";
-import { CameraMovementPlugin as Te } from "./CameraMovementPlugin/CameraMovementPlugin.js";
-import { CameraMovementEffect as Ce, Rotation as _e } from "./CameraMovementPlugin/typing.js";
-import { PanoRulerPlugin as Ie } from "./PanoRulerPlugin/Plugin.js";
-import { PanoRulerProPlugin as Oe } from "./PanoRulerProPlugin/index.js";
-import { PanoCompassPlugin as Ae } from "./PanoCompassPlugin/index.js";
-import { PanoMeasurePlugin as De } from "./PanoMeasurePlugin/index.js";
-import { PanoSpatialTagPlugin as be } from "./PanoSpatialTagPlugin/Plugin.js";
-import { modelItemLabelPluginServerParams as Ye } from "./ModelItemLabelPlugin/index.js";
-import { ModelTVVideoPlugin as ce } from "./ModelTVVideoPlugin/Plugin.js";
-import { DIRECTION as Ne } from "./ModelTVVideoPlugin/typings.js";
-import { itemLabelPluginServerParams as we } from "./ItemLabelPlugin/index.js";
-import { PanoDoorLabelPlugin as He } from "./PanoDoorLabelPlugin/index.js";
-import { GuideLinePlugin as je } from "./GuideLinePlugin/index.js";
-import { CruisePlugin as ke } from "./CruisePlugin/index.js";
-import { PanoTagPlugin as ze } from "./PanoTagPlugin/index.js";
-import { Object3DHelperPlugin as Ke } from "./Object3DHelperPlugin/index.js";
-import { PanoVideoPlugin as We } from "./PanoVideoPlugin/index.js";
-import { PipelinePlugin as Ze } from "./PipelinePlugin/index.js";
-import { AreaMakerPlugin as rn } from "./AreaMakerPlugin/index.js";
-import { CurrentPanoImagePlugin as mn } from "./CurrentPanoImagePlugin/index.js";
-import { index as en } from "./shared-utils/index.js";
-import { CSS3DRender as ln } from "./CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-import { Model as Pn } from "./PanoMeasurePlugin/Model/index.js";
-import { default as fn } from "./PanoMeasurePlugin/Model/point.js";
-import { default as gn } from "./PanoMeasurePlugin/Model/line.js";
-import { Polyline as dn } from "./PanoMeasurePlugin/Model/polyline.js";
-import { default as Tn } from "./PanoMeasurePlugin/Modules/Magnifier.js";
-import { DISPLAY_STRATEGY_TYPE as Cn } from "./ModelItemLabelPlugin/typings.js";
-import { ModelItemLabelPlugin as En } from "./ModelItemLabelPlugin/ModelItemLabelPlugin.js";
-import { ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE as Rn } from "./ItemLabelPlugin/typings.js";
-import { Plugin as yn } from "./ItemLabelPlugin/Plugin.js";
-import { GuideLineItem$1 as Sn } from "./GuideLinePlugin/GuideLineItem/index.js";
-import { GuideLineModeItem$1 as Gn } from "./GuideLinePlugin/GuideLineModeItem/index.js";
-import { default as Fn } from "./CruisePlugin/Controller.js";
-import { typing as vn } from "./CruisePlugin/typing/index.js";
-import { default as Vn, pluginFlag as Nn } from "./PanoTagPlugin/controller/index.js";
-import { defaultGlobalConfig as wn } from "./PanoTagPlugin/typings/tag/TagConfig.js";
-import { ContentType as Hn, DimensionType as Un, PointType as jn } from "./PanoTagPlugin/Archive/deprecated.js";
-import { Object3DHelperController as kn, PLUGIN as qn } from "./Object3DHelperPlugin/Controller.js";
-import { typings as Jn } from "./PanoVideoPlugin/typings/index.js";
+import { PaintBrush as hp } from "./components/PaintBrush/index.js";
+import { PaintBrushTypeEnum as Bp } from "./components/PaintBrush/typings.js";
+import { ModelViewPlugin as Up } from "./ModelViewPlugin/Plugin.js";
+import { CSS3DRenderPlugin as $p } from "./CSS3DRenderPlugin/index.js";
+import { PanoCursorRaycasterPlugin as qp } from "./PanoCursorRaycasterPlugin/index.js";
+import { ModelRoomLabelPlugin as Jp, modelRoomLabelPluginServerParams as Kp } from "./ModelRoomLabelPlugin/index.js";
+import { FLOOR_PLAN_ATTACHED_TO as Wp } from "./floorplan/constant.js";
+import { ModelFloorplanPlugin as Zp } from "./floorplan/ModelFloorplanPlugin/index.js";
+import { MapviewFloorplanPlugin as re } from "./floorplan/MapviewFloorplanPlugin/index.js";
+import { TopviewFloorplanPlugin as ie } from "./floorplan/TopviewFloorplanPlugin/index.js";
+import { PanoFloorplanRadarPlugin as pe } from "./floorplan/PanoFloorplanRadarPlugin/index.js";
+import { FLOOR_TYPE_MAP as ne, ROOM_FETILE_TYPE_MAP as le, ROOM_TYPE_MAP as ae } from "./floorplan/typings/floorplanServerData.js";
+import { ModelChassisCompassPlugin as ue } from "./ModelChassisCompassPlugin/Plugin.js";
+import { ModelEntryDoorGuidePlugin as xe } from "./ModelEntryDoorGuidePlugin/Plugin.js";
+import { CameraMovementPlugin as se } from "./CameraMovementPlugin/CameraMovementPlugin.js";
+import { CameraMovementEffect as Me, Rotation as Te } from "./CameraMovementPlugin/typing.js";
+import { PanoRulerPlugin as Ce } from "./PanoRulerPlugin/Plugin.js";
+import { PanoRulerProPlugin as Ee } from "./PanoRulerProPlugin/index.js";
+import { PanoCompassPlugin as Re } from "./PanoCompassPlugin/index.js";
+import { PanoMeasurePlugin as ye } from "./PanoMeasurePlugin/index.js";
+import { PanoSpatialTagPlugin as Se } from "./PanoSpatialTagPlugin/Plugin.js";
+import { modelItemLabelPluginServerParams as Ge } from "./ModelItemLabelPlugin/index.js";
+import { ModelTVVideoPlugin as Fe } from "./ModelTVVideoPlugin/Plugin.js";
+import { DIRECTION as ve } from "./ModelTVVideoPlugin/typings.js";
+import { itemLabelPluginServerParams as Ve } from "./ItemLabelPlugin/index.js";
+import { PanoDoorLabelPlugin as he } from "./PanoDoorLabelPlugin/index.js";
+import { GuideLinePlugin as Be } from "./GuideLinePlugin/index.js";
+import { CruisePlugin as Ue } from "./CruisePlugin/index.js";
+import { PanoTagPlugin as $e } from "./PanoTagPlugin/index.js";
+import { Object3DHelperPlugin as qe } from "./Object3DHelperPlugin/index.js";
+import { PanoVideoPlugin as Je } from "./PanoVideoPlugin/index.js";
+import { PipelinePlugin as Qe } from "./PipelinePlugin/index.js";
+import { AreaMakerPlugin as Xe } from "./AreaMakerPlugin/index.js";
+import { CurrentPanoImagePlugin as on } from "./CurrentPanoImagePlugin/index.js";
+import { index as tn } from "./shared-utils/index.js";
+import { CSS3DRender as pn } from "./CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import { Model as nn } from "./PanoMeasurePlugin/Model/index.js";
+import { default as an } from "./PanoMeasurePlugin/Model/point.js";
+import { default as un } from "./PanoMeasurePlugin/Model/line.js";
+import { Polyline as xn } from "./PanoMeasurePlugin/Model/polyline.js";
+import { default as sn } from "./PanoMeasurePlugin/Modules/Magnifier.js";
+import { DISPLAY_STRATEGY_TYPE as Mn } from "./ModelItemLabelPlugin/typings.js";
+import { ModelItemLabelPlugin as Ln } from "./ModelItemLabelPlugin/ModelItemLabelPlugin.js";
+import { ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE as _n } from "./ItemLabelPlugin/typings.js";
+import { Plugin as In } from "./ItemLabelPlugin/Plugin.js";
+import { GuideLineItem$1 as On } from "./GuideLinePlugin/GuideLineItem/index.js";
+import { GuideLineModeItem$1 as An } from "./GuideLinePlugin/GuideLineModeItem/index.js";
+import { default as Dn } from "./CruisePlugin/Controller.js";
+import { typing as bn } from "./CruisePlugin/typing/index.js";
+import { default as Yn, pluginFlag as vn } from "./PanoTagPlugin/controller/index.js";
+import { defaultGlobalConfig as Vn } from "./PanoTagPlugin/typings/tag/TagConfig.js";
+import { ContentType as hn, DimensionType as wn, PointType as Bn } from "./PanoTagPlugin/Archive/deprecated.js";
+import { Object3DHelperController as Un, PLUGIN as jn } from "./Object3DHelperPlugin/Controller.js";
+import { typings as kn } from "./PanoVideoPlugin/typings/index.js";
 import "./components/PaintBrush/Controller.js";
 import "./components/PaintBrush/utils.js";
 import "./components/PaintBrush/tween.js";
@@ -256,6 +256,7 @@ import "./vendor/gl-vec2/dot.js";
 import "./shared-utils/five/mode.js";
 import "./PanoTagPlugin/utils/addDebugPoints.js";
 import "./PanoTagPlugin/utils/tag/tagCheck.js";
+import "./PanoTagPlugin/utils/actionAfterFiveModelLoad.js";
 import "./PanoTagPlugin/utils/debounce.js";
 import "./PanoTagPlugin/utils/throttle.js";
 import "./PanoTagPlugin/utils/resizeObserver.js";
@@ -279,8 +280,6 @@ import "./shared-utils/three/getPositionsByObjectFit.js";
 import "./shared-utils/three/FragmentTransparencyMaterial.js";
 import "./shared-utils/five/FiveDomEvents.js";
 import "./shared-utils/three/getObjectVisible.js";
-import "./PanoTagPlugin/utils/tag/adaptConfig.js";
-import "./shared-utils/typescript/entries.js";
 import "./shared-utils/five/getFloorIndex.js";
 import "./shared-utils/util.js";
 import "./PanoTagPlugin/Components/TagContainer.js";
@@ -350,7 +349,6 @@ import "./PanoTagPlugin/Components/Tag/CustomTag.js";
 import "./PanoTagPlugin/Components/Common/TagPoint.js";
 import "./shared-utils/three/GLTFLoader.js";
 import "@realsee/five/gltf-loader";
-import "./shared-utils/five/fiveModelLoad.js";
 import "./GuideLinePlugin/Components/Tag.js";
 import "./GuideLinePlugin/utils/index.js";
 import "./CruisePlugin/utils/coordinatesAngle.js";
@@ -406,7 +404,6 @@ import "./shared-utils/three/objects/LineSegments.js";
 import "./components/AreaLabel/LabelItem.js";
 import "./components/AreaLabel/Assets/roomLabelBg.js";
 import "./CurrentPanoImagePlugin/Controller.js";
-import "./shared-utils/five/adapt.js";
 import "./shared-utils/math/Interval.js";
 import "./shared-utils/math/Rectangle.js";
 import "./shared-utils/five/index.js";
@@ -415,66 +412,66 @@ import "./shared-utils/three/getRaycaster.js";
 r();
 o();
 export {
-  rn as AreaMakerPlugin,
-  ln as CSS3DRender,
-  zp as CSS3DRenderPlugin,
-  Ce as CameraMovementEffect,
-  Te as CameraMovementPlugin,
-  Hn as ContentType,
-  ke as CruisePlugin,
-  Fn as CruisePluginController,
-  vn as CruisePluginTypes,
-  mn as CurrentPanoImagePlugin,
-  Ne as DIRECTION,
-  Cn as DISPLAY_STRATEGY_TYPE,
-  Un as DimensionType,
-  oe as FLOOR_PLAN_ATTACHED_TO,
-  Pe as FLOOR_TYPE_MAP,
-  Sn as GuideLineItem,
-  Gn as GuideLineModeItem,
-  je as GuideLinePlugin,
-  Rn as ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE,
-  yn as ItemLabelPlugin,
-  Tn as Magnifier,
-  me as MapviewFloorplanPlugin,
-  ge as ModelChassisCompassPlugin,
-  de as ModelEntryDoorGuidePlugin,
-  te as ModelFloorplanPlugin,
-  En as ModelItemLabelPlugin,
-  Wp as ModelRoomLabelPlugin,
-  ce as ModelTVVideoPlugin,
-  kp as ModelViewPlugin,
-  kn as Object3DHelperController,
-  Ke as Object3DHelperPlugin,
-  qn as PLUGIN,
-  Hp as PaintBrush,
-  jp as PaintBrushTypeEnum,
-  Ae as PanoCompassPlugin,
-  Kp as PanoCursorRaycasterPlugin,
-  He as PanoDoorLabelPlugin,
-  le as PanoFloorplanRadarPlugin,
-  De as PanoMeasurePlugin,
-  gn as PanoMeasurePluginLine,
-  Pn as PanoMeasurePluginModel,
-  fn as PanoMeasurePluginPoint,
-  dn as PanoMeasurePluginPolyline,
-  Ie as PanoRulerPlugin,
-  Oe as PanoRulerProPlugin,
-  be as PanoSpatialTagPlugin,
-  ze as PanoTagPlugin,
-  Vn as PanoTagPluginController,
-  We as PanoVideoPlugin,
-  Jn as PanoVideoPluginType,
-  Ze as PipelinePlugin,
-  jn as PointType,
-  ue as ROOM_FETILE_TYPE_MAP,
-  fe as ROOM_TYPE_MAP,
-  _e as Rotation,
-  ee as TopviewFloorplanPlugin,
-  en as Util,
-  wn as defaultGlobalConfig,
-  we as itemLabelPluginServerParams,
-  Ye as modelItemLabelPluginServerParams,
-  Xp as modelRoomLabelPluginServerParams,
-  Nn as pluginFlag
+  Xe as AreaMakerPlugin,
+  pn as CSS3DRender,
+  $p as CSS3DRenderPlugin,
+  Me as CameraMovementEffect,
+  se as CameraMovementPlugin,
+  hn as ContentType,
+  Ue as CruisePlugin,
+  Dn as CruisePluginController,
+  bn as CruisePluginTypes,
+  on as CurrentPanoImagePlugin,
+  ve as DIRECTION,
+  Mn as DISPLAY_STRATEGY_TYPE,
+  wn as DimensionType,
+  Wp as FLOOR_PLAN_ATTACHED_TO,
+  ne as FLOOR_TYPE_MAP,
+  On as GuideLineItem,
+  An as GuideLineModeItem,
+  Be as GuideLinePlugin,
+  _n as ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE,
+  In as ItemLabelPlugin,
+  sn as Magnifier,
+  re as MapviewFloorplanPlugin,
+  ue as ModelChassisCompassPlugin,
+  xe as ModelEntryDoorGuidePlugin,
+  Zp as ModelFloorplanPlugin,
+  Ln as ModelItemLabelPlugin,
+  Jp as ModelRoomLabelPlugin,
+  Fe as ModelTVVideoPlugin,
+  Up as ModelViewPlugin,
+  Un as Object3DHelperController,
+  qe as Object3DHelperPlugin,
+  jn as PLUGIN,
+  hp as PaintBrush,
+  Bp as PaintBrushTypeEnum,
+  Re as PanoCompassPlugin,
+  qp as PanoCursorRaycasterPlugin,
+  he as PanoDoorLabelPlugin,
+  pe as PanoFloorplanRadarPlugin,
+  ye as PanoMeasurePlugin,
+  un as PanoMeasurePluginLine,
+  nn as PanoMeasurePluginModel,
+  an as PanoMeasurePluginPoint,
+  xn as PanoMeasurePluginPolyline,
+  Ce as PanoRulerPlugin,
+  Ee as PanoRulerProPlugin,
+  Se as PanoSpatialTagPlugin,
+  $e as PanoTagPlugin,
+  Yn as PanoTagPluginController,
+  Je as PanoVideoPlugin,
+  kn as PanoVideoPluginType,
+  Qe as PipelinePlugin,
+  Bn as PointType,
+  le as ROOM_FETILE_TYPE_MAP,
+  ae as ROOM_TYPE_MAP,
+  Te as Rotation,
+  ie as TopviewFloorplanPlugin,
+  tn as Util,
+  Vn as defaultGlobalConfig,
+  Ve as itemLabelPluginServerParams,
+  Ge as modelItemLabelPluginServerParams,
+  Kp as modelRoomLabelPluginServerParams,
+  vn as pluginFlag
 };

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

@@ -6,7 +6,7 @@
  * 3. 基于第二点，废弃了之前使用浏览器原生事件监听点击的方式，改为使用 wantsTapGesture 的方式
  * 4. 重构之后只会在 wantsTapGesture 事件触发的时候做射线检测
  */
-import type { Five } from '@realsee/five';
+import { type Five } from '@realsee/five';
 import type * as THREE from 'three';
 type EventName = 'click';
 type PreventFiveEvent = boolean;
@@ -35,6 +35,7 @@ type Object3DWithEvent = THREE.Object3D & {
 export declare class FiveDomEvents {
     private five;
     private boundObject;
+    private extraObjects;
     constructor(five: Five);
     /**
      * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
@@ -55,5 +56,6 @@ export declare class FiveDomEvents {
     private handleWantsTapGesture;
     private objectIsBound;
     private notify;
+    private updateFiveMeshes;
 }
 export {};

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

@@ -1,74 +1,80 @@
-var O = Object.defineProperty, g = Object.defineProperties;
-var H = Object.getOwnPropertyDescriptors;
+var O = Object.defineProperty, L = Object.defineProperties;
+var x = Object.getOwnPropertyDescriptors;
 var m = Object.getOwnPropertySymbols;
-var L = Object.prototype.hasOwnProperty, $ = Object.prototype.propertyIsEnumerable;
-var f = (i, e, t) => e in i ? O(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t, p = (i, e) => {
+var g = Object.prototype.hasOwnProperty, H = Object.prototype.propertyIsEnumerable;
+var f = (s, e, t) => e in s ? O(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, p = (s, e) => {
   for (var t in e || (e = {}))
-    L.call(e, t) && f(i, t, e[t]);
+    g.call(e, t) && f(s, t, e[t]);
   if (m)
     for (var t of m(e))
-      $.call(e, t) && f(i, t, e[t]);
-  return i;
-}, _ = (i, e) => g(i, H(e));
-var u = (i, e, t) => (f(i, typeof e != "symbol" ? e + "" : e, t), t);
-import { getObjectVisible as x } from "../three/getObjectVisible.js";
-class G {
+      H.call(e, t) && f(s, t, e[t]);
+  return s;
+}, b = (s, e) => L(s, x(e));
+var r = (s, e, t) => (f(s, typeof e != "symbol" ? e + "" : e, t), t);
+import { PBMMesh as $ } from "@realsee/five";
+import { getObjectVisible as F } from "../three/getObjectVisible.js";
+class B {
   constructor(e) {
-    u(this, "five");
-    u(this, "boundObject", {});
-    u(this, "handleWantsTapGesture", (e) => {
-      var d;
+    r(this, "five");
+    r(this, "boundObject", {});
+    r(this, "extraObjects", []);
+    r(this, "handleWantsTapGesture", (e) => {
+      var o;
       const t = "click", n = this.boundObject[t];
       if (!n || (n == null ? void 0 : n.length) === 0)
         return;
-      const o = this.five.model.intersectRaycaster(e), s = e.intersectObjects(n, !0);
-      if (o.length > 0 && s.length > 0 && o[0].distance < s[0].distance)
+      console.debug("射线检测");
+      const i = (o = e.intersectObjects([...n, ...this.extraObjects], !0)[0]) == null ? void 0 : o.object;
+      if (!i || !this.objectIsBound(i))
         return;
-      const r = (d = s[0]) == null ? void 0 : d.object;
-      if (!r || !this.objectIsBound(r))
-        return;
-      if (this.notify(t, r))
+      if (this.notify(t, i))
         return !1;
     });
-    u(this, "objectIsBound", (e) => {
+    r(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
-    u(this, "notify", (e, t, n, o) => {
-      let s = !1, r = [];
-      const l = [t];
+    r(this, "notify", (e, t, n, u) => {
+      let i = !1, h = [];
+      const o = [t];
       let d = t;
       for (; d.parent; )
-        d = d.parent, l.push(d);
-      for (const a of l) {
-        if (s)
+        d = d.parent, o.push(d);
+      for (const a of o) {
+        if (i)
           break;
-        const h = a._domEvent;
-        if (!h)
+        const c = a._domEvent;
+        if (!c)
           continue;
-        const E = h[`${e}Handler`];
+        const E = c[`${e}Handler`];
         if (E)
-          for (const [b, v] of E) {
-            if (v != null && v.checkVisible && !x(a))
+          for (const [_, v] of E) {
+            if (v != null && v.checkVisible && !F(a))
               continue;
-            const c = b({
+            const l = _({
               type: e,
               target: a,
               origDomEvent: n,
-              intersect: o,
+              intersect: u,
               stopPropagation: () => {
-                s = !0;
+                i = !0;
               }
             });
-            r.push(c != null ? c : !0);
+            h.push(l != null ? l : !0);
           }
       }
-      return r.some((a) => a === !0);
+      return h.some((a) => a === !0);
+    });
+    r(this, "updateFiveMeshes", () => {
+      var e;
+      this.extraObjects = [], (e = this.five.model) == null || e.traverse((t) => {
+        t instanceof $ && this.extraObjects.push(t);
+      });
     });
-    this.five = e, e.on("wantsTapGesture", this.handleWantsTapGesture);
+    this.five = e, this.updateFiveMeshes(), e.on("modelLoaded", this.updateFiveMeshes), e.on("wantsTapGesture", this.handleWantsTapGesture);
   }
   /**
    * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
@@ -92,24 +98,24 @@ class G {
    * @param params.callback: 返回 false 可以不阻止 five 的 tap 事件; default: true
    * @return {void}
    */
-  addEventListener(e, t, n, o) {
-    var s;
-    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, _(p({}, o), { checkVisible: !0 })]), (s = this.boundObject[t]) == null || s.push(e);
+  addEventListener(e, t, n, u) {
+    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, b(p({}, u), { checkVisible: !0 })]), (i = this.boundObject[t]) == null || i.push(e);
   }
-  removeEventListener(e, t, n, ...o) {
-    var r, l;
+  removeEventListener(e, t, n, ...u) {
+    var h, o;
     if (!e._domEvent || !e._domEvent[`${t}Handler`])
       return;
-    const s = e._domEvent[`${t}Handler`].findIndex((d) => d[0] === n);
-    if (s !== -1 && (e._domEvent[`${t}Handler`].splice(s, 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 = (r = this.boundObject[t]) == null ? void 0 : r.findIndex((a) => a === e);
-      d !== -1 && ((l = this.boundObject[t]) == null || l.splice(d, 1));
+    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((a) => a === e);
+      d !== -1 && ((o = this.boundObject[t]) == null || o.splice(d, 1));
     }
   }
   dispose() {
-    this.five.off("wantsTapGesture", this.handleWantsTapGesture), this.boundObject = {};
+    this.five.off("modelLoaded", this.updateFiveMeshes), this.five.off("wantsTapGesture", this.handleWantsTapGesture), this.boundObject = {}, this.extraObjects = [];
   }
 }
 export {
-  G as FiveDomEvents
+  B as FiveDomEvents
 };

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

@@ -14,17 +14,17 @@ var f = (t, c, n) => new Promise((e, r) => {
   }, u = (o) => o.done ? e(o.value) : Promise.resolve(o.value).then(a, i);
   u((n = n.apply(t, c)).next());
 });
-import { nearlyEqual as d } from "../nearlyEqual.js";
-import { to as l } from "../to.js";
-function h(t) {
+import { nearlyEqualRad as d, nearlyEqual as m } from "../nearlyEqual.js";
+import { to as h } from "../to.js";
+function w(t) {
   return Object.prototype.toString.call(t) === "[object Object]";
 }
-function m(t) {
-  return h(t) && !!t.isVector3;
+function l(t) {
+  return w(t) && !!t.isVector3;
 }
-function g(t, c) {
+function j(t, c) {
   return f(this, null, function* () {
-    const [n] = yield l(t.changeMode(...c));
+    const [n] = yield h(t.changeMode(...c));
     if (n)
       throw new Error("change mode canceled");
     yield new Promise((i) => {
@@ -36,16 +36,16 @@ function g(t, c) {
     if (!e)
       return !0;
     const r = t.getCurrentState();
-    if (!w(e, r))
+    if (!b(e, r))
       throw new Error("pose 与预期不符");
   });
 }
-function w(t, c) {
+function b(t, c) {
   return Object.keys(t).every((n) => {
     const e = c[n], r = t[n];
-    return e === void 0 || r === void 0 ? !0 : typeof e == "number" && typeof r == "number" ? d(e, r, 2) : m(r) && m(e) ? r.distanceTo(e) < 0.01 : e === r;
+    return e === void 0 || r === void 0 ? !0 : n === "longitude" || n === "latitude" ? d(e, r, 2) : typeof e == "number" && typeof r == "number" ? m(e, r, 2) : l(r) && l(e) ? r.distanceTo(e) < 0.01 : e === r;
   });
 }
 export {
-  g as changeMode
+  j as changeMode
 };

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

@@ -1,10 +1,10 @@
-function n(e) {
-  return e.toLowerCase().includes("panorama");
+function n(a) {
+  return a === "Panorama" || a === "DepthPanorama" || a === "VRPanorama" || a === "XRPanorama";
 }
-function o(e) {
-  return !n(e);
+function r(a) {
+  return !n(a);
 }
 export {
-  o as isModelLike,
+  r as isModelLike,
   n as isPanoramaLike
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.0.0-0",
+    "%c %c@realsee/dnalogel %cv3.0.0-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/nearlyEqual.d.ts

@@ -5,3 +5,10 @@
  * @param accuracy 精度：精确到小数点后几位，默认精确到 小数点后四位
  */
 export default function nearlyEqual(num1: number, num2: number, accuracy?: number): boolean;
+/**
+ * 比较两个弧度近似相等
+ * @param rad1 弧度1
+ * @param rad2 弧度2
+ * @param accuracy 精度：精确到小数点后几位，默认精确到 小数点后四位
+ */
+export declare function nearlyEqualRad(rad1: number, rad2: number, accuracy?: number): boolean;

package/libs/shared-utils/nearlyEqual.js

@@ -1,6 +1,12 @@
-function a(t, r, o = 4) {
-  return Math.floor(t * Math.pow(10, o)) === Math.floor(r * Math.pow(10, o));
+function r(t, a, n = 4) {
+  return Math.abs(t - a) < Math.pow(10, -n);
 }
+function h(t, a, n = 4) {
+  const o = Math.PI * 2, s = t % o, e = a % o, i = Math.min(s, e), c = Math.max(s, e);
+  return r(i, c, n) || r(i + o, c, n);
+}
+Object.assign(window, { nearlyEqual: r, nearlyEqualRad: h });
 export {
-  a as nearlyEqual
+  r as nearlyEqual,
+  h as nearlyEqualRad
 };

package/package.json

@@ -7,7 +7,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "3.0.0-0",
+  "version": "3.0.0-11",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "clean": "rm -rf components dist docs libs types ./vite.config.js.timestamp*",
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.22.9",
-    "@realsee/five": "6.0.0-alpha.8",
+    "@realsee/five": "6.0.0-alpha.24",
     "@sveltejs/vite-plugin-svelte": "^2.4.2",
     "@tsconfig/svelte": "^4.0.1",
     "@tweenjs/tween.js": "^20.0.3",

package/dist/PanoTagPlugin/utils/tag/adaptConfig.d.ts

@@ -1,2 +0,0 @@
-import type { Tag, TagConfig } from '../..';
-export default function adaptConfig(config: TagConfig, tag?: Tag): void;

package/dist/shared-utils/five/adapt.d.ts

@@ -1,9 +0,0 @@
-/**
- * @description: 一些函数，来适配 Five@5.x 和 Five@6.x 的差异
- */
-import type { Five } from '@realsee/five';
-export declare function adaptPanoId(five: Five, func: (params?: {
-    panoIndex: number;
-    panoId: string;
-    derivedId: number;
-}, ...args: any[]) => any): (panoIdOrPanoIndex: string | number, ...args: any[]) => void;

package/dist/shared-utils/five/fiveModelLoad.d.ts

@@ -1,9 +0,0 @@
-import type { Five } from '@realsee/five';
-/**
- * @description: 等待 five model 加载完成
- */
-export declare function waitFiveModelLoaded(five: Five): Promise<void>;
-/**
- * @note five 6.0 修复了 多次 load work 时，`five.model.loaded` 不会变为 `false` 的问题，不再需要 `five.model.name === five.work?.model.file` 的判断了
- */
-export declare function fiveModelIsLoaded(five: Five): boolean;

package/dist/shared-utils/typescript/entries.d.ts

@@ -1,2 +0,0 @@
-import type { ObjectEntries } from 'type-fest/source/entries';
-export default function entries<T>(obj: T): ObjectEntries<T>;