@shijiu/jsview-vue 2.1.5 → 2.1.23

package/utils/JsViewVueWidget/JsvFreeMoveActor/ActorControl.js

@@ -0,0 +1,112 @@
+/*
+ * @Author: donglin.lu@qcast.cn
+ * @Date: 2023-07-05 15:41:00
+ * @LastEditors: donglin.lu@qcast.cn
+ * @Description: file content
+ */
+
+import { Forge } from "@shijiu/jsview/dom/jsv-forge-define";
+
+import ConditionPackBuilder from "./SetCondition.js";
+import ActionPackBuilder from "./SetAction.js"
+import StatePackBuilder from "./SetState.js";
+import CallbackManager from "./CallbackManager.js";
+
+
+class ActorControl {
+  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) {
+    this._BindView = bindView;
+  }
+
+  /** 
+   * run 执行编排好的intent集合
+   *
+   * @param {Array} cmdPackList 内容来自 Condition(), State(), Action() 这些工厂类创建的Command pack
+   */
+  run(cmdPackList) {
+    if (window.JsView) {
+      this._WrappedRun(cmdPackList);
+    } else {
+      // Browser场景DomProxy需要onReady调用
+      let that = this;
+      this._BindView.RegisterOnProxyReady(()=>{
+        that._WrappedRun(cmdPackList);
+      })
+    }
+  }
+
+  _WrappedRun(cmdPackList) {
+    this._EnsureAnim();
+
+    if (!(cmdPackList instanceof Array)) {
+      console.error("params error");
+      return;
+    }
+
+    Forge.AnimFireCommand.RunFreeMoveCmdPacks(this._BindView, cmdPackList);
+  }
+
+  /**
+   * Condition
+   * 获取创建 ConditionPack 的工厂对象
+   * ConditionPack对应支持 .then(cmdPackList), 可传入同 Run 的处理队列
+   * 可用方法见 ./SetCondition.js
+   */
+  condition(group, multiTimes, specName) {
+    // 注意: 不支持获取condition后，多次复制
+    this._ConditionPackBuilder.updateCommandInfo(group, multiTimes, specName);
+    return this._ConditionPackBuilder;
+  }
+
+  /**
+   * Action
+   * 获取创建 ActionPack 的工厂对象
+   * 注意: ActionPack 是指会改变 speed 或 accelerate 的指令，每个新的Action会覆盖掉前一次的Action设置，包括其关联的condition
+   * 可用方法见 ./SetAction.js
+   * 
+   * @param {int} xySpeedKeeps xy轴上的速度是否保持，x轴保持为1, y轴保持为2，可"与或"让两个轴都保持
+   * @param {int} xyAccKeeps xy轴上的加速度是否保持，x轴保持为1, y轴保持为2，可"与或"让两个轴都保持
+   * @return {ActionPackBuilder} ActionPack 的工厂对象
+   */
+  action(xySpeedKeeps, xyAccKeeps) {
+    this._ActionPackBuilder.updateCommonInfo(xySpeedKeeps, xyAccKeeps);
+    return this._ActionPackBuilder;
+  }
+
+  /**
+   * State
+   * 获取创建 StatePack 的工厂对象
+   * 可用方法见 ./SetState.js
+   */
+  state() {
+    return this._StatePackBuilder;
+  }
+
+  _OnEchoEvent(retJsonObject) {
+    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 Forge.FreeMoveAnimation(this._OnEchoEvent.bind(this));
+      this._BindView.StartAnimation(this._BindAnim);
+    }
+  }
+}
+
+export default ActorControl;

package/utils/JsViewVueWidget/JsvFreeMoveActor/CallbackManager.js

