@realsee/dnalogel 3.5.0-dev.1 → 3.5.0-dev.2

package/libs/CruisePlugin/{CruiseController.js → BaseController.js}

@@ -1,34 +1,34 @@
 var v = Object.defineProperty;
 var g = Object.getOwnPropertySymbols;
 var S = Object.prototype.hasOwnProperty, y = Object.prototype.propertyIsEnumerable;
-var f = (a, s, e) => s in a ? v(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, c = (a, s) => {
+var u = (a, s, e) => s in a ? v(a, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : a[s] = e, b = (a, s) => {
   for (var e in s || (s = {}))
-    S.call(s, e) && f(a, e, s[e]);
+    S.call(s, e) && u(a, e, s[e]);
   if (g)
     for (var e of g(s))
-      y.call(s, e) && f(a, e, s[e]);
+      y.call(s, e) && u(a, e, s[e]);
   return a;
 };
-var h = (a, s, e) => (f(a, typeof s != "symbol" ? s + "" : s, e), e);
-var n = (a, s, e) => new Promise((t, i) => {
-  var r = (d) => {
+var d = (a, s, e) => (u(a, typeof s != "symbol" ? s + "" : s, e), e);
+var f = (a, s, e) => new Promise((i, t) => {
+  var r = (h) => {
     try {
-      o(e.next(d));
-    } catch (u) {
-      i(u);
+      n(e.next(h));
+    } catch (o) {
+      t(o);
     }
-  }, b = (d) => {
+  }, c = (h) => {
     try {
-      o(e.throw(d));
-    } catch (u) {
-      i(u);
+      n(e.throw(h));
+    } catch (o) {
+      t(o);
     }
-  }, o = (d) => d.done ? t(d.value) : Promise.resolve(d.value).then(r, b);
-  o((e = e.apply(a, s)).next());
+  }, n = (h) => h.done ? i(h.value) : Promise.resolve(h.value).then(r, c);
+  n((e = e.apply(a, s)).next());
 });
-import { Controller as C } from "../base/BasePlugin.js";
-import { equal as P } from "../shared-utils/equal.js";
-import { objectAssignDeepExports as L } from "../vendor/object-assign-deep/objectAssignDeep.js";
+import { Controller as L } from "../base/BasePlugin.js";
+import { equal as C } from "../shared-utils/equal.js";
+import { objectAssignDeepExports as P } from "../vendor/object-assign-deep/objectAssignDeep.js";
 import "../shared-utils/Subscribe.js";
 import "hammerjs";
 import "three";
@@ -51,33 +51,35 @@ import "../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "../shared-utils/url/absoluteUrl.js";
 import "../shared-utils/isTruelyObject.js";
-const m = "CruisePlugin", l = `${m}`, Z = (a) => `${l}--${a}`, w = () => {
-  console.error(`${l} is disposed`);
-}, I = () => {
-  console.warn(`${l} is disabled`);
-}, D = () => {
-  console.error(`${l} is disabled`);
-}, p = /* @__PURE__ */ new Map();
-class ee extends C {
-  constructor(e, t) {
-    super(e, t);
-    h(this, "state", {
+const m = "CruisePlugin", l = `${m}`, T = (a) => `${l}--${a}`, p = /* @__PURE__ */ new Map();
+class X extends L {
+  constructor(e, i) {
+    super(e, i);
+    d(this, "state", {
       visible: !0,
       enabled: !0,
       disposed: !1,
       playing: !1,
       speed: 1
     });
-    h(this, "data");
-    h(this, "config");
-    // What is your use case? This line meaning don't need re if UnknownRecord and UnknownArray
-    h(this, "privateState", {
+    d(this, "data");
+    d(this, "config");
+    d(this, "privateState", {
       playing: !1,
       broke: !1,
       modeChanging: !1
     });
-    h(this, "GuideLine");
-    this.config = t, Object.assign(window, { [`__${m}_DEBUG__`]: this });
+    d(this, "GuideLine");
+    d(this, "disposedErrorLog", () => {
+      console.error(`${l} is disposed`);
+    });
+    d(this, "disableWarnLog", () => {
+      console.warn(`${l} is disabled`);
+    });
+    d(this, "disableErrorLog", () => {
+      console.error(`${l} is disabled`);
+    });
+    this.config = i, Object.assign(window, { [`__${m}_DEBUG__`]: this });
   }
   /**
    * @description Play | Continue play. if have been paused, continue play from the pause position; if playing, do nothing
@@ -95,7 +97,7 @@ class ee extends C {
    * @description Show guide line
    */
   show(e) {
-    return n(this, null, function* () {
+    return f(this, null, function* () {
       this.setState({ visible: !0 }, e);
     });
   }
@@ -103,7 +105,7 @@ class ee extends C {
    * @description Hide guide line
    */
   hide(e) {
-    return n(this, null, function* () {
+    return f(this, null, function* () {
       this.setState({ visible: !1 }, e);
     });
   }
@@ -128,50 +130,50 @@ class ee extends C {
   /**
    * @description Set state
    */
-  setState(e, t) {
+  setState(e, i) {
     var r;
     if (this.state.disposed)
-      return w();
+      return this.disposedErrorLog();
     if (!this.state.enabled && e.enabled !== !0 && e.disposed !== !0)
-      return D();
-    const i = c({}, this.state);
-    this.state = L({}, this.state, e), e.disposed !== void 0 && e.disposed !== i.disposed && e.disposed && this.handleDispose(), e.visible !== void 0 && e.visible !== i.visible && this.handleVisible(e.visible, t == null ? void 0 : t.userAction), e.enabled !== void 0 && e.enabled !== i.enabled && this.handleEnable(e.enabled, t == null ? void 0 : t.userAction), e.playing !== void 0 && e.playing !== i.playing && this.changePlayState(e.playing, t), e.speed !== void 0 && e.speed !== i.speed && this.changeSpeed(e.speed), P(i, this.state, { deep: !0 }) || this.hooks.emit("stateChange", { state: this.state, prevState: i, userAction: (r = t == null ? void 0 : t.userAction) != null ? r : !0 });
+      return this.disableErrorLog();
+    const t = b({}, this.state);
+    this.state = P({}, 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), e.playing !== void 0 && e.playing !== t.playing && this.changePlayState(e.playing, i), e.speed !== void 0 && e.speed !== t.speed && this.changeSpeed(e.speed), C(t, this.state, { deep: !0 }) || this.hooks.emit("stateChange", { state: this.state, prevState: t, userAction: (r = i == null ? void 0 : i.userAction) != null ? r : !0 });
   }
   /**
    * @description Clear pause data
    */
   clearPauseData() {
-    var e, t;
+    var e, i;
     if ((e = this.data) != null && e.id)
-      return p.delete((t = this.data) == null ? void 0 : t.id);
+      return p.delete((i = this.data) == null ? void 0 : i.id);
   }
-  changePlayState(e, t) {
+  changePlayState(e, i) {
     this.actionIfStateIsEnabled(
       () => {
-        var i;
-        return this.hooks.emit("playStateChange", e ? "playing" : "pause", { userAction: (i = t == null ? void 0 : t.userAction) != null ? i : !0 });
+        var t;
+        return this.hooks.emit("playStateChange", e ? "playing" : "pause", { userAction: (t = i == null ? void 0 : i.userAction) != null ? t : !0 });
       }
-    ), e ? this.handlePlay(t) : this.handlePause(t), this.state.playing = e;
+    ), e ? this.handlePlay(i) : this.handlePause(i), this.state.playing = e;
   }
-  handleEnable(e, t = !0) {
-    var i, r;
-    e ? ((i = this.GuideLine) == null || i.enable(), this.hooks.emit("enable", { userAction: t })) : ((r = this.GuideLine) == null || r.disable(), this.changePlayState(!1, { userAction: t }), this.hooks.emit("disable", { userAction: t })), this.state.enabled = e;
+  handleEnable(e, i = !0) {
+    var t, r;
+    e ? ((t = this.GuideLine) == null || t.enable(), this.hooks.emit("enable", { userAction: i })) : ((r = this.GuideLine) == null || r.disable(), this.changePlayState(!1, { userAction: i }), this.hooks.emit("disable", { userAction: i })), this.state.enabled = e;
   }
-  handleVisible(e, t = !0) {
-    var i, r;
-    e ? ((i = this.GuideLine) == null || i.show(), this.actionIfStateIsEnabled(() => this.hooks.emit("show", { userAction: t }))) : ((r = this.GuideLine) == null || r.hide(), this.actionIfStateIsEnabled(() => this.hooks.emit("hide", { userAction: t }))), this.state.visible = e;
+  handleVisible(e, i = !0) {
+    var t, r;
+    e ? ((t = this.GuideLine) == null || t.show(), this.actionIfStateIsEnabled(() => this.hooks.emit("show", { userAction: i }))) : ((r = this.GuideLine) == null || r.hide(), this.actionIfStateIsEnabled(() => this.hooks.emit("hide", { userAction: i }))), this.state.visible = e;
   }
   /**
    * @description: listen interupted by five gesture
    */
   addInterruptListener(e) {
-    const t = () => {
+    const i = () => {
       this.privateState.modeChanging || e();
-    }, i = (r) => {
-      r !== "mouseMove" && (e(), this.five.off("gesture", i));
+    }, t = (r) => {
+      r !== "mouseMove" && (e(), this.five.off("gesture", t));
     };
-    return this.five.on("gesture", i), this.five.once("wantsChangeMode", t), () => {
-      this.five.off("gesture", i), this.five.off("wantsChangeMode", t);
+    return this.five.on("gesture", t), this.five.once("wantsChangeMode", i), () => {
+      this.five.off("gesture", t), this.five.off("wantsChangeMode", i);
     };
   }
   /**
@@ -180,14 +182,6 @@ class ee extends C {
   getSpeededDuration(e) {
     return e / this.state.speed;
   }
-  /**
-   * @description Change five mode
-   */
-  changeMode(e, t) {
-    return n(this, null, function* () {
-      e.mode && e.mode !== this.five.currentMode && (this.privateState.modeChanging = !0, yield this.five.changeMode(e.mode, e, t), this.privateState.modeChanging = !1);
-    });
-  }
   /**
    * @description Force interupt five updateCamera
    */
@@ -203,8 +197,8 @@ class ee extends C {
    * @description Set pause data
    */
   setPauseData() {
-    var t;
-    const e = (t = this.data) == null ? void 0 : t.id;
+    var i;
+    const e = (i = this.data) == null ? void 0 : i.id;
     if (e)
       return p.set(e, {
         fiveState: this.five.getCurrentState(),
@@ -225,13 +219,13 @@ class ee extends C {
   /**
    * @description Action function if plugin is enable
    */
-  actionIfStateIsEnabled(e, t) {
+  actionIfStateIsEnabled(e, i) {
     if (this.state.enabled)
       return e();
-    t != null && t.warnLog && I();
+    i != null && i.warnLog && this.disableWarnLog();
   }
 }
 export {
-  ee as default,
-  Z as pluginFlag
+  X as default,
+  T as pluginFlag
 };

package/libs/CruisePlugin/Move.d.ts

@@ -1,15 +1,15 @@
 import type { Five } from '@realsee/five';
-import CruiseController from './CruiseController';
+import CruiseController from './BaseController';
 import type { PluginState } from './typing';
 import type { PartialDeep } from 'type-fest';
 import type * as THREE from 'three';
 type Data = {
     path: THREE.CurvePath<THREE.Vector3>;
-    offset?: {
+    offset?: Partial<{
         x: number;
         y: number;
         z: number;
-    };
+    }>;
 };
 type Config = {
     offset?: number;

package/libs/CruisePlugin/Move.js

@@ -10,7 +10,7 @@ var m = (o, e, t) => e in o ? S(o, e, { enumerable: !0, configurable: !0, writab
   return o;
 };
 var r = (o, e, t) => (m(o, typeof e != "symbol" ? e + "" : e, t), t);
-import C from "./CruiseController.js";
+import C from "./BaseController.js";
 import { objectAssignDeepExports as u } from "../vendor/object-assign-deep/objectAssignDeep.js";
 import "hammerjs";
 import "three";

package/libs/CruisePlugin/Work.d.ts

@@ -1,25 +1,31 @@
-import type { Five } from '@realsee/five';
-import type { BaseOptions } from '../base/BasePlugin';
-import * as BasePluginWithData from '../base/BasePluginWithData';
-import type { PluginState, EventMap, PluginServerData, PluginData, Config } from './typing';
-export declare const pluginFlag: (name: string) => string;
-export default class WalkController extends BasePluginWithData.Controller<PluginState, EventMap, PluginServerData, PluginData> {
+import type { Five, State } from '@realsee/five';
+import type { PluginState, PluginServerData, PluginData, CruiseKeyframe, MoveEffect, Config } from './typing';
+import CruiseController from './BaseController';
+export default class WalkController extends CruiseController<PluginData, Config> {
     state: PluginState;
-    protected data?: PluginData;
-    private config?;
-    private privateState;
-    private GuideLine?;
+    protected privateState: {
+        /**
+         * privateState.playing 和 state.playing 的区别：
+         * state.playing 先为true，然后才 handleplay，handleplay方法内会检查privateState.playing，如果已经开始（privateState.playing === true），就不执行操作，如果为false，就执行操作
+         * 其实就是加了一个不允许重复执行handleplay的逻辑
+         */
+        playing: boolean;
+        currentPlayKeyframe: {
+            keyframe: CruiseKeyframe;
+            originDuration?: number;
+        } | null;
+        currentPlayQueue: Promise<any>[];
+        broke: boolean;
+        playId?: string;
+        moveToFirstPanoEffect?: MoveEffect;
+        moveToFirstPanoDuration?: number;
+        modeChanging?: boolean;
+    };
     constructor(five: Five, config?: Config);
     /**
      * @description Load Data and State
      */
     load(serverData: PluginServerData | PluginServerData['data'], state?: PluginState, userAction?: boolean): Promise<void>;
-    /**
-     * @description Play | Continue play. if have been paused, continue play from the pause position; if playing, do nothing
-     */
-    play(options?: {
-        userAction?: boolean;
-    }): void;
     /**
      * @description If playing, first pause, then play from keyframes index/id
      * @param {number} options.index play from keyframes index
@@ -37,68 +43,52 @@ export default class WalkController extends BasePluginWithData.Controller<Plugin
         userAction?: boolean;
     }): void;
     /**
-     * @description Pause
-     */
-    pause(options?: {
-        userAction?: boolean;
-    }): void;
-    /**
-     * @description Show guide line
-     */
-    show(options?: {
-        userAction?: boolean;
-    }): Promise<void>;
-    /**
-     * @description Hide guide line
+     * @description Format data
      */
-    hide(options?: {
-        userAction?: boolean;
-    }): Promise<void>;
+    protected formatData(serverData: PluginServerData | PluginServerData['data']): Promise<PluginData>;
     /**
-     * @description Enable
+     * @description Play | Continue play. if have been paused, continue play from the pause position; if playing, do nothing
+     * @param {number} options.playFromIndex play from keyframes index
+     * @param {string} options.playFromId play from keyframes id
      */
-    enable(options?: {
+    protected handlePlay(options?: {
         userAction?: boolean;
-    }): void;
+        playFromIndex?: number;
+        playFromId?: string;
+        notEmitEvent?: true;
+    }): Promise<string>;
     /**
-     * @description Disable
+     * @description: Pause and record pause state
      */
-    disable(options?: {
+    protected handlePause(options?: {
         userAction?: boolean;
+        notEmitEvent?: true;
     }): void;
     /**
-     * @description Dispose
-     */
-    dispose(): void;
-    /**
-     * @description Set state
+     * @description: Change play speed
      */
-    setState(state: Partial<PluginState>, options?: BaseOptions & Record<string, any>): void;
+    protected changeSpeed(speed: number, userAction?: boolean): void;
     /**
-     * @description Format data
+     * @description Get ratate progress
      */
-    protected formatData(serverData: PluginServerData | PluginServerData['data']): Promise<PluginData>;
-    private handleEnable;
-    private handleVisible;
-    private changePlayState;
+    protected getProgress(): any;
     /**
-     * @description Play | Continue play. if have been paused, continue play from the pause position; if playing, do nothing
-     * @param {number} options.playFromIndex play from keyframes index
-     * @param {string} options.playFromId play from keyframes id
+     * @description Set pause data
      */
-    private handlePlay;
+    protected setPauseData(): Map<string, {
+        fiveState: Partial<State>;
+        id?: string | number;
+        playedProgress: number;
+        duration?: number;
+    }>;
     /**
-     * @description: Pause and record pause state
+     * @description: Restore state that before loaded
      */
-    private handlePause;
+    protected clear(): void;
     /**
      * @description Play single keyframe
      */
     private playKeyframe;
-    /**
-     * @description: listen interupted by five gesture
-     */
-    private addInterruptListener;
     /**
      * @description: getPlayPromise
      */
@@ -123,42 +113,8 @@ export default class WalkController extends BasePluginWithData.Controller<Plugin
      * @description: Change five pano
      */
     private changePano;
-    /**
-     * @description: Change play speed
-     */
-    private changeSpeed;
-    /**
-     * @description Get duration by speed
-     */
-    private getSpeededDuration;
-    /**
-     * @description Get ratate progress
-     */
-    private getProgress;
     /**
      * @description Change five mode
      */
     private changeMode;
-    /**
-     * @description Force interupt five updateCamera
-     */
-    private forceInteruptUpdateCamera;
-    private getPauseData;
-    /**
-     * @description Set pause data
-     */
-    private setPauseData;
-    /**
-     * @description Clear pause data
-     */
-    private clearPauseData;
-    /**
-     * @description: Restore state that before loaded
-     */
-    private clear;
-    private handleDispose;
-    /**
-     * @description Action function if plugin is enable
-     */
-    private actionIfStateIsEnabled;
 }