@shijiu/jsview-vue 2.3.0 → 2.3.151-test.0

package/utils/JsViewVueWidget/JsvFragShaderView/JsvFragShaderView.vue

@@ -12,6 +12,7 @@
  *           @prop {Array}      uniforms       uniform参数, [{ name: string, value: number }]
  *           @prop {Array}      textures       texture参数, [{ name: string, resource: string }]
  *           @prop {() => void} onStart        动画开始回调
+ *           @prop {boolean}    reverseAnimate 是否反向动画
  *           @prop {(int,boolean) => void} onEnd
  *                                动画结束回调,
  *                                返回值1号 int: 回到参数为动画的序列号，和startAnim的返回值匹配
@@ -65,6 +66,10 @@ const rProps = defineProps({
     type: Boolean,
     default: false,
   },
+  reverseAnimate: {
+    type: Boolean,
+    default: false,
+  },
   shaderStr: {
     type: String,
     required: true,
@@ -88,8 +93,6 @@ const rProps = defineProps({
 // 激活引擎中的功能支持
 JsvUseFeature("JsvFragShaderView", FeatureNames.CustomFragShader);
 
-console.log("LudlDebug using JsvFragShaderView...");
-
 let rAnimRunning = shallowRef(false); // 动画是否在执行，画面只在动画进行时进行显示
 let vPreloadHandler = null;
 let vPreloadDone = false;
@@ -133,26 +136,25 @@ if (rProps.textures) {
       });
       preload_textures.push(new JsvTextureLoadTool.ItemSet(image_url));
     }
+  }
+  // 对图片进行预加载，等所有图片预加载完成后才能开始动画，以确保动画的完整性
 
-    // 对图片进行预加载，等所有图片预加载完成后才能开始动画，以确保动画的完整性
-
-    vPreloadHandler = JsvTextureLoadTool.preload(preload_textures, () => {
-      vPreloadDone = true;
+  vPreloadHandler = JsvTextureLoadTool.preload(preload_textures, () => {
+    vPreloadDone = true;
 
-      // 加载完成后直接释放句柄即可
-      vPreloadHandler.recycleResource();
-      vPreloadHandler = null;
+    // 加载完成后直接释放句柄即可
+    vPreloadHandler.recycleResource();
+    vPreloadHandler = null;
 
-      if (vStartingPromise != null) {
-        vStartingPromise.resolve();
-      }
-    });
-    if (vPreloadHandler == null) {
-      // 无需要preload的内容，直接视为preloadDone
-      vPreloadDone = true;
-      if (vStartingPromise != null) {
-        vStartingPromise.resolve();
-      }
+    if (vStartingPromise != null) {
+      vStartingPromise.resolve();
+    }
+  });
+  if (vPreloadHandler == null) {
+    // 无需要preload的内容，直接视为preloadDone
+    vPreloadDone = true;
+    if (vStartingPromise != null) {
+      vStartingPromise.resolve();
     }
   }
 }
@@ -178,7 +180,7 @@ function clearStartAnimTimeout() {
   }
 }
 
