@realsee/dnalogel 2.16.0-7 → 2.16.0-9

package/libs/GuideLinePlugin/utils/index.d.ts

@@ -5,3 +5,9 @@ export declare function updateGuideLineModeItemByData(options: {
     data: PluginType.GuideLineItem;
     mode: PluginType.GuideLineModeItemMode;
 }): void;
+/**
+ * 筛选出给定数组中，相邻元素不能重复的元素组成的新数组
+ * @param array 要筛选的数组
+ * @returns 筛选后的新数组
+ */
+export declare function filterAdjacentDistinct<T>(array: T[]): T[];

package/libs/GuideLinePlugin/utils/index.js

@@ -34,12 +34,16 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../shared-utils/animationFrame/index.js";
 function O(o) {
-  const t = o.data, m = o.item, r = o.mode === "panorama" ? t.panorama_style : t.model_style;
-  if (!r)
+  const t = o.data, r = o.item, i = o.mode === "panorama" ? t.panorama_style : t.model_style;
+  if (!i)
     return;
-  const i = t.path, p = r, e = r;
-  t.path ? m.setGeometryByPath(i, p) : t.pano_group && m.setGeometryByPanoGroup(t.pano_group, p), m.setMartial(e);
+  const p = t.path, m = i, e = i;
+  t.path ? r.setGeometryByPath(p, m) : t.pano_group && r.setGeometryByPanoGroup(t.pano_group, m), r.setMartial(e);
+}
+function Q(o) {
+  return o.length === 0 ? [] : o.filter((t, r) => t !== o[r - 1]);
 }
 export {
+  Q as filterAdjacentDistinct,
   O as updateGuideLineModeItemByData
 };

package/libs/base/BasePlugin.js