@@ -0,0 +1,68 @@
+/*
+ * @Author: donglin.lu@qcast.cn
+ * @Date: 2023-07-18 11:14:00
+ * @LastEditors: donglin.lu@qcast.cn
+ * @Description: file content
+ */
+
+import { StateCmdBuilder } from "./CommonTools.js"
+
+class CallbackManager {
+  constructor() {
+    this._CallbackMap = new Map();
+    this._IdGen = 1;
+  }
+
+  addCallback(func, callMulti) {
+    let id = "" + this._IdGen++;
+    this._CallbackMap.set(id, {
+      f: func,  // 回调函数
+      times: 0,  // 回调的次数
+      once: !callMulti, // 是否单次回调就销毁
+    })
+    return id;
+  }
+
+  clearCallback() {
+    this._CallbackMap = new Map();
+  }
+
+  expiredIds(ids) {
+    // 删除已经无效的ids
+    if (ids) {
+      for (let key of this._CallbackMap.keys()) {
+        for (let id of ids) {
+          if (id === key) {
+            this._CallbackMap.delete(id);
+          }
+        }
+      }
+    }
+  }
+
+  invokeCallback(id, actorState) {
+    if (this._CallbackMap.has(id)) {
+      let callbackObj = this._CallbackMap.get(id);
+      if (callbackObj.once) {
+        this._CallbackMap.delete(id);
+      } else {
+        callbackObj.times++;
+      }
+      try {
+        callbackObj.f?.(actorState);
+      } catch (e) {
+        // 规避 callback 执行出错导致流程执行不下去
+        console.error("Error: callback error", e);
+      }
+    }
+  }
+
+  buildCallbackCmd(func) {
+    let funcIdStr = this.addCallback(func, true);
+    return StateCmdBuilder.FireEcho(funcIdStr); // 以funcIdStr 作为echoToken
+  }
+
+
+}
+
+export default CallbackManager;

package/utils/JsViewVueWidget/JsvFreeMoveActor/CommonTools.js

@@ -0,0 +1,18 @@
+/*
+ * @Author: donglin.lu@qcast.cn
+ * @Date: 2023-07-18 11:14:00
+ * @LastEditors: donglin.lu@qcast.cn
+ * @Description: file content
+ */
+
+const ConditionSetBuilder = Forge.FreeMoveConditionSet;
+const StateCmdBuilder = Forge.FreeMoveStateBuilder;
+const ActionCmdBuilder = Forge.FreeMoveActionBuilder;
+const CmdPackBuilder = Forge.FreeMoveCmdPackBuilder;
+
+export {
+    ConditionSetBuilder,
+    ActionCmdBuilder,
+    StateCmdBuilder,
+    CmdPackBuilder
+}

package/utils/JsViewVueWidget/JsvFreeMoveActor/FreeMoveActor.vue

@@ -0,0 +1,46 @@
+<!--
+ * @Author: donglin.lu@qcast.cn
+ * @Date: 2023-07-05 17:21:21
+ * @LastEditors: donglin.lu@qcast.cn
+ * @Description: file content
+-->
+
+<!--
+ * 【模块 export 内容】
+ * JsvFreeMoveActor：单轴(X 或 Y)运动控制控件，可控制完成单方向的匀速运动和变速运动（抛物运动），
+ *               若想进行X和Y轴同时的运动，可以通过运动分解后的两个JsvActorMove进行组合来实现
+ *      props说明:
+ *
+-->
+<script setup>
+import ActControl from "./ActorControl.js";
+import { shallowRef, onMounted } from "vue";
+
+const props = defineProps({
+  width: {
+    default: 0,
+    type: Number,
+  },
+  height: {
+    default: 0,
+    type: Number,
+  },
+});
+
+let mainDivRef = shallowRef(null);
+let controller = new ActControl();
+
+onMounted(() => {
+  controller.bindForgeView(mainDivRef.value.jsvGetProxyView());
+});
+
+defineExpose({
+  control: controller,
+});
+</script>
+
+<template>
+  <div ref="mainDivRef" :style="{ width: props.width, height: props.height }">
+    <slot></slot>
+  </div>
+</template>

package/utils/JsViewVueWidget/JsvFreeMoveActor/SetAction.js

