@predy-js/render-interface 0.1.75 → 0.1.76-beta.2

package/dist/statistic.js

@@ -2,7 +2,7 @@
  * Name: @predy-js/render-interface
  * Description: undefined
  * Author: undefined
- * Version: v0.1.75
+ * Version: v0.1.76-beta.2
  */
 
 // https://github.com/greggman/webgl-memory/blob/main/src/texture-utils.js

package/dist/types/native/PredyNativeInternal.d.ts

@@ -1,7 +1,8 @@
 import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapInternal';
-import type { TypedArray, vec2 } from '../type';
+import type { TypedArray, vec2, vec4 } from '../type';
 import type { GPUCapability } from '../GPUCapability';
 import type { StringTemplate } from '@predy-js/specification';
+import type { ImageBitmapInternal } from './ImageBitmapInternal';
 export interface PredyRequestOptions {
     url: string;
     disableCache?: boolean;
@@ -19,27 +20,33 @@ export interface PredyRequestResponse {
     time: number;
 }
 export type PredyRequestCallback = (err: string | undefined, res: PredyRequestResponse) => void;
-export declare abstract class PredyNativeInternal {
-    abstract createImageBitmap(data: TypedArray | string, //图片文件的数据
+export interface PredyNativeInternal {
+    webpDisabled?: boolean;
+    createImageBitmap(data: TypedArray | string, //图片文件的数据
     options: ImageBitmapConstructor, callback: ImageBitmapCallback): void;
-    abstract getDefaultGPUCapability(): GPUCapability;
-    abstract requestWithCache(options: PredyRequestOptions, callback: PredyRequestCallback): void;
+    getDefaultGPUCapability(): GPUCapability;
+    requestWithCache(options: PredyRequestOptions, callback: PredyRequestCallback): void;
     /**
      * 将图片绘制到画布上，同时替换文案，绘制的顺序如下
-     * 创建 template.size尺寸的画布, 接下来的绘制均应用 template.offset
-     * 将source绘制到画布上，绘制的尺寸为template.sourceSize
-     * 将content绘制到画布上,使用variables替换文案
-     * @param source
+     * 创建template.size尺寸的画布, 接下来的绘制均应用 template.offset
+     * 将images绘制到画布上，images的尺寸由image.frame决定
+     * 将数据模板content绘制到画布上,使用variables替换文案
      * @param template
-     * @param variables
      */
-    abstract renderImageTemplate(source: ImageBitmap, template: PredyResizeTemplate, variables: Record<string, string | number>): ImageBitmap;
+    renderImageTemplate(template: PredyResizeTemplate): ImageBitmapInternal;
 }
 export interface PredyResizeTemplate {
     /**
      * 要替换的文案
      */
     content: StringTemplate;
+    /**
+       * 要绘制的图片
+       */
+    images: Array<{
+        s: ImageBitmap;
+        frame: vec4;
+    }>;
     /**
      * 画布尺寸
      */
@@ -47,9 +54,5 @@ export interface PredyResizeTemplate {
     /**
      * 画布绘制的offset 默认[0,0]
      */
-    offset: vec2;
-    /**
-     * source image绘制到画布的尺寸
-     */
-    sourceSize: vec2;
+    offset?: vec2;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@predy-js/render-interface",
-  "version": "0.1.75",
+  "version": "0.1.76-beta.2",
   "license": "MIT",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",

package/types/native/PredyNativeInternal.ts

@@ -1,7 +1,8 @@
 import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapInternal';
-import type { TypedArray, vec2 } from '../type';
+import type { TypedArray, vec2, vec4 } from '../type';
 import type { GPUCapability } from '../GPUCapability';
 import type { StringTemplate } from '@predy-js/specification';
+import type { ImageBitmapInternal } from './ImageBitmapInternal';
 export interface PredyRequestOptions {
   url: string,
   //用于测试缓存，生产中不要使用
@@ -25,30 +26,38 @@ export interface PredyRequestResponse {
 
 export type PredyRequestCallback = (err: string | undefined, res: PredyRequestResponse) => void;
 
-export declare abstract class PredyNativeInternal {
-  abstract createImageBitmap (data: TypedArray | string, //图片文件的数据
-    options: ImageBitmapConstructor, callback: ImageBitmapCallback): void;
+export interface PredyNativeInternal {
+  webpDisabled?: boolean,
+  createImageBitmap (data: TypedArray | string, //图片文件的数据
+    options: ImageBitmapConstructor, callback: ImageBitmapCallback): void,
 
-  abstract getDefaultGPUCapability (): GPUCapability;
+  getDefaultGPUCapability (): GPUCapability,
 
-  abstract requestWithCache (options: PredyRequestOptions, callback: PredyRequestCallback): void;
+  requestWithCache (options: PredyRequestOptions, callback: PredyRequestCallback): void,
 
   /**
    * 将图片绘制到画布上，同时替换文案，绘制的顺序如下
-   * 创建 template.size尺寸的画布, 接下来的绘制均应用 template.offset
-   * 将source绘制到画布上，绘制的尺寸为template.sourceSize
-   * 将content绘制到画布上,使用variables替换文案
-   * @param source
+   * 创建template.size尺寸的画布, 接下来的绘制均应用 template.offset
+   * 将images绘制到画布上，images的尺寸由image.frame决定
+   * 将数据模板content绘制到画布上,使用variables替换文案
    * @param template
-   * @param variables
    */
-  abstract renderImageTemplate (source: ImageBitmap, template: PredyResizeTemplate, variables: Record<string, string | number>): ImageBitmap;
+  renderImageTemplate (template: PredyResizeTemplate): ImageBitmapInternal,
 }
 export interface PredyResizeTemplate {
   /**
    * 要替换的文案
    */
   content: StringTemplate,
+
+  /**
+     * 要绘制的图片
+     */
+  images: Array<{
+    s: ImageBitmap,
+    //图片绘制区域，尺寸可能和image不一样
+    frame: vec4,
+  }>,
   /**
    * 画布尺寸
    */
@@ -56,9 +65,5 @@ export interface PredyResizeTemplate {
   /**
    * 画布绘制的offset 默认[0,0]
    */
-  offset: vec2,
-  /**
-   * source image绘制到画布的尺寸
-   */
-  sourceSize: vec2,
+  offset?: vec2,
 }