@shijiu/jsview-vue 2.1.25 → 2.1.200

package/utils/JsViewVueTools/JsvTextureStore/Store.ts

@@ -0,0 +1,32 @@
+import { TextureBase } from "./Texture";
+
+class JsvTextureStore {
+    private textureMap: Map<String, TextureBase> = new Map();
+
+    constructor() {
+
+    }
+
+    public addToStore(storeName: String, textureRef: TextureBase) {
+        this.textureMap.set(storeName, textureRef);
+    }
+
+    public getFromStore(storeName: String): TextureBase | undefined {
+        return this.textureMap.get(storeName);
+    }
+
+    public removeFromStore(storeName: String): TextureBase | undefined {
+        if (this.textureMap.has(storeName)) {
+            let textureBaseRef = this.textureMap.get(storeName);
+            this.textureMap.delete(storeName);
+            return textureBaseRef;
+        } else {
+            console.error(`Error: name=${storeName} not in map`);
+            return undefined;
+        }
+    }
+}
+
+let sStore: JsvTextureStore = new JsvTextureStore();
+
+export default sStore;

package/utils/JsViewVueTools/JsvTextureStore/Texture.ts

@@ -0,0 +1,38 @@
+import sStore from "./Store";
+
+export class TextureBase {
+    private baseName: String = 'T';
+    protected textureRef: any = null; // Forge.ImageTexture
+    public storeName: String = '';
+
+    constructor(baseName: String | null) {
+        if (baseName) {
+            this.baseName = baseName;
+        }
+    }
+
+    protected addToStore() {
+        this.storeName = `${this.baseName}-${this.textureRef?.GetTextureId()}`;
+        sStore.addToStore(this.storeName, this);
+    }
+
+    /**
+     * commit
+     * 完成绘制设置，出发制作目标texture
+     * 
+     * @return {String} BaseName-textureId 格式的名字，用于 jsvtexturestore:// 的访问链接
+     */
+    public commit(): String {
+        // Should override by extends to create Forge.ImageTexture -> textureRef
+        return this.storeName;
+    }
+
+    public recycle() {
+        // 释放native端的texture实体
+        let textureRef = sStore.removeFromStore(this.storeName);
+        if (textureRef) {
+            // 释放native端的texture实体
+            this.textureRef?.RequestToUnload();
+        }
+    }
+}

package/utils/JsViewVueTools/index.js

@@ -12,6 +12,7 @@ export * from "./NinePatchHelper";
 export * from "./TypeCheckAndSet";
 export * from "./JsvRefTaker.js";
 export * from "./JsvStyleClass.js";
+export * from "./JsvStyleSheetsDeclarer.js";
 export * from "./DebugContentShellJBridge.js";
 export * from "./DebugTool.js";
 export * from "./JsvImpactTracer.js";
@@ -19,3 +20,5 @@ export * from "./JsvTextTools.js";
 export * from "./JsvPreDownloader.ts"
 export { default as DefaultKeyCodeMap } from "./DefaultKeyMap.js";
 export * from "./JsvDemoTester.js"
+export * from "./JsvPerformance.ts"
+export * from "./JsvTextureStore/JsvTextureStore.ts"

package/utils/JsViewVueWidget/JsvEnableRenderBreak.vue

@@ -0,0 +1,17 @@
+<script setup>
+import { RENDER_ITEM_BREAK_KEY } from "../JsViewEngineWidget/WidgetCommon";
+import { shallowRef } from "vue";
+
+const itemMounted = shallowRef(false);
+const itemRef = (value) => {
+  itemMounted.value = !!value;
+};
+</script>
+<template>
+  <div :key="RENDER_ITEM_BREAK_KEY" :ref="itemRef">
+    <slot name="renderItem" :key="RENDER_ITEM_BREAK_KEY"></slot>
+  </div>
+  <div v-if="!itemMounted">
+    <slot name="placeHolder"></slot>
+  </div>
+</template>

package/utils/JsViewVueWidget/JsvFreeMoveActor/ActionRefObject.ts

@@ -0,0 +1,6 @@
+
+
+export default class ActionRefObject {
+    public token: number;
+    public used: boolean = false;
+}

package/utils/JsViewVueWidget/JsvFreeMoveActor/ActorControl.ts

