@shijiu/jsview-vue 0.9.246 → 0.9.254

package/utils/JsViewVueWidget/JsvActorMove/ActorControlBase.js

@@ -1,204 +1,204 @@
-/*
- * @Author: ChenChanghua
- * @Date: 2021-10-20 17:01:37
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2021-10-21 13:17:11
- * @Description: file content
- */
-import { Forge } from "../../../dom/jsv-forge-define";
-
-// JsvSpriteBase comes from JsView React Project
-
-class ActorControlBase {
-  constructor(params_count) {
-    this._Current = new Array(params_count).fill(0);
-    this._Target = new Array(params_count).fill(0);
-    this._ParameterCount = params_count;
-    this._StateIndex = 0; // 0: idle, 1:running
-    this._StateLocked = false;
-    this._StartSwitcher = false;
-    this._StartingParams = null; // 临时存储启动时的参数，启动真正开始后，此缓存就作废
-    this._PausedCallback = null;
-    this._EndCallback = null;
-    this._NextEndCallback = null;
-    this._Token = 0;
-    this._SpriteView = null;
-  }
-
-  start(start_params, end_callback) {
-    // 取消旧的Callback
-    this._NextEndCallback = end_callback;
-    this._EndCallback = null;
-
-    this._StartingParams = start_params;
-    this._StartSwitcher = true;
-    this._StateMachineNext();
-  }
-
-  pause(paused_callback) {
-    // 执行pause动作时，相当于取消start()动作，所以EndCallback同时也应该被取消
-    if (this._EndCallback !== null || this._NextEndCallback !== null) {
-      this._EndCallback = null;
-      this._NextEndCallback = null;
-    }
-
-    // 根据当前状态，已经处于Pause则直接回调，否则发送pause指令
-    if (this._StateIndex === 0) {
-      if (paused_callback) {
-        this._CallbackWithCatch(
-          this._Current,
-          paused_callback,
-          this._StartingParams /* 使用最后一次启动参数作为回调 */
-        );
-      }
-    } else {
-      if (paused_callback) {
-        this._PausedCallback = paused_callback;
-      }
-      this._StateMachineNext();
-    }
-  }
-
-  startFpsTesting() {
-    Forge.sRenderBridge.SetStepFpsSwitch(true);
-  }
-
-  stopFpsTesting() {
-    Forge.sRenderBridge.SetStepFpsSwitch(false);
-  }
-
-  _WrapBuildAnimation(
-    repeat_start_array,
-    current_array,
-    tos_array,
-    start_params
-  ) {
-    console.warn("Should Override", repeat_start_array, current_array, tos_array, start_params);
-  }
-
-  _WrapAddExtraListener(listener, start_params) {
-    console.warn("Should Override", listener, start_params);
-  }
-
-  _WrapCallback(currents, callback, start_params) {
-    console.warn("Should Override", currents, callback, start_params);
-  }
-
-  _WrapReCalculateCurrent(froms, tos, progress, start_params) {
-    console.warn("Should Override", froms, tos, progress, start_params);
-  }
-
-  _CallbackWithCatch(currents, callback, start_params) {
-    try {
-      this._WrapCallback(currents, callback, start_params);
-    } catch (e) {
-      console.error("Error:in callback:", e);
-    }
-  }
-
-  _StateMachineNext() {
-    if (this._StateLocked) {
-      // 内部处理进行中，暂停状态切换
-      return;
-    }
-
-    if (this._StateIndex === 0) {
-      // Idle -> play, need switcher
-      if (this._StartSwitcher) {
-        this._StartSwitcher = false;
-        if (this._StartAnimation()) {
-          this._StateIndex = 1;
-        }
-      }
-    } else if (this._StateIndex === 1) {
-      // Play -> idle, no need switcher
-      this._StopAnimation();
-    }
-  }
-
-  _StartAnimation() {
-    // 当动画开始后才进行回调设置，防止Pause过程中直接调用了新设置进的回调
-    this._EndCallback = this._NextEndCallback;
-    this._NextEndCallback = null;
-
-    const start_params = this._StartingParams;
-    this._StartingParams = null;
-
-    const froms = [...this._Current];
-    const tos = this._Target;
-    const repeat_starts = this._Repeat ? [...this._RepeatStart] : null;
-
-    // const token = this._Token++;
-
-    const anim = this._WrapBuildAnimation(froms, tos, start_params);
-
-    if (anim === null) {
-      return;
-    }
-
-    // 生成OnFinalProgress处理监听，memo在 _WrapBuildAnimation()处理后生成，因为build处理中可能改变tos
-    const memo_tos = [...tos];
-    const that = this;
-    const listener = new Forge.AnimationListener().OnFinalProgress(
-      (progress) => {
-        that._OnPaused(
-          repeat_starts !== null ? repeat_starts : froms,
-          memo_tos,
-          progress,
-          start_params
-        );
-      }
-    );
-
-    this._WrapAddExtraListener(listener, start_params);
-
-    anim.AddAnimationListener(listener);
-    anim.Enable(Forge.AnimationEnable.KeepTransform);
-    if (this._Repeat) {
-      anim.EnableInfinite();
-    }
-    this._SpriteView.StartAnimation(anim);
-
-    return true; // success
-  }
-
-  _StopAnimation() {
-    this._SpriteView.StopAnimation();
-  }
-
-  _OnPaused(froms, tos, progress, start_params) {
-    // 根据froms, tos, progress信息更新this._Current
-    this._WrapReCalculateCurrent(froms, tos, progress, start_params);
-
-    this._StateLocked = true; // 阻止在callback中触发的状态变化
-
-    // 标识状态为暂停，使回调中执行pause处理时能立刻得到pauseCallback
-    this._StateIndex = 0;
-
-    // 换出callbacks，回调时可能加入新的callbacks
-    const paused_callback = this._PausedCallback;
-    const ended_callback = this._EndCallback;
-    this._PausedCallback = null;
-    this._EndCallback = null;
-
-    // 回调所有callback
-    if (paused_callback) {
-      // Paused callback
-      this._CallbackWithCatch(this._Current, paused_callback, start_params);
-    }
-    if (ended_callback && progress === 1) {
-      // Ended callback
-      this._CallbackWithCatch(this._Current, ended_callback, start_params);
-    }
-
-    this._StateLocked = false;
-
-    this._StateMachineNext(); // Trigger next start
-  }
-
-  _SetView(jsv_view) {
-    this._SpriteView = jsv_view;
-  }
-}
-
-export default ActorControlBase;
+/*
+ * @Author: ChenChanghua
+ * @Date: 2021-10-20 17:01:37
+ * @LastEditors: ChenChanghua
+ * @LastEditTime: 2021-10-21 13:17:11
+ * @Description: file content
+ */
+import { Forge } from "../../../dom/jsv-forge-define";
+
+// JsvSpriteBase comes from JsView React Project
+
+class ActorControlBase {
+  constructor(params_count) {
+    this._Current = new Array(params_count).fill(0);
+    this._Target = new Array(params_count).fill(0);
+    this._ParameterCount = params_count;
+    this._StateIndex = 0; // 0: idle, 1:running
+    this._StateLocked = false;
+    this._StartSwitcher = false;
+    this._StartingParams = null; // 临时存储启动时的参数，启动真正开始后，此缓存就作废
+    this._PausedCallback = null;
+    this._EndCallback = null;
+    this._NextEndCallback = null;
+    this._Token = 0;
+    this._SpriteView = null;
+  }
+
+  start(start_params, end_callback) {
+    // 取消旧的Callback
+    this._NextEndCallback = end_callback;
+    this._EndCallback = null;
+
+    this._StartingParams = start_params;
+    this._StartSwitcher = true;
+    this._StateMachineNext();
+  }
+
+  pause(paused_callback) {
+    // 执行pause动作时，相当于取消start()动作，所以EndCallback同时也应该被取消
+    if (this._EndCallback !== null || this._NextEndCallback !== null) {
+      this._EndCallback = null;
+      this._NextEndCallback = null;
+    }
+
+    // 根据当前状态，已经处于Pause则直接回调，否则发送pause指令
+    if (this._StateIndex === 0) {
+      if (paused_callback) {
+        this._CallbackWithCatch(
+          this._Current,
+          paused_callback,
+          this._StartingParams /* 使用最后一次启动参数作为回调 */
+        );
+      }
+    } else {
+      if (paused_callback) {
+        this._PausedCallback = paused_callback;
+      }
+      this._StateMachineNext();
+    }
+  }
+
+  startFpsTesting() {
+    Forge.sRenderBridge.SetStepFpsSwitch(true);
+  }
+
+  stopFpsTesting() {
+    Forge.sRenderBridge.SetStepFpsSwitch(false);
+  }
+
+  _WrapBuildAnimation(
+    repeat_start_array,
+    current_array,
+    tos_array,
+    start_params
+  ) {
+    console.warn("Should Override", repeat_start_array, current_array, tos_array, start_params);
+  }
+
+  _WrapAddExtraListener(listener, start_params) {
+    console.warn("Should Override", listener, start_params);
+  }
+
+  _WrapCallback(currents, callback, start_params) {
+    console.warn("Should Override", currents, callback, start_params);
+  }
+
+  _WrapReCalculateCurrent(froms, tos, progress, start_params) {
+    console.warn("Should Override", froms, tos, progress, start_params);
+  }
+
+  _CallbackWithCatch(currents, callback, start_params) {
+    try {
+      this._WrapCallback(currents, callback, start_params);
+    } catch (e) {
+      console.error("Error:in callback:", e);
+    }
+  }
+
+  _StateMachineNext() {
+    if (this._StateLocked) {
+      // 内部处理进行中，暂停状态切换
+      return;
+    }
+
+    if (this._StateIndex === 0) {
+      // Idle -> play, need switcher
+      if (this._StartSwitcher) {
+        this._StartSwitcher = false;
+        if (this._StartAnimation()) {
+          this._StateIndex = 1;
+        }
+      }
+    } else if (this._StateIndex === 1) {
+      // Play -> idle, no need switcher
+      this._StopAnimation();
+    }
+  }
+
+  _StartAnimation() {
+    // 当动画开始后才进行回调设置，防止Pause过程中直接调用了新设置进的回调
+    this._EndCallback = this._NextEndCallback;
+    this._NextEndCallback = null;
+
+    const start_params = this._StartingParams;
+    this._StartingParams = null;
+
+    const froms = [...this._Current];
+    const tos = this._Target;
+    const repeat_starts = this._Repeat ? [...this._RepeatStart] : null;
+
+    // const token = this._Token++;
+
+    const anim = this._WrapBuildAnimation(froms, tos, start_params);
+
+    if (anim === null) {
+      return;
+    }
+
+    // 生成OnFinalProgress处理监听，memo在 _WrapBuildAnimation()处理后生成，因为build处理中可能改变tos
+    const memo_tos = [...tos];
+    const that = this;
+    const listener = new Forge.AnimationListener().OnFinalProgress(
+      (progress) => {
+        that._OnPaused(
+          repeat_starts !== null ? repeat_starts : froms,
+          memo_tos,
+          progress,
+          start_params
+        );
+      }
+    );
+
+    this._WrapAddExtraListener(listener, start_params);
+
+    anim.AddAnimationListener(listener);
+    anim.Enable(Forge.AnimationEnable.KeepTransform);
+    if (this._Repeat) {
+      anim.EnableInfinite();
+    }
+    this._SpriteView.StartAnimation(anim);
+
+    return true; // success
+  }
+
+  _StopAnimation() {
+    this._SpriteView.StopAnimation();
+  }
+
+  _OnPaused(froms, tos, progress, start_params) {
+    // 根据froms, tos, progress信息更新this._Current
+    this._WrapReCalculateCurrent(froms, tos, progress, start_params);
+
+    this._StateLocked = true; // 阻止在callback中触发的状态变化
+
+    // 标识状态为暂停，使回调中执行pause处理时能立刻得到pauseCallback
+    this._StateIndex = 0;
+
+    // 换出callbacks，回调时可能加入新的callbacks
+    const paused_callback = this._PausedCallback;
+    const ended_callback = this._EndCallback;
+    this._PausedCallback = null;
+    this._EndCallback = null;
+
+    // 回调所有callback
+    if (paused_callback) {
+      // Paused callback
+      this._CallbackWithCatch(this._Current, paused_callback, start_params);
+    }
+    if (ended_callback && progress === 1) {
+      // Ended callback
+      this._CallbackWithCatch(this._Current, ended_callback, start_params);
+    }
+
+    this._StateLocked = false;
+
+    this._StateMachineNext(); // Trigger next start
+  }
+
+  _SetView(jsv_view) {
+    this._SpriteView = jsv_view;
+  }
+}
+
+export default ActorControlBase;