@@ -0,0 +1,216 @@
+/*
+ * @Author: donglin.lu@qcast.cn
+ * @Date: 2023-07-18 11:14:00
+ * @LastEditors: donglin.lu@qcast.cn
+ * @Description: file content
+ */
+
+import { ConditionSetBuilder, StateCmdBuilder, CmdPackBuilder, ActionCmdBuilder } from "./CommonTools.js"
+import { GroupType_FromAction } from "./TypeDefine.js"
+
+const ConditionCmdCreator = (builderThis, setCondFunc, acts, isFinal, callback) => {
+  let commonInfo = ConditionSetBuilder.InitCommonInfo();
+  ConditionSetBuilder.UpdateCommonInfo(commonInfo, GroupType_FromAction);
+
+  // 创建位置条件
+  let conditionSet = setCondFunc(commonInfo);;
+
+  let conditionSubCmds = acts;
+
+  // 设置达到条件后的callback
+  if (callback) {
+    // callback接受参数为({xPos, yPos, xSpd, ySpd, xAcc, yAcc})
+    conditionSubCmds.push(builderThis._CallbackManager.buildCallbackCmd(callback));
+  }
+
+  if (isFinal) {
+    // 结束时清理临时condition
+    conditionSubCmds.push(StateCmdBuilder.DelFromActionCondition());
+  }
+
+  // 挂载设置好的Sub command list
+  ConditionSetBuilder.SetCmdList(conditionSet, conditionSubCmds);
+
+  return StateCmdBuilder.NewCondition(conditionSet);
+}
+
+const ActOnReachPosition = (builderThis, xPos, yPos, acts, isFinal, callback) => {
+  return ConditionCmdCreator(builderThis, (commonInfo) => {
+    return ConditionSetBuilder.ReachPosition(xPos, yPos, commonInfo);
+  }, acts, isFinal, callback);
+}
+
+const ActOnGetToSpeed = (builderThis, xSpeed, ySpeed, acts, isFinal, callback) => {
+  return ConditionCmdCreator((commonInfo) => {
+    return ConditionSetBuilder.ReachSpeed(xSpeed, ySpeed, commonInfo);
+  }, acts, isFinal, callback);
+}
+
+class ActorPackBuilder {
+  constructor(callbackManager) {
+    this._CallbackManager = callbackManager;
+
+    // 下一个Act指令时所保留的状态
+    this._SpeedKeeps = 0;
+    this._AccKeeps = 0;
+    this._CommonInfoValid = false;
+  }
+
+  updateCommonInfo(xySpdEnables, xyAccEnables) {
+    this._SpeedKeeps = xySpdEnables;
+    this._AccKeeps = xyAccEnables;
+    this._CommonInfoValid = true;
+  }
+
+  _CheckCommonInfo() {
+    if (!this._CommonInfoValid) {
+      console.error("Error: must call from new action()");
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * moveTo 以给定速度移动到目标位置
+   * 
+   * @param {int} targetX 带符号整数，标识运动的目标位置，相对于Actor当前位置, 如果设置为undefined, 则表示该轴不设目标
+   * @param {int} targetY 带符号整数，标识运动的目标位置，相对于Actor当前位置, 如果设置为undefined, 则表示该轴不设目标
+   * @param {double} xSpeed 带符号整数，符号表示方向，标识运动的运行速度，单位(pixel/帧), 可设undefined代表不改变该轴速度
+   * @param {double} ySpeed 带符号整数，符号表示方向，标识运动的运行速度，单位(pixel/帧), 可设undefined代表不改变该轴速度
+   * @param {function} endCallback 参数(x, y) 运动到目标位置后的回调函数, x或者y达到后即回调，以先到为准，回报当前Actor的相对于原始位置的x,y
+   * @return CommandPack(放入run或者then的CmdPackList队列)
+   */
+  moveTo(targetX, targetY, xSpeed, ySpeed, endCallback) {
+    if (!this._BasicPreProcess("moveTo")) {
+      return;
+    }
+
+    // x, y 都没有速度, 无内容
+    if (!xSpeed && !ySpeed) {
+      return null;
+    }
+
+    // 处理步骤备忘:
+    // 1. 构造 command list (cmdList), 加入通过 ActionCmdBuilder 构建的各种改变速度的行为
+    // 2. 构筑结束的条件处理(包含回调和 delFromActionCondtion 动作), 通过 StateCmdBuilder.NewCondtion 创建并加入 cmdList
+    // 3. 通过 CmdPackBuilder.InitActCmdPack，送入 cmdList 和预设好的keep, 完成commandPack构建
+
+    let cmdList = [];
+
+    // 设置运动速度
+    cmdList.push(ActionCmdBuilder.SetArrowSpeed(targetX, targetY, xSpeed, ySpeed));
+
+    // 设置达到目标位置的condition
+    cmdList.push(
+      ActOnReachPosition(
+        this,
+        targetX, targetY,
+        [ActionCmdBuilder.StopMoving()],
+        true,
+        (actorState) => {
+          endCallback(actorState.xPos, actorState.yPos);
+        }
+      )
+    );
+
+    //return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, cmdList);
+
+    let c = CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, cmdList);
+    return c;
+  }
+
+  /*
+   * altSpeed 调整速度，costTime不为0时为平滑过渡
+   * 参数说明:
+   *      xSpeed      (double) 带符号整数，符号表示方向，标识运动的运行速度，单位(pixel/帧), 可设undefined代表不改变该轴速度
+   *      ySpeed      (double) 带符号整数，符号表示方向，标识运动的运行速度，单位(pixel/帧), 可设undefined代表不改变该轴速度
+   *      spreadFrame    (int) 选填，正整数, 变速需要经历帧数, 若为立即变速，则设置为0，或者不再设置(undefined)
+   *      finishCallback (Function(xSpeed, ySpeed)) 选填，达到目标速度后的回调，当costTime不为0时有效
+   */
+  altSpeed(xSpeed, ySpeed, spreadFrame, finishCallback) {
+    if (!this._BasicPreProcess("altSpeed")) {
+      return;
+    }
+
+    // 处理步骤备忘:
+    // 1. 构造 command list (cmdList), 加入通过 ActionCmdBuilder 构建的各种改变速度的行为
+    // 2. 构筑结束的条件处理(包含回调和 delFromActionCondtion 动作), 通过 StateCmdBuilder.NewCondtion 创建并加入 cmdList
+    // 3. 通过 CmdPackBuilder.InitActCmdPack，送入 cmdList 和预设好的keep, 完成commandPack构建
+
+    let cmdList = [];
+
+    if (isNaN(spreadFrame) || spreadFrame == 0) {
+      // 经历的帧数为0, 即为立即变速
+      cmdList.push(ActionCmdBuilder.SetSpeed(xSpeed, ySpeed));
+      return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, cmdList);
+    } else {
+      // 均匀变速逻辑
+      cmdList.push(ActionCmdBuilder.AltSpeed(xSpeed, ySpeed, spreadFrame));
+
+      // 创建结束ConditionSet
+      cmdList.push(
+        ActOnGetToSpeed(
+          this,
+          xSpeed, ySpeed,
+          [ActionCmdBuilder.ResetAcc(0, 0)],
+          true, // isFinal
+          (actorState) => {
+            finishCallback(actorState.xSpd, actorState.ySpd);
+          }
+        )
+      )
+
+      return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, cmdList);
+    }
+  }
+
+  /*
+   * breakToPosition 以当前速度开始，减速并停止到目标位置
+   * 参数说明:
+   *      targetX      (int) 带符号整数，目标运动终点位置，如果设置为undefined，标识不以此轴为终点
+   *      targetY      (int) 带符号整数，目标运动终点位置，如果设置为undefined，标识不以此轴为终点
+   *      finishCallback  (Function(x,y)) 运动到目标位置后的回调函数, x或者y达到后即回调，以先到为准，回报当前Actor的相对于原始位置的x,y
+   */
+  breakToPosition(targetX, targetY, finishCallback) {
+    if (!this._BasicPreProcess("breakToPosition")) {
+      return;
+    }
+
+    // 处理步骤备忘:
+    // 1. 构造 command list (cmdList), 加入通过 ActionCmdBuilder 构建的各种改变速度的行为
+    // 2. 构筑结束的条件处理(包含回调和 delFromActionCondtion 动作), 通过 StateCmdBuilder.NewCondtion 创建并加入 cmdList
+    // 3. 通过 CmdPackBuilder.InitActCmdPack，送入 cmdList 和预设好的keep, 完成commandPack构建
+
+    let cmdList = [];
+
+    // 通过targetX和targetY以及内部当前的 xSpeed 和 ySpeed 状态，计算 xAcc 和 yAcc, 使运动接近目标位置时停止
+    cmdList.push(ActionCmdBuilder.BreakToPos(targetX, targetY));
+
+    // 创建结束ConditionSet
+    cmdList.push(
+      ActOnReachPosition(
+        this,
+        targetX, targetY,
+        [ActionCmdBuilder.StopMoving()],
+        true,
+        (actorState) => {
+          finishCallback(actorState.xPos, actorState.yPos);
+        }
+      )
+    );
+
+    return CmdPackBuilder.InitActCmdPack(this._SpeedKeeps, this._AccKeeps, cmdList);
+  }
+
+  _BasicPreProcess(procName) {
+    // CommonInfo 只能使用一次，规避多次使用问题
+    if (!this._CheckCommonInfo()) {
+      return false;
+    }
+    this._CommonInfoValid = false;
+
+    return true;
+  }
+}
+
+export default ActorPackBuilder;