@@ -0,0 +1,144 @@
+/*
+ * @Author: donglin.lu@qcast.cn
+ * @Date: 2023-07-05 15:41:00
+ * @LastEditors: donglin.lu@qcast.cn
+ * @Description: file content
+ */
+import ConditionPackBuilder from "./SetCondition";
+import ActionPackBuilder from "./SetAction"
+import StatePackBuilder from "./SetState";
+import CallbackManager from "./CallbackManager";
+import ActionRefObject from "./ActionRefObject";
+import { RunFreeMoveCmdPacks, FreeMoveAnimClass } from "./ForgeTypeDefine"
+
+
+class ActorControl {
+  private _BindView: any;
+  private _BindAnim: any;
+  private _Callbacks: CallbackManager;
+
+  private _ConditionPackBuilder: ConditionPackBuilder;
+  private _ActionPackBuilder: ActionPackBuilder;
+  private _StatePackBuilder: StatePackBuilder;
+
+  constructor() {
+    this._BindView = null;
+    this._BindAnim = null;
+    this._Callbacks = new CallbackManager();
+    this._ConditionPackBuilder = new ConditionPackBuilder(this._Callbacks);
+    this._ActionPackBuilder = new ActionPackBuilder(this._Callbacks);
+    this._StatePackBuilder = new StatePackBuilder();
+  }
+
+  bindForgeView(bindView: any, instantActive: boolean) {
+    this._BindView = bindView;
+
+    if (instantActive) {
+      this._EnsureAnim();
+    }
+  }
+
+  /** 
+   * run 执行编排好的intent集合
+   *
+   * @param {Array} cmdPackList 内容来自 Condition(), State(), Action() 这些工厂类创建的Command pack
+   */
+  run(cmdPackList: Array<Object>) {
+    if ((window as any).JsView) {
+      this._WrappedRun(cmdPackList);
+    } else {
+      // Browser场景DomProxy需要onReady调用
+      let that = this;
+      this._BindView.RegisterOnProxyReady(() => {
+        that._WrappedRun(cmdPackList);
+      })
+    }
+  }
+
+  _WrappedRun(cmdPackList: Array<Object>) {
+    this._EnsureAnim();
+
+    if (!(cmdPackList instanceof Array)) {
+      console.error("params error");
+      return;
+    }
+
+    RunFreeMoveCmdPacks(this._BindView, cmdPackList);
+  }
+
+  /**
+   * Condition
+   * 获取创建 ConditionPack 的工厂对象
+   * ConditionPack对应支持 .then(cmdPackList), 可传入同 Run 的处理队列
+   * 可用方法见 ./SetCondition.js
+   * @param {int} group 可选参数，默认为0, 有效值为0~3, 对应默认组, 1组, 2组, 3组, 便于remove时，按组进行清理
+   * @param {boolean} multiTimes 可选参数，默认为false, 是否要多次执行, 若为单次，则执行后condition作废
+   * @param {string} specName 可选参数，默认null, 命名condition, 用于指定名字进行active/deactive动作的场景
+   * @return {ConditionPackBuilder} ConditionPack 的工厂对象
+   */
+  condition(
+    group: number = 0,
+    multiTimes: boolean = false,
+    specName: string | null = null
+  ): ConditionPackBuilder {
+    // 注意: 不支持获取condition后，多次复制
+    this._ConditionPackBuilder.updateCommandInfo(group, multiTimes, specName);
+    return this._ConditionPackBuilder;
+  }
+
+  /**
+   * Action
+   * 获取创建 ActionPack 的工厂对象
+   * 注意: ActionPack 是指会改变 speed 或 accelerate 并自动生成子condition的指令，
+   * 每个新的Action会覆盖掉前一次的Action设置，包括其关联的condition，
+   * 以及上一个action中的回调，以及上一个action中规划中的ActionEvent
+   * 可用方法见 ./SetAction.js
+   * 
+   * @param {int} xySpeedKeeps xy轴上的速度是否保持(与新Action不冲突的才会被保留)，
+   *                           x轴保持为1, y轴保持为2，可"与或"让两个轴都保持
+   * @param {int} xyAccKeeps xy轴上的加速度是否保持(与新Action不冲突的才会被保留)，
+   *                         x轴保持为1, y轴保持为2，可"与或"让两个轴都保持
+   * @param {Object} actRef 一个Object, 传入后会填入对此action的ref，用于后续制作
+   * @return {ActionPackBuilder} ActionPack 的工厂对象
+   */
+  action(
+    xySpeedKeeps: number = 0,
+    xyAccKeeps: number = 0,
+    actRef: ActionRefObject | null = null
+  ): ActionPackBuilder {
+    this._ActionPackBuilder.updateCommonInfo(xySpeedKeeps, xyAccKeeps, actRef);
+    return this._ActionPackBuilder;
+  }
+
+  /**
+   * State
+   * 获取创建 StatePack 的工厂对象
+   * 在下一帧运行前的设置值，例如清理condition, 或者在下一帧运动的前调整启动运动的位置
+   * 可用方法见 ./SetState.js
+   * @return {StatePackBuilder} StatePack 的工厂对象
+   */
+  state(): StatePackBuilder {
+    return this._StatePackBuilder;
+  }
+
+  _OnEchoEvent(retJson: string) {
+    // 遇到layout后仍然会因为新broadcast有动作时，一帧中可能会有多次回调
+    let retJsonObject: Object = JSON.parse(retJson);
+    let actorState = retJsonObject;
+    let echoTokens = retJsonObject["eTkns"];
+    if (echoTokens) {
+      for (let etoken of echoTokens) {
+        this._Callbacks.invokeCallback(etoken, actorState);
+      }
+    }
+  }
+
+  _EnsureAnim() {
+    if (!this._BindAnim) {
+      this._BindAnim = new FreeMoveAnimClass(this._OnEchoEvent.bind(this));
+      this._BindView.StartAnimation(this._BindAnim);
+    }
+  }
+}
+
+export default ActorControl;

