@predy-js/render-interface 0.1.61-beta.10 → 0.1.61-beta.11

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

@@ -1,5 +1,4 @@
 import type { Material, MaterialDestroyOptions, MaterialOptions, MaterialRenderStates } from '../../types';
-import type { UniformSemantic } from '../../types';
 import { MaterialRenderType } from '../../types/Material';
 import type { Immutable } from '../../types/type';
 import { GLMaterial } from '../webgl/GLMaterial';
@@ -14,16 +13,16 @@ export declare class MarsMaterial implements Material {
     readonly renderType: MaterialRenderType;
     readonly states: Immutable<MaterialRenderStates>;
     readonly renderer?: MarsRenderer;
+    private _dbMap;
     private _isDestroyed;
-    readonly uniformSemantics: Record<string, UniformSemantic>;
     get isDestroyed(): boolean;
     get dataBlocks(): MarsMaterialDataBlock[];
     get defaultDataBlock(): MarsMaterialDataBlock;
     constructor(options: MaterialOptions);
     createMaterialStates(states: MaterialRenderStates): Immutable<MaterialRenderStates>;
     addDataBlock(b: MarsMaterialDataBlock): void;
+    getDataBlockByName(name: string): MarsMaterialDataBlock;
     removeDataBlock(b: MarsMaterialDataBlock): void;
-    setUniformSemantic(uniformName: string, semantic: string | undefined): void;
     assignRenderer(renderer: MarsRenderer): MarsMaterial;
     destroy(options?: MaterialDestroyOptions): void;
 }

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

@@ -1,27 +1,32 @@
-import type { MaterialDataBlock, MaterialDataBlockDestroyOptions, MaterialDataBlockOptions, UniformSemantic, UniformValue, vec2 } from '../../types';
+import type { MaterialDataBlock, MaterialDataBlockDestroyOptions, MaterialDataBlockOptions, UniformSemantic, UniformValue, vec2, Texture } from '../../types';
 import type { MarsRenderer } from './MarsRenderer';
