@realsee/dnalogel 2.6.0 → 2.6.2-dev.0

package/libs/CruisePlugin/typing.d.ts

@@ -1,7 +1,7 @@
 import type { MovePanoOptions, Pose, State } from '@realsee/five';
 import type CruisePlugin from '.';
 import type * as BasePluginWithData from '../base/BasePluginWithData';
-import type { Route } from '../GuideLinePlugin/typing';
+import type { PluginData as GuideLinePluginData } from '../GuideLinePlugin/typing';
 declare type FivePoseAndState = Partial<Pose> & Partial<State>;
 export declare type MoveEffect = MovePanoOptions['effect'];
 export declare type CruiseData = {
@@ -26,6 +26,7 @@ export interface CruiseKeyframe {
 export interface PluginData {
     keyframesId: string;
     keyframes: CruiseKeyframe[];
+    guildPluginOptions?: GuideLinePluginData['config'];
 }
 export interface PluginServerData extends BasePluginWithData.ServerData {
     data: {
@@ -36,6 +37,8 @@ export interface PluginServerData extends BasePluginWithData.ServerData {
             end?: number;
             data: CruiseData;
         }[];
+        /** 传递给 GuildPlugin 的参数 */
+        guildPluginOptions?: GuideLinePluginData['config'];
         /** for ts check, no care */
         panoIndexList?: undefined;
         /** for ts check, no care */
@@ -62,9 +65,7 @@ export interface PluginServerData extends BasePluginWithData.ServerData {
         /** 停留时长 */
         stay?: number;
         /** 传递给 GuildPlugin 的参数 */
-        guildPluginOptions?: {
-            route: Omit<Route, 'panoIndexList'>;
-        };
+        guildPluginOptions?: GuideLinePluginData['config'];
         /** for ts check, no care */
         keyframes?: undefined;
     };

package/libs/GuideLinePlugin/Controller.js

@@ -1,43 +1,43 @@
-var k = Object.defineProperty;
-var G = Object.getOwnPropertySymbols;
-var x = Object.prototype.hasOwnProperty, P = Object.prototype.propertyIsEnumerable;
-var m = (n, s, e) => s in n ? k(n, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[s] = e, c = (n, s) => {
-  for (var e in s || (s = {}))
-    x.call(s, e) && m(n, e, s[e]);
-  if (G)
-    for (var e of G(s))
-      P.call(s, e) && m(n, e, s[e]);
-  return n;
+var y = Object.defineProperty;
+var S = Object.getOwnPropertySymbols;
+var I = Object.prototype.hasOwnProperty, N = Object.prototype.propertyIsEnumerable;
+var c = (r, t, e) => t in r ? y(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e, f = (r, t) => {
+  for (var e in t || (t = {}))
+    I.call(t, e) && c(r, e, t[e]);
+  if (S)
+    for (var e of S(t))
+      N.call(t, e) && c(r, e, t[e]);
+  return r;
 };
-var d = (n, s, e) => (m(n, typeof s != "symbol" ? s + "" : s, e), e);
-var u = (n, s, e) => new Promise((i, t) => {
-  var a = (r) => {
+var d = (r, t, e) => (c(r, typeof t != "symbol" ? t + "" : t, e), e);
+var u = (r, t, e) => new Promise((i, s) => {
+  var o = (a) => {
     try {
-      o(e.next(r));
+      h(e.next(a));
     } catch (l) {
-      t(l);
+      s(l);
     }
-  }, h = (r) => {
+  }, n = (a) => {
     try {
-      o(e.throw(r));
+      h(e.throw(a));
     } catch (l) {
-      t(l);
+      s(l);
     }
-  }, o = (r) => r.done ? i(r.value) : Promise.resolve(r.value).then(a, h);
-  o((e = e.apply(n, s)).next());
+  }, h = (a) => a.done ? i(a.value) : Promise.resolve(a.value).then(o, n);
+  h((e = e.apply(r, t)).next());
 });
-import { Controller as $ } from "../base/BasePluginWithData.js";
+import { Controller as W } from "../base/BasePluginWithData.js";
 import * as b from "three";
-import y from "./utils/getLineGeometries.js";
-import { getArrowMaterial as M } from "./utils/getArrowMaterial.js";
-import { notNil as w } from "../shared-utils/isNil.js";
-import { equal as N } from "../shared-utils/equal.js";
+import U from "./utils/getLineGeometries.js";
+import { getArrowMaterial as _ } from "./utils/getArrowMaterial.js";
+import { notNil as x } from "../shared-utils/isNil.js";
+import { equal as A } from "../shared-utils/equal.js";
 import "../base/BasePlugin.js";
 import "../shared-utils/Subscribe.js";
 import "polyline-normals";
 import "../shared-utils/isTruelyObject.js";
-const L = "v1.0.1", S = "GuideLinePlugin", v = `${S}@${L}`, E = (n) => `${v}--${n}`;
-class I extends $ {
+const M = "v1.1.0", $ = "GuideLinePlugin", v = `${$}@${M}`, P = (r) => `${v}--${r}`;
+class V extends W {
   constructor(e, i) {
     super(e, i);
     d(this, "state", {
@@ -54,14 +54,14 @@ class I extends $ {
       if (this.state.enabled)
         return e();
     });
-    Object.assign(window, { [`__${S}_DEBUG__`]: this });
+    Object.assign(window, { [`__${$}_DEBUG__`]: this });
   }
-  load(e, i, t = !0) {
+  load(e, i, s = !0) {
     return u(this, null, function* () {
-      const a = this.data ? JSON.parse(JSON.stringify(this.data)) : void 0, h = yield this.formatData(e);
-      this.hooks.emit("dataChange", h, a), this.data = h, this.linesGroup && this.five.scene.remove(this.linesGroup);
-      const o = this.getLinesGroup(h.routes);
-      !o || (this.linesGroup = o, yield this.waitFiveModelLoaded(), this.five.scene.add(o), this.handleVisible(this.state.visible), this.handleEnable(this.state.enabled), i && this.setState(i), this.five.needsRender = !0, this.hooks.emit("dataLoaded", h), console.log(`${v} loaded`, h));
+      const o = this.data ? JSON.parse(JSON.stringify(this.data)) : void 0, n = yield this.formatData(e);
+      this.hooks.emit("dataChange", n, o), this.data = n, this.linesGroup && this.five.scene.remove(this.linesGroup);
+      const h = this.getLinesGroup(n.routes, n.config);
+      !h || (this.linesGroup = h, yield this.waitFiveModelLoaded(), this.five.scene.add(h), this.handleVisible(this.state.visible), this.handleEnable(this.state.enabled), i && this.setState(i), this.five.needsRender = !0, this.hooks.emit("dataLoaded", n), console.log(`${v} loaded`, n));
     });
   }
   formatData(e) {
@@ -89,11 +89,11 @@ class I extends $ {
     this.setState({ disposed: !0 });
   }
   setState(e, i) {
-    var a;
+    var o;
     if (this.state.disposed)
       return this.disposedErrorLog();
-    const t = c({}, this.state);
-    this.state = c(c({}, this.state), e), e.disposed !== void 0 && e.disposed !== t.disposed && e.disposed && this.handleDispose(), e.visible !== void 0 && e.visible !== t.visible && this.handleVisible(e.visible, i == null ? void 0 : i.userAction), e.enabled !== void 0 && e.enabled !== t.enabled && this.handleEnable(e.enabled, i == null ? void 0 : i.userAction), N(t, this.state, { deep: !0 }) || (this.hooks.emit("stateChange", { state: this.state, prevState: t, userAction: (a = i == null ? void 0 : i.userAction) != null ? a : !0 }), this.five.needsRender = !0);
+    const s = f({}, this.state);
+    this.state = f(f({}, this.state), e), e.disposed !== void 0 && e.disposed !== s.disposed && e.disposed && this.handleDispose(), e.visible !== void 0 && e.visible !== s.visible && this.handleVisible(e.visible, i == null ? void 0 : i.userAction), e.enabled !== void 0 && e.enabled !== s.enabled && this.handleEnable(e.enabled, i == null ? void 0 : i.userAction), A(s, this.state, { deep: !0 }) || (this.hooks.emit("stateChange", { state: this.state, prevState: s, userAction: (o = i == null ? void 0 : i.userAction) != null ? o : !0 }), this.five.needsRender = !0);
   }
   handleEnable(e, i = !0) {
     this.linesGroup && (e ? (this.five.scene.add(this.linesGroup), this.actionWhenEnabled(() => this.hooks.emit("enable", { userAction: i }))) : (this.five.scene.remove(this.linesGroup), this.hooks.emit("disable", { userAction: i })));
@@ -104,28 +104,30 @@ class I extends $ {
   handleDispose() {
     this.linesGroup && this.five.scene.add(this.linesGroup);
   }
-  getLinesGroup(e) {
-    const i = e.map(this.getLine.bind(this)).filter(w), t = new b.Group();
-    if (t.name = E("route-group"), i.length !== 0)
-      return t.add(...i), t;
+  getLinesGroup(e, i) {
+    const s = e.map((n) => this.getLine(n, i)).filter(x), o = new b.Group();
+    if (o.name = P("route-group"), s.length !== 0)
+      return o.add(...s), o;
   }
-  getLine(e) {
-    var o, r, l, g;
-    const i = new b.Group(), t = e.panoIndexList.map((p) => {
-      var f;
-      return (f = this.five.work.observers[p]) == null ? void 0 : f.standingPosition;
-    }).filter(w), a = y(t, {
-      skipPanoIndexMesh: (o = e.skipPanoIndexMesh) != null ? o : !0,
-      unitWidth: (r = e.unitWidth) != null ? r : 0.6,
-      unitHeight: (l = e.unitHeight) != null ? l : 0.4
+  getLine(e, i) {
+    var a, l, G, g, w, E, L, k;
+    const s = new b.Group(), o = e.panoIndexList.map((m) => {
+      var p;
+      return (p = this.five.work.observers[m]) == null ? void 0 : p.standingPosition;
+    }).filter(x), n = U(o, {
+      skipPanoIndexMesh: (l = (a = e.skipPanoIndexMesh) != null ? a : i == null ? void 0 : i.skipPanoIndexMesh) != null ? l : !0,
+      unitWidth: (g = (G = e.unitWidth) != null ? G : i.unitWidth) != null ? g : 0.6,
+      unitHeight: (E = (w = e.unitHeight) != null ? w : i.unitHeight) != null ? E : 0.4
     });
-    if (!a)
+    if (!n)
       return;
-    const h = M({ textureUrl: (g = e.arrowTextureUrl) != null ? g : this.staticPrefix + "/release/web/arrow6.b6ce0c62.png" });
-    return a.forEach((p) => {
-      const f = new b.Mesh(p, h);
-      f.name = E("route-line-mesh"), i.add(f);
-    }), i;
+    const h = _({
+      textureUrl: (k = (L = e.arrowTextureUrl) != null ? L : i.arrowTextureUrl) != null ? k : this.staticPrefix + "/release/web/arrow6.b6ce0c62.png"
+    });
+    return n.forEach((m) => {
+      const p = new b.Mesh(m, h);
+      p.name = P("route-line-mesh"), s.add(p);
+    }), s;
   }
   waitFiveModelLoaded() {
     return u(this, null, function* () {
@@ -141,8 +143,8 @@ class I extends $ {
     });
   }
 }
-d(I, "lasestVersion", L);
+d(V, "lasestVersion", M);
 export {
-  I as default,
-  E as pluginFlag
+  V as default,
+  P as pluginFlag
 };

package/libs/GuideLinePlugin/typing.d.ts

@@ -1,14 +1,17 @@
 import type GuideLinePlugin from '.';
 import type * as BasePluginWithData from '../base/BasePluginWithData';
-export interface Route {
-    panoIndexList: number[];
+export interface RouteConfig {
     arrowTextureUrl?: string;
     skipPanoIndexMesh?: boolean;
     unitWidth?: number;
     unitHeight?: number;
 }
+export interface Route extends RouteConfig {
+    panoIndexList: number[];
+}
 export interface PluginData {
     routes: Route[];
+    config?: RouteConfig;
 }
 export interface PluginServerData extends BasePluginWithData.ServerData {
     data: PluginData;

package/libs/PanoMeasurePlugin/Controller/ViewController.js

@@ -15,7 +15,7 @@ import "../utils/isNDCPointInScreen.js";
 import "../Model/point.js";
 import "../../shared-utils/removeArrayItem.js";
 import "../utils/ironbox.js";
-class C extends h {
+class y extends h {
   constructor(e) {
     super(e);
     s(this, "type", "view");
@@ -57,7 +57,7 @@ class C extends h {
       const t = new a(i);
       this.hammer = t;
     }
-    this.updateDistanceUI(), this.five.needsRender = !0, this.model.hook.on("polylineAdded", this.polylineAdded), this.model.hook.on("polylineRemoved", this.polylineRemoved), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("panoArrived", this.onFivePanoArrived), this.five.on("panoWillArrive", this.onFivePanoWillArrive);
+    this.onFivePanoWillArrive(this.five.getCurrentState().panoIndex), this.onFivePanoArrived(this.five.getCurrentState().panoIndex), this.updateDistanceUI(), this.five.needsRender = !0, this.model.hook.on("polylineAdded", this.polylineAdded), this.model.hook.on("polylineRemoved", this.polylineRemoved), this.five.on("cameraUpdate", this.onCameraUpdate), this.five.on("panoArrived", this.onFivePanoArrived), this.five.on("panoWillArrive", this.onFivePanoWillArrive);
   }
   dispose() {
     var e;
@@ -65,5 +65,5 @@ class C extends h {
   }
 }
 export {
-  C as default
+  y as default
 };

package/package.json

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