@predy-js/render-interface 0.1.73-beta.2 → 0.1.74

package/dist/src/render/MarsTextureFactory.d.ts

@@ -5,7 +5,7 @@ export declare class MarsTextureFactory implements TextureFactory {
         [key: string]: Promise<Texture>;
     };
     constructor();
-    loadMipmapImagesAsync(pointers: vec2[], bin: ArrayBuffer): Promise<(HTMLImageElement | ImageBitmap)[]>;
+    loadMipmapImagesAsync(pointers: vec2[], bin: ArrayBuffer): Promise<(ImageBitmap | HTMLImageElement)[]>;
     loadImageAsync(url: string | HTMLImageElement | Blob): Promise<HTMLImageElement | ImageBitmap>;
     requestBinaryAsync(url: string): Promise<ArrayBuffer>;
     loadImageBinaryAsync(binary: ArrayBuffer | TypedArray | Blob, mime?: string): Promise<HTMLImageElement | ImageBitmap>;

package/dist/src/webgl/GLProgram.d.ts

@@ -36,7 +36,7 @@ export declare class GLProgram {
     constructor(renderer: GLGPURenderer, program: WebGLProgram, shared: boolean, id: string);
     init(renderer: GLGPURenderer, program: WebGLProgram): void;
     bind(): void;
-    getSemanticValue(state: RenderState, semanticName: string): import("../../types").GPUBuffer | UniformValue | null | undefined;
+    getSemanticValue(state: RenderState, semanticName: string): UniformValue | import("../../types").GPUBuffer | null | undefined;
     setupUniforms(state: RenderState): void;
     setGLUniformValue(name: string, value: any, info: ProgramUniformInfo, gl: WebGL2RenderingContext | WebGLRenderingContext): void;
     setupAttributes(geometry: GLGeometry): GLVertexArrayObject;

package/dist/statistic.js

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

package/dist/types/RenderPass.d.ts

@@ -18,6 +18,7 @@ export declare const RenderPassPriorityNormal = 1000;
 export declare const RenderPassPriorityPostprocess = 3000;
 export declare enum TextureLoadAction {
     whatever = 0,
+    load = 1,
     clear = 2
 }
 export declare enum TextureStoreAction {

package/dist/types/ShaderLibrary.d.ts

@@ -1,27 +1,10 @@
-import type { AttributeBase, GeometryBufferLayout } from './Geometry';
 export type Shader = ShaderWithSource | ShaderUseCacheId;
 export type ShaderWithSource = InstancedShaderWithSource | SharedShaderWithSource;
-interface MetalVertexAttribute extends Omit<AttributeBase, 'instanceDivisor'> {
-    location: number;
-    stride: number;
-    offset: number;
-    dataSource: string;
-}
 export interface MetalShaderSpec {
     mtlBinary?: ArrayBuffer | string;
     mtlSource?: string;
     mtlVertex?: string;
     mtlFragment?: string;
-    /**
-     * 用于提前计算pipeline，如果没有传递，则需要在mesh被assignRenderer的时候才会计算pipeline
-     * 当mesh被添加到renderPass的时候，会根据renderPass和mesh的vertexLayout寻找对应的pipeline
-     * 如果没有找到，则需要创建，创建后会被缓存
-     * 为了避免渲染卡顿，最好在编译shader的时候就进行pipeline缓存
-     */
-    mtlVertexLayout?: {
-        bufferLayouts: GeometryBufferLayout[];
-        attributes: MetalVertexAttribute[];
-    };
 }
 export interface ShaderSourceBase extends MetalShaderSpec {
     fragment: string;
@@ -98,4 +81,3 @@ export declare class ShaderLibraryEmpty implements ShaderLibrary {
     compileShader(shaderCacheId: string): ShaderCompileResult;
     destroy(): void;
 }
-export {};

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

@@ -1,6 +1,7 @@
 import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapInternal';
-import type { TypedArray } from '../type';
+import type { TypedArray, vec2 } from '../type';
 import type { GPUCapability } from '../GPUCapability';
+import type { StringTemplate } from '@predy-js/specification';
 export interface PredyRequestOptions {
     url: string;
     disableCache?: boolean;
@@ -23,4 +24,32 @@ export declare abstract class PredyNativeInternal {
     options: ImageBitmapConstructor, callback: ImageBitmapCallback): void;
     abstract getDefaultGPUCapability(): GPUCapability;
     abstract requestWithCache(options: PredyRequestOptions, callback: PredyRequestCallback): void;
+    /**
+     * 将图片绘制到画布上，同时替换文案，绘制的顺序如下
+     * 创建 template.size尺寸的画布, 接下来的绘制均应用 template.offset
+     * 将source绘制到画布上，绘制的尺寸为template.sourceSize
+     * 将content绘制到画布上,使用variables替换文案
+     * @param source
+     * @param template
+     * @param variables
+     */
+    abstract renderImageTemplate(source: ImageBitmap, template: PredyResizeTemplate, variables: Record<string, string | number>): ImageBitmap;
+}
+export interface PredyResizeTemplate {
+    /**
+     * 要替换的文案
+     */
+    content: StringTemplate;
+    /**
+     * 画布尺寸
+     */
+    size: vec2;
+    /**
+     * 画布绘制的offset 默认[0,0]
+     */
+    offset: vec2;
+    /**
+     * source image绘制到画布的尺寸
+     */
+    sourceSize: vec2;
 }

package/package.json

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

package/types/RenderPass.ts

@@ -24,7 +24,7 @@ export const RenderPassPriorityPostprocess = 3000;
 export enum TextureLoadAction {
   whatever = 0,
   //preserve previous attachment
-  //load = 1,
+  load = 1,
   //clear attachment
   clear = 2,
 }

package/types/ShaderLibrary.ts

@@ -1,30 +1,10 @@
-import type { AttributeBase, GeometryBufferLayout } from './Geometry';
-
 export type Shader = ShaderWithSource | ShaderUseCacheId;
 export type ShaderWithSource = InstancedShaderWithSource | SharedShaderWithSource;
-
-interface MetalVertexAttribute extends Omit<AttributeBase, 'instanceDivisor'> {
-  location: number,
-  stride: number,
-  offset: number,
-  dataSource: string,
-}
 export interface MetalShaderSpec {
   mtlBinary?: ArrayBuffer | string,
   mtlSource?: string,
   mtlVertex?: string,
   mtlFragment?: string,
-  //todo lilong
-  /**
-   * 用于提前计算pipeline，如果没有传递，则需要在mesh被assignRenderer的时候才会计算pipeline
-   * 当mesh被添加到renderPass的时候，会根据renderPass和mesh的vertexLayout寻找对应的pipeline
-   * 如果没有找到，则需要创建，创建后会被缓存
-   * 为了避免渲染卡顿，最好在编译shader的时候就进行pipeline缓存
-   */
-  mtlVertexLayout?: {
-    bufferLayouts: GeometryBufferLayout[],
-    attributes: MetalVertexAttribute[],
-  },
 }
 
 export interface ShaderSourceBase extends MetalShaderSpec {

package/types/native/PredyNativeInternal.ts

@@ -1,7 +1,7 @@
 import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapInternal';
-import type { TypedArray } from '../type';
+import type { TypedArray, vec2 } from '../type';
 import type { GPUCapability } from '../GPUCapability';
-
+import type { StringTemplate } from '@predy-js/specification';
 export interface PredyRequestOptions {
   url: string,
   //用于测试缓存，生产中不要使用
@@ -32,4 +32,33 @@ export declare abstract class PredyNativeInternal {
   abstract getDefaultGPUCapability (): GPUCapability;
 
   abstract requestWithCache (options: PredyRequestOptions, callback: PredyRequestCallback): void;
+
+  /**
+   * 将图片绘制到画布上，同时替换文案，绘制的顺序如下
+   * 创建 template.size尺寸的画布, 接下来的绘制均应用 template.offset
+   * 将source绘制到画布上，绘制的尺寸为template.sourceSize
+   * 将content绘制到画布上,使用variables替换文案
+   * @param source
+   * @param template
+   * @param variables
+   */
+  abstract renderImageTemplate (source: ImageBitmap, template: PredyResizeTemplate, variables: Record<string, string | number>): ImageBitmap;
+}
+export interface PredyResizeTemplate {
+  /**
+   * 要替换的文案
+   */
+  content: StringTemplate,
+  /**
+   * 画布尺寸
+   */
+  size: vec2,
+  /**
+   * 画布绘制的offset 默认[0,0]
+   */
+  offset: vec2,
+  /**
+   * source image绘制到画布的尺寸
+   */
+  sourceSize: vec2,
 }