package/utils/JsViewVueWidget/JsvActorMove/JsvActorMove.vue

@@ -1,64 +1,64 @@
-<!--
- * @Author: ChenChanghua
- * @Date: 2021-10-20 17:21:21
- * @LastEditors: ChenChanghua
- * @LastEditTime: 2021-11-18 16:45:05
- * @Description: file content
--->
-
-<!--
- * 【模块 export 内容】
- * JsvActorMove：React高阶组件，单轴(X 或 Y)运动控制控件，可控制完成单方向的匀速运动和变速运动（抛物运动），
- *               若想进行X和Y轴同时的运动，可以通过运动分解后的两个JsvActorMove进行组合来实现
- *      props说明:
- *          control {JsvActorMoveControl} JsvActorMove控制器实体，通过new JsvActorMoveControl()生成，说明见下文
- *
- * JsvActorMoveControl: 面向对象的类，JsvActorMove控制器
- *      功能函数：(参数说明见函数本体)
- *          moveToX(target_x, speed, end_callback)
- *              功能：延X轴进行匀速运动
- *          moveToY(target_y, speed, end_callback)
- *              功能：延Y轴进行匀速运动
- *          repeatMoveAlongX(target_x, speed, repeat_start, repeat_callback)
- *              功能：延X轴进行重复匀速运动
- *          repeatMoveAlongY(target_y, speed, repeat_start, repeat_callback)
- *              功能：延Y轴进行重复匀速运动
- *          throwAlongX(init_v, acc, end_condition, end_callback, pole_callback)
- *              功能：延X轴进行回旋运动
- *          throwAlongY(init_v, acc, end_condition, end_callback, pole_callback)
- *              功能：延Y轴进行回旋运动(例如Y轴抛物运动)
- *          jumpTo(new_x, new_y)
- *              功能：直接将JsvActorMove移动到目标位置，无中间运动动画
- *          pause(pause_callback)
- *              功能：暂停动画，并将JsvActorMove保持在暂停的位置上
-
--->
-<script>
-import JsvActorMoveControl from "./JsvActorMoveControl";
-export default {
-  props: {
-    control: {
-      type: JsvActorMoveControl,
-      required: true,
-    },
-    refDefine: Object,
-  },
-  mounted() {
-    this.control._SetView(this.$refs.element.jsvMainView);
-    if (this.refDefine) {
-      const type = typeof this.refDefine;
-      if (type === "object") {
-        type.current = this.$refs.element;
-      } else if (type === "function") {
-        this.refDefine(this.$refs.element);
-      }
-    }
-  },
-};
-</script>
-
-<template>
-  <div ref="element">
-    <slot></slot>
-  </div>
+<!--
+ * @Author: ChenChanghua
+ * @Date: 2021-10-20 17:21:21
+ * @LastEditors: ChenChanghua
+ * @LastEditTime: 2021-11-18 16:45:05
+ * @Description: file content
+-->
+
+<!--
+ * 【模块 export 内容】
+ * JsvActorMove：React高阶组件，单轴(X 或 Y)运动控制控件，可控制完成单方向的匀速运动和变速运动（抛物运动），
+ *               若想进行X和Y轴同时的运动，可以通过运动分解后的两个JsvActorMove进行组合来实现
+ *      props说明:
+ *          control {JsvActorMoveControl} JsvActorMove控制器实体，通过new JsvActorMoveControl()生成，说明见下文
+ *
+ * JsvActorMoveControl: 面向对象的类，JsvActorMove控制器
+ *      功能函数：(参数说明见函数本体)
+ *          moveToX(target_x, speed, end_callback)
+ *              功能：延X轴进行匀速运动
+ *          moveToY(target_y, speed, end_callback)
+ *              功能：延Y轴进行匀速运动
+ *          repeatMoveAlongX(target_x, speed, repeat_start, repeat_callback)
+ *              功能：延X轴进行重复匀速运动
+ *          repeatMoveAlongY(target_y, speed, repeat_start, repeat_callback)
+ *              功能：延Y轴进行重复匀速运动
+ *          throwAlongX(init_v, acc, end_condition, end_callback, pole_callback)
+ *              功能：延X轴进行回旋运动
+ *          throwAlongY(init_v, acc, end_condition, end_callback, pole_callback)
+ *              功能：延Y轴进行回旋运动(例如Y轴抛物运动)
+ *          jumpTo(new_x, new_y)
+ *              功能：直接将JsvActorMove移动到目标位置，无中间运动动画
+ *          pause(pause_callback)
+ *              功能：暂停动画，并将JsvActorMove保持在暂停的位置上
+
+-->
+<script>
+import JsvActorMoveControl from "./JsvActorMoveControl";
+export default {
+  props: {
+    control: {
+      type: JsvActorMoveControl,
+      required: true,
+    },
+    refDefine: Object,
+  },
+  mounted() {
+    this.control._SetView(this.$refs.element.jsvMainView);
+    if (this.refDefine) {
+      const type = typeof this.refDefine;
+      if (type === "object") {
+        type.current = this.$refs.element;
+      } else if (type === "function") {
+        this.refDefine(this.$refs.element);
+      }
+    }
+  },
+};
+</script>
+
+<template>
+  <div ref="element">
+    <slot></slot>
+  </div>
 </template>