package/utils/JsViewVueWidget/JsvFreeMoveActor/SetCondition.js

@@ -0,0 +1,66 @@
+/*
+ * @Author: donglin.lu@qcast.cn
+ * @Date: 2023-07-18 11:14:00
+ * @LastEditors: donglin.lu@qcast.cn
+ * @Description: file content
+ */
+
+import { ConditionSetBuilder, StateCmdBuilder, CmdPackBuilder } from "./CommonTools.js"
+
+const setChildCommnadPackList = (conditionSet, callbackManager, cmdPackList) => {
+  for (let i = 0; i < cmdPackList.length; i++) {
+    if (typeof cmdPackList[i] == "function") {
+      // 将回调函数更换为对应CommandPack, 内容为 FireEcho 的 stateCommand
+      cmdPackList[i] = CmdPackBuilder.InitStateCmdPack(callbackManager.buildCallbackCmd(cmdPackList[i]));
+    }
+  }
+
+  // 将此cmdPackList设置给ConditionSet
+  ConditionSetBuilder.SetCmdPackList(conditionSet, cmdPackList);
+}
+
+class ConditionPackBuilder {
+  constructor(callbackManager) {
+    this._Callbacks = callbackManager;
+    this._CommonInfo = ConditionSetBuilder.InitCommonInfo();
+    this._CommonInfoValid = false;
+  }
+
+  updateCommandInfo(group, multiTimes, specName) {
+    ConditionSetBuilder.UpdateCommonInfo(this._CommonInfo, group, multiTimes, specName);
+    this._CommonInfoValid = true;
+  }
+
+  reachPosition(xPosition, yPosition) {
+    // CommonInfo 只能使用一次，规避多次使用问题
+    if (!this._CheckCommonInfo()) {
+      return;
+    }
+    this._CommonInfoValid = false;
+
+    return this._BuildPack(ConditionSetBuilder.ReachPosition(xPosition, yPosition, this._CommonInfo));
+  }
+
+  _CheckCommonInfo() {
+    if (!this._CommonInfoValid) {
+      console.error("Error: must call from new conditoin()");
+      return false;
+    }
+    return true;
+  }
+
+  _BuildPack(conditionSet) {
+    let cmdPack = CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.NewCondition(conditionSet));
+
+    // 追加then处理
+    let callbackManager = this._Callbacks;
+    cmdPack["then"] = (childCmdPackList) => {
+      setChildCommnadPackList(conditionSet, callbackManager, childCmdPackList);
+      return cmdPack;
+    };
+
+    return cmdPack;
+  }
+}
+
+export default ConditionPackBuilder;

