Merge pull request #26 from galacean/feat/1.1

Merge origin/feat/1.1 into origin/feat/main
galacean · Apr 16, 2024 · 2c958b7 · 2c958b7
2 parents 8c99195 + 2f999f3
commit 2c958b7
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/fallback/index.ts b/fallback/index.ts
@@ -9,7 +9,6 @@ import type {
   RenderLevel,
   SpriteItem,
   TemplateImage,
-  VideoImage,
   FilterItem,
 } from '../src';
 import { CAMERA_CLIP_MODE_NORMAL, ItemEndBehavior, ItemType } from '../src';
@@ -93,7 +92,7 @@ function getStandardJSONFromV0 (json: any): JSONScene {
   return ret;
 }
 
-export function getStandardImage (image: any, index: number, imageTags: RenderLevel[]): TemplateImage | Image | CompressedImage | VideoImage {
+export function getStandardImage (image: any, index: number, imageTags: RenderLevel[]): TemplateImage | Image | CompressedImage {
   const renderLevel = imageTags[index];
 
   const oriY = image.oriY;
@@ -126,11 +125,9 @@ export function getStandardImage (image: any, index: number, imageTags: RenderLe
   } else if (image.url) {
     return {
       url: image.url,
-      type: image.type,
       webp: image.webp,
       renderLevel,
       oriY,
-      loop: image.loop,
     };
   } else if (image && image.sourceType) {
     return image;

diff --git a/src/image.ts b/src/image.ts
@@ -74,11 +74,20 @@ export interface TemplateContentV1 extends TemplateContentBase {
   backgroundHeight: number,
 }
 
+/**
+ * 动态换图类型
+ * @since 1.3.0
+ */
+export enum BackgroundType {
+  video = 'video',
+  image = 'image',
+}
+
 export interface TemplateContentV2 extends TemplateContentBase {
   v: 2,
   content?: StringTemplate,
-  // 绘制 canvas 的背景图片，替换掉原来的那张图片，如果没有就不替换
   background?: {
+    type: BackgroundType,
     name: string,
     url: string,
   },
@@ -135,8 +144,3 @@ export interface CompressedImage extends Image {
     pvrtc?: string,
   },
 }
-
-export interface VideoImage extends Image {
-  type: 'video',
-  loop?: boolean,
-}
diff --git a/src/type.ts b/src/type.ts
@@ -642,21 +642,37 @@ export interface PluginGyroscopeTarget {
    */
   name: string,
   /**
-   * x轴最小值
+   * x 轴位移最小值
    */
   xMin: number,
   /**
-   * x轴最大值
+   * x 轴位移最大值
    */
   xMax: number,
   /**
-   * y轴最小值
+   * y 轴位移最小值
    */
   yMin: number,
   /**
-   * y轴最大值
+   * y 轴位移最大值
    */
   yMax: number,
+  /**
+   * 绕 x 轴（水平）旋转角度最小值
+   */
+  hMin: number,
+  /**
+   * 绕 x 轴（水平）旋转角度最大值
+   */
+  hMax: number,
+  /**
+   * 绕 y 轴（垂直）旋转角度最小值
+   */
+  vMin: number,
+  /**
+   * 绕 y 轴（垂直）旋转角度最大值
+   */
+  vMax: number,
 }
 
 /**