From 0328ca23ba5051c2d0aa27008ca18cf8ada5e7bf Mon Sep 17 00:00:00 2001 From: SuRuiMeng <934274351@qq.com> Date: Tue, 26 Mar 2024 19:58:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=85=83=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/image.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/image.ts b/src/image.ts index b470739..d54d363 100644 --- a/src/image.ts +++ b/src/image.ts @@ -79,6 +79,11 @@ export interface TemplateContentV2 extends TemplateContentBase { content?: StringTemplate, // 绘制 canvas 的背景图片，替换掉原来的那张图片，如果没有就不替换 background?: { + /** + * 视频'video'/图片'image' + * @since 1.3 + */ + type: string, name: string, url: string, }, @@ -135,8 +140,3 @@ export interface CompressedImage extends Image { pvrtc?: string, }, } - -export interface VideoImage extends Image { - type: 'video', - loop?: boolean, -} From 971f0c8fdc4aade954ad0065155d7e9c73fe1ec7 Mon Sep 17 00:00:00 2001 From: SuRuiMeng <934274351@qq.com> Date: Wed, 27 Mar 2024 17:34:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/image.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/image.ts b/src/image.ts index d54d363..8c70dfa 100644 --- a/src/image.ts +++ b/src/image.ts @@ -74,16 +74,20 @@ export interface TemplateContentV1 extends TemplateContentBase { backgroundHeight: number, } +/** + * 动态换图类型 + * @since 1.3 + */ +export enum BackgroundType { + video = 'video', + image = 'image', +} + export interface TemplateContentV2 extends TemplateContentBase { v: 2, content?: StringTemplate, - // 绘制 canvas 的背景图片，替换掉原来的那张图片，如果没有就不替换 background?: { - /** - * 视频'video'/图片'image' - * @since 1.3 - */ - type: string, + type: BackgroundType, name: string, url: string, }, From 927ccb77e763df192690b019a700309090a96134 Mon Sep 17 00:00:00 2001 From: SuRuiMeng <934274351@qq.com> Date: Wed, 27 Mar 2024 17:34:35 +0800 Subject: [PATCH 3/5] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/image.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/image.ts b/src/image.ts index 8c70dfa..fae08b4 100644 --- a/src/image.ts +++ b/src/image.ts @@ -76,7 +76,7 @@ export interface TemplateContentV1 extends TemplateContentBase { /** * 动态换图类型 - * @since 1.3 + * @since 1.3.0 */ export enum BackgroundType { video = 'video', From 6944529c25992db1ab22e6f8a40f4b84c07b324c Mon Sep 17 00:00:00 2001 From: yiiqii Date: Wed, 27 Mar 2024 19:04:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=20fallback=20?= =?UTF-8?q?=E7=9A=84=20VideoImage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fallback/index.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fallback/index.ts b/fallback/index.ts index efb56ef..2e49a51 100644 --- 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; From 2f999f36d53b9d9d0b7d2e676387bf9f86364d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=A6=95?= <38219632+RGCHN@users.noreply.github.com> Date: Thu, 11 Apr 2024 17:51:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=99=80?= =?UTF-8?q?=E8=9E=BA=E4=BB=AA=E6=8F=92=E4=BB=B6=E6=97=8B=E8=BD=AC=E8=A7=92?= =?UTF-8?q?=E5=BA=A6=E5=8F=82=E6=95=B0=20(#20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 增加陀螺仪插件旋转角度参数 * chore: typo --------- Co-authored-by: yiiqii --- src/type.ts | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/type.ts b/src/type.ts index 07d82b4..c865d62 100644 --- 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, } /**