package/utils/JsViewVueWidget/JsvFreeMoveActor/SetState.js

@@ -0,0 +1,38 @@
+
+import { ConditionSetBuilder, StateCmdBuilder, CmdPackBuilder, ActionCmdBuilder } from "./CommonTools.js"
+
+class StatePackBuilder {
+  constructor() {
+
+  }
+
+  /*
+   * clearConditions
+   * 清理所有预制的condition
+   */
+  clearAllConditions() {
+    return CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.RemoveAllCondtions());
+  }
+
+  /*
+   * jumpToPosition 立刻将actor移动到目标位置
+   * 参数说明:
+   *      targetX      (int) 带符号整数，目标位置，如果设置为undefined，标识不以此轴为终点
+   *      targetY      (int) 带符号整数，目标位置，如果设置为undefined，标识不以此轴为终点
+   */
+  jumpToPos(targetX, targetY) {
+    return CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.SetPos(targetX, targetY));
+  }
+
+  /*
+   * jumpOffsetPos 立刻将actor移动以当前位置相对位移的位置
+   * 参数说明:
+   *      targetX      (int) 带符号整数，目标位置，如果设置为undefined，标识不以此轴为终点
+   *      targetY      (int) 带符号整数，目标位置，如果设置为undefined，标识不以此轴为终点
+   */
+  jumpOffsetPos(offsetX, offsetY) {
+    return CmdPackBuilder.InitStateCmdPack(StateCmdBuilder.SetOffsetPos(offsetX, offsetY));
+  }
+}
+
+export default StatePackBuilder;