@@ -12,7 +12,7 @@ import { isAbsoluteURL as a } from "../shared-utils/isAbsoluteURL.js";
 import "../shared-utils/animationFrame/BetterTween.js";
 class R {
   constructor(t, r) {
-    s(this, "VERSION", "2.16.0-7");
+    s(this, "VERSION", "2.16.0-9");
     s(this, "five");
     s(this, "hooks", new m());
     s(this, "staticPrefix", "//vrlab-static.ljcdn.com");

package/libs/floorplan/TopviewFloorplanPlugin/Controller.js

@@ -88,7 +88,8 @@ import "../../shared-utils/isAbsoluteURL.js";
 import "../../shared-utils/animationFrame/BetterTween.js";
 import "../../shared-utils/animationFrame/index.js";
 import "../../shared-utils/nearlyEqual.js";
-class Nt extends L {
+import "../../shared-utils/to.js";
+class Ut extends L {
   constructor(t, e) {
     super(t);
     i(this, "name", "topviewFloorplanPlugin");
@@ -331,5 +332,5 @@ class Nt extends L {
   }
 }
 export {
-  Nt as Controller
+  Ut as Controller
 };

package/libs/floorplan/TopviewFloorplanPlugin/index.js

@@ -58,10 +58,11 @@ import "../../shared-utils/animationFrame/BetterTween.js";
 import "../../shared-utils/animationFrame/index.js";
 import "../../shared-utils/five/changeMode.js";
 import "../../shared-utils/nearlyEqual.js";
+import "../../shared-utils/to.js";
 import "../../shared-utils/getPxmm.js";
 import "../../shared-utils/changeModelCanvasOpacity.js";
-const fo = (o, r) => new t(o, r);
+const so = (o, r) => new t(o, r);
 export {
-  fo as TopviewFloorplanPlugin,
-  fo as default
+  so as TopviewFloorplanPlugin,
+  so as default
 };

package/libs/index.js

@@ -1,54 +1,54 @@
-import { PaintBrush as wm } from "./components/PaintBrush/index.js";
-import { PaintBrushTypeEnum as Hm } from "./components/PaintBrush/typings.js";
-import { ModelViewPlugin as $m } from "./ModelViewPlugin/Plugin.js";
-import { CSS3DRenderPlugin as km } from "./CSS3DRenderPlugin/index.js";
-import { PanoCursorRaycasterPlugin as zm } from "./PanoCursorRaycasterPlugin/index.js";
-import { ModelRoomLabelPlugin as Km, modelRoomLabelPluginServerParams as Qm } from "./ModelRoomLabelPlugin/index.js";
-import { FLOOR_PLAN_ATTACHED_TO as Xm } from "./floorplan/constant.js";
-import { ModelFloorplanPlugin as op } from "./floorplan/ModelFloorplanPlugin/index.js";
-import { MapviewFloorplanPlugin as tp } from "./floorplan/MapviewFloorplanPlugin/index.js";
-import { TopviewFloorplanPlugin as mp } from "./floorplan/TopviewFloorplanPlugin/index.js";
-import { PanoFloorplanRadarPlugin as ep } from "./floorplan/PanoFloorplanRadarPlugin/index.js";
-import { FLOOR_TYPE_MAP as np, ROOM_FETILE_TYPE_MAP as ap, ROOM_TYPE_MAP as Pp } from "./floorplan/typings/floorplanServerData.js";
-import { ModelChassisCompassPlugin as fp } from "./ModelChassisCompassPlugin/Plugin.js";
-import { ModelEntryDoorGuidePlugin as gp } from "./ModelEntryDoorGuidePlugin/Plugin.js";
-import { CameraMovementPlugin as dp } from "./CameraMovementPlugin/CameraMovementPlugin.js";
-import { CameraMovementEffect as Tp, Rotation as Lp } from "./CameraMovementPlugin/typing.js";
-import { PanoRulerPlugin as _p } from "./PanoRulerPlugin/Plugin.js";
-import { PanoRulerProPlugin as Rp } from "./PanoRulerProPlugin/index.js";
-import { PanoCompassPlugin as bp } from "./PanoCompassPlugin/index.js";
-import { PanoMeasurePlugin as Sp } from "./PanoMeasurePlugin/index.js";
-import { PanoSpatialTagPlugin as yp } from "./PanoSpatialTagPlugin/Plugin.js";
-import { modelItemLabelPluginServerParams as Dp } from "./ModelItemLabelPlugin/index.js";
-import { ModelTVVideoPlugin as Yp } from "./ModelTVVideoPlugin/Plugin.js";
-import { DIRECTION as Fp } from "./ModelTVVideoPlugin/typings.js";
-import { itemLabelPluginServerParams as Np } from "./ItemLabelPlugin/index.js";
-import { PanoDoorLabelPlugin as wp } from "./PanoDoorLabelPlugin/index.js";
-import { GuideLinePlugin as Hp } from "./GuideLinePlugin/index.js";
-import { CruisePlugin as $p } from "./CruisePlugin/index.js";
-import { PanoTagPlugin as kp } from "./PanoTagPlugin/index.js";
-import { Object3DHelperPlugin as zp } from "./Object3DHelperPlugin/index.js";
-import { PanoVideoPlugin as Kp } from "./PanoVideoPlugin/index.js";
-import { index as Wp } from "./shared-utils/index.js";
-import { CSS3DRender as Zp } from "./CSS3DRenderPlugin/utils/three/CSS3DRender.js";
-import { Model as re } from "./PanoMeasurePlugin/Model/index.js";
-import { default as ie } from "./PanoMeasurePlugin/Model/point.js";
-import { default as pe } from "./PanoMeasurePlugin/Model/line.js";
-import { Polyline as le } from "./PanoMeasurePlugin/Model/polyline.js";
-import { default as ae } from "./PanoMeasurePlugin/Modules/Magnifier.js";
-import { DISPLAY_STRATEGY_TYPE as ue } from "./ModelItemLabelPlugin/typings.js";
-import { ModelItemLabelPlugin as xe } from "./ModelItemLabelPlugin/ModelItemLabelPlugin.js";
-import { ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE as se } from "./ItemLabelPlugin/typings.js";
-import { Plugin as Me } from "./ItemLabelPlugin/Plugin.js";
-import { GuideLineItem$1 as Le } from "./GuideLinePlugin/GuideLineItem/index.js";
-import { GuideLineModeItem$1 as _e } from "./GuideLinePlugin/GuideLineModeItem/index.js";
-import { default as Re } from "./CruisePlugin/Controller.js";
-import { typing as be } from "./CruisePlugin/typing/index.js";
-import { default as Se, pluginFlag as ce } from "./PanoTagPlugin/controller/index.js";
-import { ContentType as Ae } from "./PanoTagPlugin/typings/tag/TagData.js";
-import { DimensionType as Ge } from "./PanoTagPlugin/typings/tag/Utils.js";
-import { Object3DHelperController as ve, PLUGIN as Fe } from "./Object3DHelperPlugin/Controller.js";
-import { typings as Ne } from "./PanoVideoPlugin/typings/index.js";
+import { PaintBrush as Bm } from "./components/PaintBrush/index.js";
+import { PaintBrushTypeEnum as Um } from "./components/PaintBrush/typings.js";
+import { ModelViewPlugin as jm } from "./ModelViewPlugin/Plugin.js";
+import { CSS3DRenderPlugin as qm } from "./CSS3DRenderPlugin/index.js";
+import { PanoCursorRaycasterPlugin as Jm } from "./PanoCursorRaycasterPlugin/index.js";
+import { ModelRoomLabelPlugin as Qm, modelRoomLabelPluginServerParams as Wm } from "./ModelRoomLabelPlugin/index.js";
+import { FLOOR_PLAN_ATTACHED_TO as Zm } from "./floorplan/constant.js";
+import { ModelFloorplanPlugin as rp } from "./floorplan/ModelFloorplanPlugin/index.js";
+import { MapviewFloorplanPlugin as ip } from "./floorplan/MapviewFloorplanPlugin/index.js";
+import { TopviewFloorplanPlugin as pp } from "./floorplan/TopviewFloorplanPlugin/index.js";
+import { PanoFloorplanRadarPlugin as lp } from "./floorplan/PanoFloorplanRadarPlugin/index.js";
+import { FLOOR_TYPE_MAP as ap, ROOM_FETILE_TYPE_MAP as Pp, ROOM_TYPE_MAP as up } from "./floorplan/typings/floorplanServerData.js";
+import { ModelChassisCompassPlugin as xp } from "./ModelChassisCompassPlugin/Plugin.js";
+import { ModelEntryDoorGuidePlugin as sp } from "./ModelEntryDoorGuidePlugin/Plugin.js";
+import { CameraMovementPlugin as Mp } from "./CameraMovementPlugin/CameraMovementPlugin.js";
+import { CameraMovementEffect as Lp, Rotation as Cp } from "./CameraMovementPlugin/typing.js";
+import { PanoRulerPlugin as Ep } from "./PanoRulerPlugin/Plugin.js";
+import { PanoRulerProPlugin as Ip } from "./PanoRulerProPlugin/index.js";
+import { PanoCompassPlugin as Op } from "./PanoCompassPlugin/index.js";
+import { PanoMeasurePlugin as cp } from "./PanoMeasurePlugin/index.js";
+import { PanoSpatialTagPlugin as Ap } from "./PanoSpatialTagPlugin/Plugin.js";
+import { modelItemLabelPluginServerParams as Gp } from "./ModelItemLabelPlugin/index.js";
+import { ModelTVVideoPlugin as vp } from "./ModelTVVideoPlugin/Plugin.js";
+import { DIRECTION as Vp } from "./ModelTVVideoPlugin/typings.js";
+import { itemLabelPluginServerParams as hp } from "./ItemLabelPlugin/index.js";
+import { PanoDoorLabelPlugin as Bp } from "./PanoDoorLabelPlugin/index.js";
+import { GuideLinePlugin as Up } from "./GuideLinePlugin/index.js";
+import { CruisePlugin as jp } from "./CruisePlugin/index.js";
+import { PanoTagPlugin as qp } from "./PanoTagPlugin/index.js";
+import { Object3DHelperPlugin as Jp } from "./Object3DHelperPlugin/index.js";
+import { PanoVideoPlugin as Qp } from "./PanoVideoPlugin/index.js";
+import { index as Xp } from "./shared-utils/index.js";
+import { CSS3DRender as oe } from "./CSS3DRenderPlugin/utils/three/CSS3DRender.js";
+import { Model as te } from "./PanoMeasurePlugin/Model/index.js";
+import { default as me } from "./PanoMeasurePlugin/Model/point.js";
+import { default as ee } from "./PanoMeasurePlugin/Model/line.js";
+import { Polyline as ne } from "./PanoMeasurePlugin/Model/polyline.js";
+import { default as Pe } from "./PanoMeasurePlugin/Modules/Magnifier.js";
+import { DISPLAY_STRATEGY_TYPE as fe } from "./ModelItemLabelPlugin/typings.js";
+import { ModelItemLabelPlugin as ge } from "./ModelItemLabelPlugin/ModelItemLabelPlugin.js";
+import { ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE as de } from "./ItemLabelPlugin/typings.js";
+import { Plugin as Te } from "./ItemLabelPlugin/Plugin.js";
+import { GuideLineItem$1 as Ce } from "./GuideLinePlugin/GuideLineItem/index.js";
+import { GuideLineModeItem$1 as Ee } from "./GuideLinePlugin/GuideLineModeItem/index.js";
+import { default as Ie } from "./CruisePlugin/Controller.js";
+import { typing as Oe } from "./CruisePlugin/typing/index.js";
+import { default as ce, pluginFlag as ye } from "./PanoTagPlugin/controller/index.js";
+import { ContentType as De } from "./PanoTagPlugin/typings/tag/TagData.js";
+import { DimensionType as Ye } from "./PanoTagPlugin/typings/tag/Utils.js";
+import { Object3DHelperController as Fe, PLUGIN as Ve } from "./Object3DHelperPlugin/Controller.js";
+import { typings as he } from "./PanoVideoPlugin/typings/index.js";
 import "./components/PaintBrush/Controller.js";
 import "./components/PaintBrush/utils.js";
 import "./components/PaintBrush/tween.js";
@@ -227,6 +227,7 @@ import "./shared-utils/three/GLTFLoader.js";
 import "./shared-utils/log.js";
 import "./GuideLinePlugin/utils/createLineGeometry.js";
 import "./shared-utils/five/mode.js";
+import "./GuideLinePlugin/utils/index.js";
 import "./PanoTagPlugin/utils/addDebugPoints.js";
 import "./PanoTagPlugin/utils/tag/tagCheck.js";
 import "./PanoTagPlugin/utils/actionAfterFiveModelLoad.js";
@@ -355,63 +356,63 @@ import "./shared-utils/three/PointHelper.js";
 import "./shared-utils/three/Assets/index.js";
 import "./shared-utils/three/PointDomHelper.js";
 import "./shared-utils/three/FivePointSelector.js";
-console.info("@realsee/dnalogel %cv2.16.0-7", "background-color: #12ce9b;color:black;padding:0 6px;border-radius: 3px");
+console.info("@realsee/dnalogel %cv2.16.0-9", "background-color: #12ce9b;color:black;padding:0 6px;border-radius: 3px");
 export {
-  Zp as CSS3DRender,
-  km as CSS3DRenderPlugin,
-  Tp as CameraMovementEffect,
-  dp as CameraMovementPlugin,
-  Ae as ContentType,
-  $p as CruisePlugin,
-  Re as CruisePluginController,
-  be as CruisePluginTypes,
-  Fp as DIRECTION,
-  ue as DISPLAY_STRATEGY_TYPE,
-  Ge as DimensionType,
-  Xm as FLOOR_PLAN_ATTACHED_TO,
-  np as FLOOR_TYPE_MAP,
-  Le as GuideLineItem,
-  _e as GuideLineModeItem,
-  Hp as GuideLinePlugin,
-  se as ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE,
-  Me as ItemLabelPlugin,
-  ae as Magnifier,
-  tp as MapviewFloorplanPlugin,
-  fp as ModelChassisCompassPlugin,
-  gp as ModelEntryDoorGuidePlugin,
-  op as ModelFloorplanPlugin,
-  xe as ModelItemLabelPlugin,
-  Km as ModelRoomLabelPlugin,
-  Yp as ModelTVVideoPlugin,
-  $m as ModelViewPlugin,
-  ve as Object3DHelperController,
-  zp as Object3DHelperPlugin,
-  Fe as PLUGIN,
-  wm as PaintBrush,
-  Hm as PaintBrushTypeEnum,
-  bp as PanoCompassPlugin,
-  zm as PanoCursorRaycasterPlugin,
-  wp as PanoDoorLabelPlugin,
-  ep as PanoFloorplanRadarPlugin,
-  Sp as PanoMeasurePlugin,
-  pe as PanoMeasurePluginLine,
-  re as PanoMeasurePluginModel,
-  ie as PanoMeasurePluginPoint,
-  le as PanoMeasurePluginPolyline,
-  _p as PanoRulerPlugin,
-  Rp as PanoRulerProPlugin,
-  yp as PanoSpatialTagPlugin,
-  kp as PanoTagPlugin,
-  Se as PanoTagPluginController,
-  Kp as PanoVideoPlugin,
-  Ne as PanoVideoPluginType,
-  ap as ROOM_FETILE_TYPE_MAP,
-  Pp as ROOM_TYPE_MAP,
-  Lp as Rotation,
-  mp as TopviewFloorplanPlugin,
-  Wp as Util,
-  Np as itemLabelPluginServerParams,
-  Dp as modelItemLabelPluginServerParams,
-  Qm as modelRoomLabelPluginServerParams,
-  ce as pluginFlag
+  oe as CSS3DRender,
+  qm as CSS3DRenderPlugin,
+  Lp as CameraMovementEffect,
+  Mp as CameraMovementPlugin,
+  De as ContentType,
+  jp as CruisePlugin,
+  Ie as CruisePluginController,
+  Oe as CruisePluginTypes,
+  Vp as DIRECTION,
+  fe as DISPLAY_STRATEGY_TYPE,
+  Ye as DimensionType,
+  Zm as FLOOR_PLAN_ATTACHED_TO,
+  ap as FLOOR_TYPE_MAP,
+  Ce as GuideLineItem,
+  Ee as GuideLineModeItem,
+  Up as GuideLinePlugin,
+  de as ITEM_LABEL_PLUGIN_DISPLAY_STRATEGY_TYPE,
+  Te as ItemLabelPlugin,
+  Pe as Magnifier,
+  ip as MapviewFloorplanPlugin,
+  xp as ModelChassisCompassPlugin,
+  sp as ModelEntryDoorGuidePlugin,
+  rp as ModelFloorplanPlugin,
+  ge as ModelItemLabelPlugin,
+  Qm as ModelRoomLabelPlugin,
+  vp as ModelTVVideoPlugin,
+  jm as ModelViewPlugin,
+  Fe as Object3DHelperController,
+  Jp as Object3DHelperPlugin,
+  Ve as PLUGIN,
+  Bm as PaintBrush,
+  Um as PaintBrushTypeEnum,
+  Op as PanoCompassPlugin,
+  Jm as PanoCursorRaycasterPlugin,
+  Bp as PanoDoorLabelPlugin,
+  lp as PanoFloorplanRadarPlugin,
+  cp as PanoMeasurePlugin,
+  ee as PanoMeasurePluginLine,
+  te as PanoMeasurePluginModel,
+  me as PanoMeasurePluginPoint,
+  ne as PanoMeasurePluginPolyline,
+  Ep as PanoRulerPlugin,
+  Ip as PanoRulerProPlugin,
+  Ap as PanoSpatialTagPlugin,
+  qp as PanoTagPlugin,
+  ce as PanoTagPluginController,
+  Qp as PanoVideoPlugin,
+  he as PanoVideoPluginType,
+  Pp as ROOM_FETILE_TYPE_MAP,
+  up as ROOM_TYPE_MAP,
+  Cp as Rotation,
+  pp as TopviewFloorplanPlugin,
+  Xp as Util,
+  hp as itemLabelPluginServerParams,
+  Gp as modelItemLabelPluginServerParams,
+  Wm as modelRoomLabelPluginServerParams,
+  ye as pluginFlag
 };

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

@@ -1,5 +1,3 @@
 import type { Five } from '@realsee/five';
-/** 等待 five changeMode 结束
- * @description Promise 的状态只代表 mode 与预期是否一致，不保证参数的一致性
- */
-export default function changeMode(five: Five, changeModeParams: Parameters<Five['changeMode']>): Promise<void>;
+/** 等待 five changeMode 结束 */
+export default function changeMode(five: Five, changeModeParams: Parameters<Five['changeMode']>): Promise<boolean>;

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

@@ -1,37 +1,46 @@
-var d = (n, c, o) => new Promise((u, t) => {
-  var f = (e) => {
+var m = (e, c, t) => new Promise((r, n) => {
+  var a = (o) => {
     try {
-      s(o.next(e));
-    } catch (r) {
-      t(r);
+      u(t.next(o));
+    } catch (s) {
+      n(s);
     }
-  }, m = (e) => {
+  }, i = (o) => {
     try {
-      s(o.throw(e));
-    } catch (r) {
-      t(r);
+      u(t.throw(o));
+    } catch (s) {
+      n(s);
     }
-  }, s = (e) => e.done ? u(e.value) : Promise.resolve(e.value).then(f, m);
-  s((o = o.apply(n, c)).next());
+  }, u = (o) => o.done ? r(o.value) : Promise.resolve(o.value).then(a, i);
+  u((t = t.apply(e, c)).next());
 });
-import { nearlyEqual as P } from "../nearlyEqual.js";
-function p(n, c) {
-  return d(this, null, function* () {
-    yield new Promise((o, u) => {
-      n.changeMode(...c).catch((t) => u(t)), n.once("initAnimationEnded", () => {
-        const t = n.getCurrentState(), f = c[0];
-        t.mode !== f && u(new Error("mode \u4E0E\u9884\u671F\u4E0D\u7B26")), (() => {
-          const e = c[1];
-          return e ? Object.keys(e).every((r) => {
-            const i = t[r];
-            if (i === void 0)
-              return !0;
-            const E = e[r];
-            return typeof i == "number" && typeof E == "number" ? P(i, E, 2) : i === E;
-          }) : !0;
-        })() || u(new Error("five pose \u4E0E\u9884\u671F\u4E0D\u7B26")), o();
+import { nearlyEqual as f } from "../nearlyEqual.js";
+import { to as h } from "../to.js";
+function p(e, c) {
+  return m(this, null, function* () {
+    const [t] = yield h(e.changeMode(...c));
+    if (t)
+      throw new Error("change mode canceled");
+    yield new Promise((i) => {
+      e.once("initAnimationWillStart", () => {
+        e.once("initAnimationEnded", () => i());
       });
     });
+    const r = c[1];
+    if (!r)
+      return !0;
+    const n = e.getCurrentState();
+    if (!w(r, n))
+      throw new Error("pose \u4E0E\u9884\u671F\u4E0D\u7B26");
+  });
+}
+function w(e, c) {
+  return Object.keys(e).every((t) => {
+    const r = c[t];
+    if (r === void 0)
+      return !0;
+    const n = e[t];
+    return typeof r == "number" && typeof n == "number" ? f(r, n, 2) : r === n;
   });
 }
 export {

package/package.json

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