-const startAnim = (alt_duration, on_timeout_func) => {
+const startAnim = (alt_duration, on_timeout_func, reverse = false) => {
   vStartingPromise = null; // 重置promise回执处理
   rAnimRunning.value = false;
   vStartToken++;
@@ -223,7 +225,9 @@ const startAnim = (alt_duration, on_timeout_func) => {
 
       if (duration > 0) {
         let shaderAnimation = new Forge.ShaderAnimation(duration, null);
-        shaderAnimation.Enable(0x1); // ReleaseAfterEndCallback
+        shaderAnimation.Enable(
+          0x1 | (reverse ? Forge.AnimationEnable.Reverse : 0)
+        ); // ReleaseAfterEndCallback
         shaderAnimation.SetAnimationListener(
           new Forge.AnimationListener(
             null /* animation的onStart目前不调用 */,
@@ -263,7 +267,7 @@ const stopAnim = () => {
 
 onMounted(() => {
   if (rProps.autoplay) {
-    startAnim(rProps.duration);
+    startAnim(rProps.duration, undefined, rProps.reverseAnimate);
   }
 });
 

package/utils/JsViewVueWidget/JsvFreeMoveActor/SetAction.ts

@@ -280,7 +280,7 @@ class ActorPackBuilder {
         ActOnGetToSpeed(
           this,
           xSpeed, ySpeed,
-          [ActionCmdBuilder.ResetAcc(0, 0),
+          [ActionCmdBuilder.SetAccel(0, 0),
           this._NexusRecv ? StateCmdBuilder.FireNexusEvent(ActEventDefine.ActFinish, this._NexusRecv.token) : null
           ],
           true, // isFinal

package/utils/JsViewVueWidget/JsvInput/JsvInput.vue

@@ -157,6 +157,7 @@ function _OnTextChanged(input_final_text, dsp_text) {
   );
   rInputFinalText.value = dsp_text;
   rInputFinalTextLenth.value = dsp_text.length;
+  rProps.onTextChange?.(dsp_text);
 }
 
 function _OnCursorPositionChanged(text_left, cursor_left) {

package/utils/JsViewVueWidget/JsvPreload/JsvPreload.vue

@@ -197,13 +197,13 @@ const _getPreloadViewIdList = () => {
       return;
     }
     const callback_token = texture.RegisterLoadImageCallback(null, (params) => {
-      console.log(`preload succeed ${image_url}`, params);
+      // console.log(`preload succeed ${image_url}`, params);
       preloadStateList[index] = true;
       preloadResultMap[item.url] = {
         width: params.width,
         height: params.height,
       };
-      console.log(`preload succeed ${item.url}, params:${params}`);
+      // console.log(`preload succeed ${item.url}, params:${params}`);
       _checkPreload();
     });
     texture.EnableBackgroundLoad();

package/utils/JsViewVueWidget/JsvSmoothSlideContainer.vue

@@ -0,0 +1,108 @@
+<template>
+  <div ref="root">
+    <slot></slot>
+  </div>
+</template>
+
+<script setup>
+import ActorControl from "./JsvFreeMoveActor/ActorControl";
+import { shallowRef, onMounted, computed, ref } from "vue";
+
+const props = defineProps({
+  initPosition: {
+    type: Array,
+    default: () => [0, 0],
+  },
+});
+
+const ReachConditionGroup = 2;
+
+const root = shallowRef();
+const actorControl = new ActorControl();
+let preTarget = props.initPosition;
+let curTarget = props.initPosition;
+
+onMounted(() => {
+  actorControl.bindForgeView(root.value.jsvGetProxyView(), true);
+  // 初始化位置
+  actorControl.run((cmds) => [
+    cmds.action().teleportTo(props.initPosition[0], props.initPosition[1]),
+  ]);
+});
+
+let curSpeed = 0;
+
+/**
+ * 移动到指定位置
+ * @param speed 速度
+ * @param x 目标x坐标
+ * @param y 目标y坐标
+ * @param onReach 到达目标位置后的回调
+ * @param prex 到达前x坐标
+ * @param prey 到达前y坐标
+ * @param onPreReach 到达前回调
+ */
+const moveTo = (speed, x, y, onReach, prex, prey, onPreReach) => {
+  if (x == curTarget[0] && y == curTarget[1] && curSpeed == speed) {
+    return;
+  }
+  curSpeed = speed;
+  let targetX = undefined;
+  let targetY = undefined;
+  let preTargetX = undefined;
+  let preTargetY = undefined;
+  let speedX = undefined;
+  let speedY = undefined;
+
+  preTarget = [curTarget[0], curTarget[1]];
+  curTarget = [x, y];
+  const vec = [x - preTarget[0], y - preTarget[1]];
+  const module = Math.sqrt(vec[0] * vec[0] + vec[1] * vec[1]);
+  if (vec[0] != 0) {
+    speedX = (vec[0] / module) * speed;
+    targetX = x;
+    preTargetX = prex;
+  } else if (vec[1] != 0) {
+    speedY = (vec[1] / module) * speed;
+    targetY = y;
+    preTargetY = prey;
+  }
+
+  actorControl.run((cmds) => [
+    cmds.state().removeConditionByGroup(ReachConditionGroup),
+    cmds.action(0, 0).setSpeed(speedX, speedY),
+    cmds
+      .condition(ReachConditionGroup)
+      .reachPosition(preTargetX, preTargetY)
+      .then([onPreReach]),
+    cmds
+      .condition(ReachConditionGroup)
+      .reachPosition(targetX, targetY)
+      .then([onReach]),
+  ]);
+};
+
+/**
+ * 刹车到指定位置
+ * @param x 目标x坐标
+ * @param y 目标y坐标
+ */
+const brakeTo = (x, y) => {
+  actorControl.run((cmds) => [cmds.action(3, 0).brakeToPosition(x, y)]);
+};
+
+const stop = () => {
+  actorControl.run((cmds) => [cmds.action().setSpeed(0, 0)]);
+};
+
+const setSpeed = (speedX, speedY) => {
+  actorControl.run((cmds) => [cmds.action().setSpeed(speedX, speedY)]);
+};
+
+defineExpose({
+  moveTo,
+  brakeTo,
+  stop,
+  setSpeed,
+});
+</script>

package/utils/JsViewVueWidget/JsvSoundPool.js

@@ -49,22 +49,57 @@ class AudioController {
     this._SoundId = soundId;
     this._Url = url;
     this._StreamId = -1;
+    this._StreamStartTime = 0;
+    this._SubStreamId = -1; // 快速重复播放的第二路音轨
+    this._SubStreamStartTime = 0;
+    this._LatestStreamStartTime = 0;
 
     this._Rate = 1;
     this._Loop = 0;
     this._LeftVolume = 1;
     this._RightVolume = 1;
     this._Priority = 0;
+    this._FastRepeatGap = 0;
+  }
+
+  enableFastRepeat(mini_gap) {
+    this._FastRepeatGap = mini_gap;
   }
 
   /**
      * @description: 播放音频
      */
   play() {
+    if (this._FastRepeatGap == 0) {
+      this._playMainStream(0);
+    } else {
+      let now = Date.now();
+      if (now - this._LatestStreamStartTime > this._FastRepeatGap / 2 && now - this._StreamStartTime > this._FastRepeatGap) {
+        this._playMainStream(now);
+      } else {
+        if (now - this._LatestStreamStartTime > this._FastRepeatGap / 2 && now - this._SubStreamStartTime > this._FastRepeatGap) {
+          this._playSubStream(now);
+        }
+      }
+    }
+  }
+
+  _playMainStream(now) {
     if (this._StreamId !== -1) {
       this._SoundPool.stop(this._StreamId);
     }
     this._StreamId = this._SoundPool.play(this._SoundId, this._LeftVolume, this._RightVolume, this._Priority, this._Loop, this._Rate);
+    this._StreamStartTime = now;
+    this._LatestStreamStartTime = now;
+  }
+
+  _playSubStream(now) {
+    if (this._SubStreamId !== -1) {
+      this._SoundPool.stop(this._SubStreamId);
+    }
+    this._SubStreamId = this._SoundPool.play(this._SoundId, this._LeftVolume, this._RightVolume, this._Priority, this._Loop, this._Rate);
+    this._SubStreamStartTime = now;
+    this._LatestStreamStartTime = now;
   }
 
   /**
@@ -74,6 +109,11 @@ class AudioController {
     if (this._StreamId !== -1) {
       this._SoundPool.pause(this._StreamId);
     }
+    // 第二路直接停止即可
+    if (this._SubStreamId !== -1) {
+      this._SoundPool.stop(this._SubStreamId);
+      this._SubStreamId = -1;
+    }
   }
 
   /**
@@ -93,6 +133,10 @@ class AudioController {
       this._SoundPool.stop(this._StreamId);
       this._StreamId = -1;
     }
+    if (this._SubStreamId !== -1) {
+      this._SoundPool.stop(this._SubStreamId);
+      this._SubStreamId = -1;
+    }
   }
 
   /**
@@ -100,10 +144,8 @@ class AudioController {
      * @param {float} rate 播放的倍率
      */
   setRate(rate) {
+    // 在起播前设置
     this._Rate = rate;
-    if (this._Streamid !== -1) {
-      this._SoundPool.setRate(this._StreamId, this._Rate);
-    }
   }
 
   /**
@@ -112,11 +154,9 @@ class AudioController {
      * @param {float} rightVolume 右声道音量
      */
   setVolume(leftVolume, rightVolume) {
+    // 在起播前设置
     this._LeftVolume = leftVolume;
     this._RightVolume = rightVolume;
-    if (this._StreamId !== -1) {
-      this._SoundPool.setVolume(this._StreamId, this._LeftVolume, this._RightVolume);
-    }
   }
 
   /**
@@ -124,10 +164,8 @@ class AudioController {
      * @param {int} loop 循环次数
      */
   setLoop(loop) {
+    // 在起播前设置
     this._Loop = loop;
-    if (this._StreamId !== -1) {
-      this._SoundPool.setLoop(this._StreamId, this._Loop);
-    }
   }
 
   /**
@@ -135,10 +173,8 @@ class AudioController {
      * @param {int} priority 优先级
      */
   setPriority(priority) {
+    // 在起播前设置
     this._Priority = priority;
-    if (this._StreamId !== -1) {
-      this._SoundPool.setPriority(this._StreamId, this._Priority);
-    }
   }
 }
 
@@ -161,6 +197,30 @@ class JsvSoundPool {
      * @param {function} callback 资源加载完成回调 function(int state, AudioController controller) {}
      */
   request(url, netSetting, priority, callback) {
+    this._request(url, 0, netSetting, priority, callback);
+  }
+
+  /**
+     * @description: 准备音频资源
+     * @param {string} url 音频url
+     * @param {int} fastRepeatGap 最小间隔时间, 如果不为0则启用快速重复播放, 用两路音轨解决快速播放的漏音问题
+     * @param {string} netSetting http请求配置
+     * @param {int} priority 优先级
+     * @param {function} callback 资源加载完成回调 function(int state, AudioController controller) {}
+     */
+  requestInRepeatMode(url, fastRepeatGap, netSetting, priority, callback) {
+    this._request(url, fastRepeatGap, netSetting, priority, callback);
+  }
+
+  /**
+     * @description: 准备音频资源
+     * @param {string} url 音频url
+     * @param {int} repeatFastMiniGap 最小间隔时间, 如果不为0则启用快速重复播放, 用两路音轨解决快速播放的漏音问题
+     * @param {string} netSetting http请求配置
+     * @param {int} priority 优先级
+     * @param {function} callback 资源加载完成回调 function(int state, AudioController controller) {}
+     */
+  _request(url, repeatFastMiniGap, netSetting, priority, callback) {
     if (!supportSoundPool) {
       callback(-1, null);
       console.log("not support sound pool.");
@@ -181,6 +241,9 @@ class JsvSoundPool {
             referCount: 1
           };
           const controller = new AudioController(this._SoundPool, sound_id, realUrl);
+          if (repeatFastMiniGap > 0) {
+            controller.enableFastRepeat(repeatFastMiniGap);
+          }
           this._StreamIdMap.add(controller);
           callback(state, controller);
         } else {