package/utils/JsViewVueWidget/JsvFreeMoveActor/TypeDefine.js

@@ -0,0 +1,12 @@
+/*
+ * @Author: donglin.lu@qcast.cn
+ * @Date: 2023-07-18 11:14:00
+ * @LastEditors: donglin.lu@qcast.cn
+ * @Description: file content
+ */
+
+const GroupType_FromAction = Forge.FreeMoveExternType?.GroupType_FromAction;
+
+export {
+    GroupType_FromAction
+}

package/utils/JsViewVueWidget/JsvFreeMoveActor/index.js

@@ -0,0 +1,3 @@
+import JsvFreeMoveActor from "./FreeMoveActor.vue";
+
+export default JsvFreeMoveActor;

package/utils/JsViewVueWidget/JsvPosterImage.vue

@@ -4,37 +4,43 @@
  *  props说明:
  *      colorSpace          {String}   颜色空间，默认RGBA_8888
  *      style    {Object}   包含left/top/width/height/border-radius的style设置
+ *      imageCompress {boolean} 是否压缩图片, 默认打开
 -->
 
 <script setup>
-
-import { reactive, watchEffect } from "vue";
+import { reactive, watchEffect, computed } from "vue";
 
 const props = defineProps({
   colorSpace: {
     type: String,
     default: "RGBA_8888",
+    imageCompress: {
+      type: Boolean,
+      default: true,
+    },
   },
-
   style: Object,
 });
 
+const scaleddown = computed(() => {
+  return props.imageCompress ? "true" : "false";
+});
+
 let common_style = reactive({});
 let image_style = reactive({});
 
-watchEffect(()=>{
+watchEffect(() => {
   if (props.style) {
-    let {left, top, width, height, ...others} = props.style;
+    let { left, top, width, height, ...others } = props.style;
 
     common_style.left = left;
     common_style.top = top;
 
     image_style.width = width;
     image_style.height = height;
-    Object.assign(image_style, others)
+    Object.assign(image_style, others);
   }
-})
-
+});
 </script>
 
 <template>
@@ -43,10 +49,10 @@ watchEffect(()=>{
     <img
       data-jsv-vw-enable-fade="true"
       data-jsv-vw-mask-poster-on-top="true"
-      data-jsv-img-scaledown-tex="true"
+      :data-jsv-img-scaledown-tex="scaleddown"
       :data-jsv-img-color-space="colorSpace"
       :style="image_style"
       v-bind="$attrs"
     />
   </div>
-</template>
+</template>

package/utils/JsViewVueWidget/JsvRipple/Constant.js

@@ -0,0 +1,4 @@
+export const JsvRippleShape = {
+  CIRCLE: Forge.FilterView.WAVE.CIRCLE_WAVE,
+  RECTANGLE: Forge.FilterView.WAVE.RECTANGLE_WAVE,
+}