package/utils/JsViewVueWidget/JsvFreeMoveActor/ActorState.ts

@@ -0,0 +1,6 @@
+export default class ActorState {
+    public xPos: number;
+    public yPos: number;
+    public xSpd: number;
+    public ySpd: number;
+}

package/utils/JsViewVueWidget/JsvFreeMoveActor/{CallbackManager.js → CallbackManager.ts}

@@ -5,29 +5,38 @@
  * @Description: file content
  */
 
-import { StateCmdBuilder } from "./CommonTools.js"
+import { StateCmdBuilder } from "./ForgeTypeDefine"
+
+class CallbackInfo {
+  public funcRef: Function; // 回调函数
+  public times: number; // 回调的次数
+  public once: boolean; // 是否单次回调就销毁
+}
 
 class CallbackManager {
+  private _CallbackMap: Map<string, CallbackInfo>;
+  private _IdGen: number;
+
   constructor() {
     this._CallbackMap = new Map();
     this._IdGen = 1;
   }
 
-  addCallback(func, callMulti) {
+  private addCallback(func: Function, callMulti: boolean): string {
     let id = "" + this._IdGen++;
     this._CallbackMap.set(id, {
-      f: func,  // 回调函数
+      funcRef: func,  // 回调函数
       times: 0,  // 回调的次数
       once: !callMulti, // 是否单次回调就销毁
     })
     return id;
   }
 
-  clearCallback() {
+  public clearCallback() {
     this._CallbackMap = new Map();
   }
 
-  expiredIds(ids) {
+  public expiredIds(ids: Array<string>) {
     // 删除已经无效的ids
     if (ids) {
       for (let key of this._CallbackMap.keys()) {
@@ -40,16 +49,16 @@ class CallbackManager {
     }
   }
 
-  invokeCallback(id, actorState) {
-    if (this._CallbackMap.has(id)) {
-      let callbackObj = this._CallbackMap.get(id);
+  public invokeCallback(id: string, actorState: Object) {
+    let callbackObj = this._CallbackMap.get(id);
+    if (callbackObj) {
       if (callbackObj.once) {
         this._CallbackMap.delete(id);
       } else {
         callbackObj.times++;
       }
       try {
-        callbackObj.f?.(actorState);
+        callbackObj.funcRef?.(actorState);
       } catch (e) {
         // 规避 callback 执行出错导致流程执行不下去
         console.error("Error: callback error", e);
@@ -57,7 +66,7 @@ class CallbackManager {
     }
   }
 
-  buildCallbackCmd(func) {
+  public buildCallbackCmd(func: Function): Object {
     let funcIdStr = this.addCallback(func, true);
     return StateCmdBuilder.FireEcho(funcIdStr); // 以funcIdStr 作为echoToken
   }

package/utils/JsViewVueWidget/JsvFreeMoveActor/ForgeTypeDefine.ts

@@ -0,0 +1,45 @@
+/*
+ * @Author: donglin.lu@qcast.cn
+ * @Date: 2023-07-18 11:14:00
+ * @LastEditors: donglin.lu@qcast.cn
+ * @Description: file content
+ */
+
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define.mjs";
+
+// 此文件声明来自engine-js的api和类型声明
+
+// ActEvent
+const forgeEvtTypeRef = Forge.FreeMoveActEvtType;
+const ActEventDefine = {
+    ActFinish: forgeEvtTypeRef.ActEvent_ActFinish,
+    SpeedRevertX: forgeEvtTypeRef.ActEvent_Speed_X_Revert,
+    SpeedRevertY: forgeEvtTypeRef.ActEvent_Speed_Y_Revert,
+    ActReject: forgeEvtTypeRef.ActEvent_ActReject,  // 当动作不可能完成，会回调此事件
+}
+
+// GroupType
+const GroupType_ActionAssoc: number = Forge.FreeMoveExternType?.GroupType_ActionAssoc;
+
+// Builders
+const ConditionSetBuilder: any = Forge.FreeMoveConditionSet;
+const StateCmdBuilder: any = Forge.FreeMoveStateBuilder;
+const ActionCmdBuilder: any = Forge.FreeMoveActionBuilder;
+const CmdPackBuilder: any = Forge.FreeMoveCmdPackBuilder;
+
+// FreeMoveAnimation class
+const FreeMoveAnimClass: any = Forge.FreeMoveAnimation;
+
+// Run function
+const RunFreeMoveCmdPacks: Function = Forge.AnimFireCommand.RunFreeMoveCmdPacks;
+
+export {
+    GroupType_ActionAssoc,
+    ActEventDefine,
+    ConditionSetBuilder,
+    ActionCmdBuilder,
+    StateCmdBuilder,
+    CmdPackBuilder,
+    FreeMoveAnimClass,
+    RunFreeMoveCmdPacks
+}

package/utils/JsViewVueWidget/JsvFreeMoveActor/FreeMoveActor.vue

@@ -13,7 +13,7 @@
  *
 -->
 <script setup>
-import ActControl from "./ActorControl.js";
+import ActControl from "./ActorControl.ts";
 import { shallowRef, onMounted } from "vue";
 
 const props = defineProps({

package/utils/JsViewVueWidget/JsvFreeMoveActor/JsvEnvBlocker.vue

@@ -0,0 +1,124 @@
+<!--
+ * 【模块 export 内容】
+ * JsvEnvBlocker: 触发FreeMoveAnimation的 blockerCondition 的全屏碰撞体
+ *      props说明:
+ *          top, left, width, height(Number): 关联的div的定位信息
+ *          topGID(Number): 上边缘响应监听的组id(用于blockerCondition的组参数), 0或者undefined代表不激活这条边的测试
+ *          bottomGID(Number): 下边缘响应监听的组id
+ *          leftGID(Number): 左边缘响应监听的组id
+ *          rightGID(Number): 右边缘响应监听的组id
+ * 
+-->
+
+<template>
+  <div
+    ref="viewRef"
+    :style="{
+      top: props.top,
+      left: props.left,
+      width: props.width,
+      height: props.height,
+    }"
+  >
+    <slot />
+  </div>
+</template>
+
+<script setup>
+import {
+  shallowRef,
+  toRaw,
+  watchEffect,
+  onMounted,
+  onActivated,
+  onDeactivated,
+} from "vue";
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
+
+const props = defineProps({
+  // (支持reactive)位置信息
+  left: {
+    type: Number,
+    default: 0,
+  },
+  top: {
+    type: Number,
+    default: 0,
+  },
+  width: {
+    type: Number,
+    require: true,
+  },
+  height: {
+    type: Number,
+    require: true,
+  },
+
+  // 四边关联的Group id, 和 blockerCondition的参数对应，若不设置或者为0则此边不触发condition
+  topGID: {
+    type: Number,
+  },
+  bottomGID: {
+    type: Number,
+  },
+  leftGID: {
+    type: Number,
+  },
+  rightGID: {
+    type: Number,
+  },
+
+  // (支持reactive)是否激活，仍然在渲染树时，非必须可以通过enable关闭以节省CPU开销
+  enable: {
+    type: Boolean,
+    default: true,
+  },
+});
+
+// 内部状态变量
+const viewRef = shallowRef(null);
+const viewMounted = reactive({ status: false });
+let sensorRef = null;
+
+// 变更四边检测开关和关联id
+watchEffect(() => {
+  if (viewMounted.status) {
+    if (!isNan(props.TopGID)) {
+      sensorRef.ResetTopGID(props.TopGID);
+    }
+    if (!isNan(props.bottomGID)) {
+      sensorRef.ResetBottomGID(props.bottomGID);
+    }
+    if (!isNan(props.leftGID)) {
+      sensorRef.ResetLeftGID(props.leftGID);
+    }
+    if (!isNan(props.rightGID)) {
+      sensorRef.ResetRightGID(props.rightGID);
+    }
+  }
+});
+
+// 变更enable状态
+watchEffect(() => {
+  if (viewMounted.status) {
+    sensorRef.Enable(props.enable);
+  }
+});
+
+onMounted(() => {
+  console.log("JsvEnvBlocker: on mounted");
+
+  sensorRef = new Forge.EnvBlockerSensor(
+    toRaw(viewRef.value).jsvGetProxyView()
+  );
+  viewMounted.status = true;
+});
+
+onActivated(() => {
+  sensorRef.Enable(props.enable);
+});
+
+onDeactivated(() => {
+  sensorRef.Enable(false);
+});
+</script>

package/utils/JsViewVueWidget/JsvFreeMoveActor/KeepFlags.ts

@@ -0,0 +1,6 @@
+export default {
+    None: 0,
+    X: 1,
+    Y: 2,
+    XY: 3 /* 1 & 2 位运算 */
+}