+import { MarsTexture } from './MarsTexture';
 import type { UniformBlockSpec } from '../webgl/GLUniformUtils';
 import { UniformBlockBuffer } from '../webgl/GLUniformUtils';
 export declare class MarsMaterialDataBlock implements MaterialDataBlock {
     readonly _uniformValues: Record<string, UniformValue>;
+    readonly _uniformTextures: Record<string, MarsTexture | MarsTexture[]>;
     readonly _uniformFlags: Record<string, boolean>;
     readonly _uniformValueRanges: Record<string, vec2>;
     readonly name: string;
-    readonly uniformSemantics?: {
+    readonly uniformSemantics: {
         [key: string]: UniformSemantic;
     };
     readonly renderer?: MarsRenderer;
     readonly uboBufferMap: Record<string, UniformBlockBuffer>;
     protected _isDestroyed: boolean;
+    private _uniformPrivate;
     private readonly _keepUboData;
     constructor(props: MaterialDataBlockOptions & {
         keepUboData?: boolean;
     }, renderer?: MarsRenderer);
-    _assignUniformValueRenderer(value: UniformValue, renderer?: MarsRenderer): void;
+    _assignUniformValueRenderer(value: MarsTexture | MarsTexture[], renderer?: MarsRenderer): void;
     invalidAllFlags(): void;
     clearFlags(): void;
     isDirty(shaderCacheId: string, name: string): boolean;
     get isDestroyed(): boolean;
+    setUniformTexture(uniformName: string, texture: MarsTexture | MarsTexture[] | undefined): void;
+    getUniformTexture<T extends (Texture | Texture[]) = MarsTexture>(uniformName: string): T | undefined;
     assignRenderer(renderer: MarsRenderer): MaterialDataBlock;
     createUboBuffer(spec: UniformBlockSpec): UniformBlockBuffer | undefined;
     setUboBuffer(uboBuffer: UniformBlockBuffer): void;
@@ -32,9 +37,10 @@ export declare class MarsMaterialDataBlock implements MaterialDataBlock {
     getUniformValues(): {
         [p: string]: UniformValue;
     };
-    setUniformValue(name: string, value: UniformValue | undefined): boolean;
+    setUniformValue(name: string, value: UniformValue | undefined, isSemantic?: boolean): boolean;
     setUniformValues(map: {
         [p: string]: UniformValue;
     }): void;
+    setUniformSemantic(name: string, semantic: string | undefined): void;
     clone(name: string): MarsMaterialDataBlock;
 }

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

@@ -17,4 +17,7 @@ export declare class MarsRenderer implements GPURenderer {
     createRenderFrame(options?: RenderFrameOptions): MarsRenderFrame;
     destroy(haltGL?: boolean): void;
     resize(width: number, height: number): void;
+    cancelAnimationFrame(id: number): void;
+    getErrors(): string[];
+    requestAnimationFrame(cb: FrameRequestCallback): number;
 }

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

@@ -3,6 +3,7 @@ import type { GLGeometry } from './GLGeometry';
 import type { RenderState } from '../../types/RenderFrame';
 import type { GLVertexArrayObject } from './GLVertexArrayObject';
 import type { UniformBlockSpec } from './GLUniformUtils';
+import type { UniformValue } from '../../types';
 export interface ProgramAttributeInfo {
     readonly name: string;
     readonly size: number;
@@ -35,6 +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): 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.61-beta.10
+ * Version: v0.1.61-beta.11
  */
 
 // https://github.com/greggman/webgl-memory/blob/main/src/texture-utils.js

package/dist/types/Material.d.ts

@@ -1,9 +1,9 @@
-import type { Texture } from './Texture';
 import type { ShaderUseCacheId, ShaderWithSource } from './ShaderLibrary';
 import type { IGPUResource, IGPURenderer } from './IGPURenderer';
 import type { Immutable, TypedArray } from './type';
 import type { GPURenderer } from './Renderer';
 import type { DestroyOptions } from './constants';
+import type { Texture } from './Texture';
 export type UniformSemantic = 'VIEW' | 'MODEL' | 'MODELVIEW' | 'PROJECTION' | 'VIEWPROJECTION' | 'MODELVIEWPROJECTION' | string;
 export interface MaterialRenderStates {
     sampleAlphaToCoverage?: boolean;
@@ -15,13 +15,13 @@ export interface MaterialRenderStates {
     blendSrc?: number;
     blendDst?: number;
     /**
-     * The blend color is a state value,
-     * like the blend equations and blend parameters. Therefore,
-     * it cannot change within a single draw call;
-     * fragment shaders cannot write to, modify,
-     * or even access the blend color.
-     * All buffers share the same blend color.
-     */
+       * The blend color is a state value,
+       * like the blend equations and blend parameters. Therefore,
+       * it cannot change within a single draw call;
+       * fragment shaders cannot write to, modify,
+       * or even access the blend color.
+       * All buffers share the same blend color.
+       */
     blendColor?: [r: number, g: number, b: number, a: number];
     colorMask?: [r: boolean, g: boolean, b: boolean, a: boolean];
     depthTest?: boolean;
@@ -52,12 +52,6 @@ export interface MaterialOptions {
     shader: ShaderWithSource | ShaderUseCacheId;
     name?: string;
     dataBlocks?: MaterialDataBlockOptions[];
-    uniformSemantics?: {
-        [key: string]: UniformSemantic;
-    };
-    uniformValues?: {
-        [key: string]: UniformValue;
-    };
 }
 /**
  * @example
@@ -85,7 +79,7 @@ export interface MaterialOptions {
  * });
  * mtl2 use the same program with mtl0
  */
-export type UniformValueDataType = TypedArray | number | number[] | Texture | Texture[] | number[][];
+export type UniformValueDataType = TypedArray | number | number[] | number[][];
 export type UniformValue = UniformValueDataType | UniformStruct | UniformStruct[];
 export type UniformStruct = {
     [key: string]: UniformValueDataType;
@@ -107,13 +101,13 @@ export declare class Material implements IGPUResource {
     addDataBlock(b: MaterialDataBlock): void;
     removeDataBlock(b: MaterialDataBlock): void;
     destroy(options?: MaterialDestroyOptions): void;
-    setUniformSemantic(uniformName: string, semantic: string | undefined): void;
     assignRenderer(renderer: GPURenderer): Material;
 }
 export interface MaterialDataBlockOptions {
     uniformValues?: {
         [key: string]: UniformValue;
     };
+    uniformTextures?: Record<string, Texture | Texture[]>;
     name?: string;
     uniformSemantics?: {
         [key: string]: UniformSemantic;
@@ -131,6 +125,7 @@ export declare class MaterialDataBlock implements IGPUResource {
     };
     constructor(options: MaterialDataBlockOptions);
     hasUniformValue(name: string): boolean;
+    setUniformSemantic(name: string, semantic: string | undefined): void;
     setUniformValue(name: string, value: UniformValue): boolean;
     getUniformValue(name: string): UniformValue;
     getUniformValues(): {
@@ -139,15 +134,17 @@ export declare class MaterialDataBlock implements IGPUResource {
     setUniformValues(map: {
         [key: string]: UniformValue;
     }): void;
+    setUniformTexture(uniformName: string, texture: Texture | Texture[] | undefined): void;
+    getUniformTexture<T extends Texture[] | Texture = Texture>(uniformName: string): T | undefined;
     /**
-     * indicate uniform data should be resent to GPU, but not the full range,
-     * only works for ubo,if not an ubo, this method has no side effect
-     * offset and count are counted by typed entry, not the number elements
-     * entry means matrix or vector in shader
-     * @param name uniform name
-     * @param offset entry offset,first entry to send to gpu, default 0
-     * @param count entry count,entry count to send to gpu,default to end
-     */
+       * indicate uniform data should be resent to GPU, but not the full range,
+       * only works for ubo,if not an ubo, this method has no side effect
+       * offset and count are counted by typed entry, not the number elements
+       * entry means matrix or vector in shader
+       * @param name uniform name
+       * @param offset entry offset,first entry to send to gpu, default 0
+       * @param count entry count,entry count to send to gpu,default to end
+       */
     updateUniformSubData(name: string, offset: number, count: number): void;
     destroy(options?: MaterialDataBlockDestroyOptions): void;
     assignRenderer(renderer: GPURenderer): MaterialDataBlock;

package/dist/types/RenderFrame.d.ts

@@ -1,7 +1,5 @@
-import type { UniformValue } from './Material';
-import type { RenderPass, RenderPassLoadAction, RenderPassDestroyOptions, SemanticMap } from './RenderPass';
+import type { RenderPass, RenderPassLoadAction, RenderPassDestroyOptions, SemanticMap, SemanticGetter } from './RenderPass';
 import type { Mesh } from './Mesh';
-import type { GPUBuffer } from './GPUBuffer';
 import type { vec4 } from './type';
 import type { GPURenderer } from './index';
 import type { IGPURenderer, IGPUResource } from './IGPURenderer';
@@ -16,12 +14,12 @@ export interface RenderFrameOptions {
     renderPasses?: RenderPass[];
     viewport?: vec4;
     semantics?: {
-        [key: string]: UniformValue | SemanticFunc | GPUBuffer;
+        [key: string]: SemanticGetter;
     };
     loadAction?: RenderPassLoadAction;
     name?: string;
 }
-export type SemanticFunc = (state: RenderState) => UniformValue | GPUBuffer | null | undefined;
+export type SemanticFunc = (state: RenderState) => SemanticGetter | null | undefined;
 export type RenderFrameDestroyOptions = {
     passes?: RenderPassDestroyOptions | DestroyOptions.keep;
     semantics?: DestroyOptions;

package/dist/types/RenderPass.d.ts

@@ -81,7 +81,7 @@ export interface RenderPassAttachmentOptions {
     viewportScale?: number;
     multiSample?: number;
 }
-export type SemanticGetter = UniformValue | SemanticFunc | GPUBuffer;
+export type SemanticGetter = UniformValue | SemanticFunc | GPUBuffer | Texture | Texture[];
 export interface RenderPassOptions extends RenderPassAttachmentOptions {
     name?: string;
     meshes?: Mesh[];
@@ -119,7 +119,7 @@ export interface RenderPassDelegate {
     willBeginRenderPass?: (renderPass: RenderPass, state: RenderState) => void;
     didEndRenderPass?: (renderPass: RenderPass, state: RenderState) => void;
     willRenderMesh?: (mesh: Mesh, state: RenderState) => void;
-    didiRenderMesh?: (mesh: Mesh, state: RenderState) => void;
+    didRenderMesh?: (mesh: Mesh, state: RenderState) => void;
 }
 export declare class RenderPass implements IGPUResource {
     readonly isDestroyed: boolean;

package/dist/types/Renderer.d.ts

@@ -24,8 +24,8 @@ export declare class GPURenderer implements IGPURenderer {
     readonly height: number;
     readonly width: number;
     /**
-     * if webgl not support, gpu.level will be 0
-     */
+       * if webgl not support, gpu.level will be 0
+       */
     readonly shaderLibrary: ShaderLibrary;
     readonly gpu: GPUCapability;
     readonly canvas: Canvas;
@@ -35,17 +35,26 @@ export declare class GPURenderer implements IGPURenderer {
     createRenderFrame(options?: RenderFrameOptions): RenderFrame;
     createBuffer(options: GPUBufferOptions): GPUBuffer;
     /**
-     * only resize when width or height is different from now,
-     * when resized,all full-screen renderPasses attached to this renderer should be resized as well
-     * 只有当宽高不同的时候，才实际进行函数
-     * 当重新调整宽高后，这个renderer创建的renderPasses，如果没有被指定 viewport（全屏），那么需要resize 所有的renderPass
-     * @param width
-     * @param height
-     */
+       * 根据不同平台封装实现 requestAnimationFrame，
+       * FrameRequestCallback函数回调中进行渲染数据更新，
+       * OpenGL/WebGL在绘制开始之前(传递此帧数据）
+       * Metal在commandBuffer提交后（传递下一帧数据）
+       * @param cb
+       */
+    requestAnimationFrame(cb: FrameRequestCallback): number;
+    cancelAnimationFrame(id: number): void;
+    /**
+       * only resize when width or height is different from now,
+       * when resized,all full-screen renderPasses attached to this renderer should be resized as well
+       * 只有当宽高不同的时候，才实际进行函数
+       * 当重新调整宽高后，这个renderer创建的renderPasses，如果没有被指定 viewport（全屏），那么需要resize 所有的renderPass
+       * @param width
+       * @param height
+       */
     resize(width: number, height: number): void;
     /**
-     * destroy all resources created by this renderer
-     * @param haltGL if true, this method will call webgl lose context extension which leads webgl absolutely halt
-     */
+       * destroy all resources created by this renderer
+       * @param haltGL if true, this method will call webgl lose context extension which leads webgl absolutely halt
+       */
     destroy(haltGL?: boolean): void;
 }

package/dist/types/ShaderLibrary.d.ts

@@ -1,7 +1,7 @@
 export type Shader = ShaderWithSource | ShaderUseCacheId;
 export type ShaderWithSource = InstancedShaderWithSource | SharedShaderWithSource;
 export interface MetaShaderSpec {
-    mtlBinary?: ArrayBuffer;
+    mtlBinary?: ArrayBuffer | string;
     mtlSource?: string;
     mtlVertex?: string;
     mtlFragment?: string;
@@ -51,9 +51,9 @@ export interface ShaderLibrary {
     readonly cacheIds: string[];
     getShaderResult(cacheId: string): ShaderCompileResult | undefined;
     /**
-     * 添加shader
-     * @param shader
-     */
+       * 添加shader
+       * @param shader
+       */
     addShader(shader: Shader): string;
     /**
        * @param cacheId

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

@@ -1,6 +1,4 @@
 export interface ImageBitmapConstructor {
-    flipY?: boolean;
-    premultiplyAlpha?: boolean;
     resizeWidth?: number;
     resizeHeight?: number;
 }

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

@@ -16,14 +16,6 @@ export declare abstract class RenderFrameInternal implements ResourceInternal {
     renderPasses: RenderPassInternal[];
     protected constructor(options: RenderFrameInternalOptions);
     abstract destroy(): void;
-    /**
-     * warp层完成所有数据传输后，通知客户端，可以进行实际渲染，
-     * 实际渲染根据客户端时机进行,在调用end()之前，客户端会根据实际刷新进行绘制
-     */
-    abstract begin(): void;
-    /**
-     * 将RenderFrame移除渲染队列
-     */
-    abstract end(): void;
+    abstract render(): void;
     abstract updateLoadAction(action: RenderPassLoadAction): void;
 }

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

@@ -31,6 +31,10 @@ export declare abstract class RendererInternal implements ResourceInternal {
     readonly width: number;
     readonly height: number;
     abstract destroy(): void;
+    /**
+       * 需要进行重新渲染
+       */
+    abstract invalid(): void;
     abstract createBuffer(options: GPUBufferInternalOptions): GPUBufferInternal;
     abstract createGeometry(options: GeometryInternalOptions): GeometryInternal;
     abstract createDataBlock(options: DataBlockInternalOptions): DataBlockInternal;
@@ -42,6 +46,12 @@ export declare abstract class RendererInternal implements ResourceInternal {
     abstract getResourceInfo(): InternalResInfo;
     abstract requestAnimationFrame(callback: (timestamp: number) => void): number;
     abstract cancelAnimationFrame(id: number): void;
+    /**
+       * 获取错误信息，目前支持最大获取5条，
+       * 每次调用此函数后，清空错误队列
+       */
+    abstract getErrors(): string[];
+    abstract resize(width: number, height: number): void;
     abstract createImageBitmap(data: ArrayBuffer | string, //图片文件的数据
     options: ImageBitmapConstructor, callback: ImageBitmapCallback): void;
 }

package/package.json

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

package/types/Material.ts

@@ -1,18 +1,18 @@
-import type { Texture } from './Texture';
 import type { ShaderUseCacheId, ShaderWithSource } from './ShaderLibrary';
 import type { IGPUResource, IGPURenderer } from './IGPURenderer';
 import type { Immutable, TypedArray } from './type';
 import type { GPURenderer } from './Renderer';
 import type { DestroyOptions } from './constants';
+import type { Texture } from './Texture';
 
 export type UniformSemantic =
-  | 'VIEW'
-  | 'MODEL'
-  | 'MODELVIEW'
-  | 'PROJECTION'
-  | 'VIEWPROJECTION'
-  | 'MODELVIEWPROJECTION'
-  | string;
+    | 'VIEW'
+    | 'MODEL'
+    | 'MODELVIEW'
+    | 'PROJECTION'
+    | 'VIEWPROJECTION'
+    | 'MODELVIEWPROJECTION'
+    | string;
 
 export interface MaterialRenderStates {
   sampleAlphaToCoverage?: boolean,
@@ -24,13 +24,13 @@ export interface MaterialRenderStates {
   blendSrc?: number,
   blendDst?: number,
   /**
-   * The blend color is a state value,
-   * like the blend equations and blend parameters. Therefore,
-   * it cannot change within a single draw call;
-   * fragment shaders cannot write to, modify,
-   * or even access the blend color.
-   * All buffers share the same blend color.
-   */
+     * The blend color is a state value,
+     * like the blend equations and blend parameters. Therefore,
+     * it cannot change within a single draw call;
+     * fragment shaders cannot write to, modify,
+     * or even access the blend color.
+     * All buffers share the same blend color.
+     */
   blendColor?: [r: number, g: number, b: number, a: number],
   colorMask?: [r: boolean, g: boolean, b: boolean, a: boolean],
   depthTest?: boolean,
@@ -63,8 +63,6 @@ export interface MaterialOptions {
   shader: ShaderWithSource | ShaderUseCacheId,
   name?: string,
   dataBlocks?: MaterialDataBlockOptions[],
-  uniformSemantics?: { [key: string]: UniformSemantic },
-  uniformValues?: { [key: string]: UniformValue },
 }
 
 //使用shader即时编译,此参数会调用 shaderLibrary.addShader() 为 Material提供shaderCacheId属性值，
@@ -97,12 +95,12 @@ export interface MaterialOptions {
  * });
  * mtl2 use the same program with mtl0
  */
-export type UniformValueDataType = TypedArray | number | number[] | Texture | Texture[] | number[][];
+export type UniformValueDataType = TypedArray | number | number[] | number[][];
 // 支持结构体Uniform数据
 export type UniformValue =
-  UniformValueDataType
-  | UniformStruct
-  | UniformStruct[];
+    UniformValueDataType
+    | UniformStruct
+    | UniformStruct[];
 
 export type UniformStruct = { [key: string]: UniformValueDataType };
 
@@ -137,13 +135,12 @@ export declare class Material implements IGPUResource {
 
   destroy (options?: MaterialDestroyOptions): void;
 
-  setUniformSemantic (uniformName: string, semantic: string | undefined): void;
-
   assignRenderer (renderer: GPURenderer): Material;
 }
 
 export interface MaterialDataBlockOptions {
   uniformValues?: { [key: string]: UniformValue },
+  uniformTextures?: Record<string, Texture | Texture[]>,
   name?: string,
   uniformSemantics?: { [key: string]: UniformSemantic },
 }
@@ -166,6 +163,8 @@ export declare class MaterialDataBlock implements IGPUResource {
 
   hasUniformValue (name: string): boolean;
 
+  setUniformSemantic (name: string, semantic: string | undefined): void;
+
   setUniformValue (name: string, value: UniformValue): boolean;
 
   getUniformValue (name: string): UniformValue;
@@ -174,15 +173,19 @@ export declare class MaterialDataBlock implements IGPUResource {
 
   setUniformValues (map: { [key: string]: UniformValue }): void;
 
+  setUniformTexture (uniformName: string, texture: Texture | Texture[] | undefined): void;
+
+  getUniformTexture<T extends Texture[] | Texture = Texture>(uniformName: string): T | undefined;
+
   /**
-   * indicate uniform data should be resent to GPU, but not the full range,
-   * only works for ubo,if not an ubo, this method has no side effect
-   * offset and count are counted by typed entry, not the number elements
-   * entry means matrix or vector in shader
-   * @param name uniform name
-   * @param offset entry offset,first entry to send to gpu, default 0
-   * @param count entry count,entry count to send to gpu,default to end
-   */
+     * indicate uniform data should be resent to GPU, but not the full range,
+     * only works for ubo,if not an ubo, this method has no side effect
+     * offset and count are counted by typed entry, not the number elements
+     * entry means matrix or vector in shader
+     * @param name uniform name
+     * @param offset entry offset,first entry to send to gpu, default 0
+     * @param count entry count,entry count to send to gpu,default to end
+     */
   updateUniformSubData (name: string, offset: number, count: number): void;
 
   destroy (options?: MaterialDataBlockDestroyOptions): void;

package/types/RenderFrame.ts

@@ -1,11 +1,9 @@
-import type { UniformValue } from './Material';
 import type {
   RenderPass,
   RenderPassLoadAction,
-  RenderPassDestroyOptions, SemanticMap,
+  RenderPassDestroyOptions, SemanticMap, SemanticGetter,
 } from './RenderPass';
 import type { Mesh } from './Mesh';
-import type { GPUBuffer } from './GPUBuffer';
 import type { vec4 } from './type';
 import type { GPURenderer } from './index';
 import type { IGPURenderer, IGPUResource } from './IGPURenderer';
@@ -21,12 +19,12 @@ export interface RenderState {
 export interface RenderFrameOptions {
   renderPasses?: RenderPass[],
   viewport?: vec4,
-  semantics?: { [key: string]: UniformValue | SemanticFunc | GPUBuffer },
+  semantics?: { [key: string]: SemanticGetter },
   loadAction?: RenderPassLoadAction,
   name?: string,
 }
 
-export type SemanticFunc = (state: RenderState) => UniformValue | GPUBuffer | null | undefined;
+export type SemanticFunc = (state: RenderState) => SemanticGetter | null | undefined;
 
 export type RenderFrameDestroyOptions = {
   passes?: RenderPassDestroyOptions | DestroyOptions.keep,

package/types/RenderPass.ts

@@ -117,7 +117,7 @@ export interface RenderPassAttachmentOptions {
   multiSample?: number,
 }
 
-export type SemanticGetter = UniformValue | SemanticFunc | GPUBuffer;
+export type SemanticGetter = UniformValue | SemanticFunc | GPUBuffer | Texture | Texture[];
 
 export interface RenderPassOptions extends RenderPassAttachmentOptions {
   name?: string,
@@ -163,7 +163,7 @@ export interface RenderPassDelegate {
   willBeginRenderPass?: (renderPass: RenderPass, state: RenderState) => void,
   didEndRenderPass?: (renderPass: RenderPass, state: RenderState) => void,
   willRenderMesh?: (mesh: Mesh, state: RenderState) => void,
-  didiRenderMesh?: (mesh: Mesh, state: RenderState) => void,
+  didRenderMesh?: (mesh: Mesh, state: RenderState) => void,
 }
 
 export declare class RenderPass implements IGPUResource {

package/types/Renderer.ts

@@ -23,13 +23,12 @@ export interface RendererExtensions {
   copyTexture?: (source: Texture, tex: Texture) => void,
   resetColorAttachments?: (rp: RenderPass, colorAttachments: Texture[]) => void,
 }
-
 export declare class GPURenderer implements IGPURenderer {
   readonly height: number;
   readonly width: number;
   /**
-   * if webgl not support, gpu.level will be 0
-   */
+     * if webgl not support, gpu.level will be 0
+     */
   readonly shaderLibrary: ShaderLibrary;
   readonly gpu: GPUCapability;
   readonly canvas: Canvas;
@@ -44,19 +43,31 @@ export declare class GPURenderer implements IGPURenderer {
   createBuffer (options: GPUBufferOptions): GPUBuffer;
 
   /**
-   * only resize when width or height is different from now,
-   * when resized,all full-screen renderPasses attached to this renderer should be resized as well
-   * 只有当宽高不同的时候，才实际进行函数
-   * 当重新调整宽高后，这个renderer创建的renderPasses，如果没有被指定 viewport（全屏），那么需要resize 所有的renderPass
-   * @param width
-   * @param height
-   */
+     * 根据不同平台封装实现 requestAnimationFrame，
+     * FrameRequestCallback函数回调中进行渲染数据更新，
+     * OpenGL/WebGL在绘制开始之前(传递此帧数据）
+     * Metal在commandBuffer提交后（传递下一帧数据）
+     * @param cb
+     */
+  requestAnimationFrame (cb: FrameRequestCallback): number;
+
+  //todo
+  cancelAnimationFrame (id: number): void;
+
+  /**
+     * only resize when width or height is different from now,
+     * when resized,all full-screen renderPasses attached to this renderer should be resized as well
+     * 只有当宽高不同的时候，才实际进行函数
+     * 当重新调整宽高后，这个renderer创建的renderPasses，如果没有被指定 viewport（全屏），那么需要resize 所有的renderPass
+     * @param width
+     * @param height
+     */
   resize (width: number, height: number): void;
 
   /**
-   * destroy all resources created by this renderer
-   * @param haltGL if true, this method will call webgl lose context extension which leads webgl absolutely halt
-   */
+     * destroy all resources created by this renderer
+     * @param haltGL if true, this method will call webgl lose context extension which leads webgl absolutely halt
+     */
   destroy (haltGL?: boolean): void;
 
 }

package/types/ShaderLibrary.ts

@@ -2,7 +2,7 @@ export type Shader = ShaderWithSource | ShaderUseCacheId;
 export type ShaderWithSource = InstancedShaderWithSource | SharedShaderWithSource;
 
 export interface MetaShaderSpec {
-  mtlBinary?: ArrayBuffer,
+  mtlBinary?: ArrayBuffer | string,
   mtlSource?: string,
 
   mtlVertex?: string,
@@ -72,9 +72,9 @@ export interface ShaderLibrary {
   getShaderResult(cacheId: string): ShaderCompileResult | undefined,
 
   /**
-   * 添加shader
-   * @param shader
-   */
+     * 添加shader
+     * @param shader
+     */
   addShader(shader: Shader): string,
 
   /**

package/types/native/ImageBitmapInternal.ts

@@ -1,6 +1,4 @@
 export interface ImageBitmapConstructor {
-  flipY?: boolean,
-  premultiplyAlpha?: boolean,
   resizeWidth?: number,
   resizeHeight?: number,
 }