@predy-js/render-interface 0.3.0-beta.18 → 0.3.0-beta.181

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

@@ -1,4 +1,4 @@
-import type { MaterialDataBlock, MaterialDataBlockDestroyOptions, MaterialDataBlockOptions, UniformSemantic, UniformValue, vec2, Texture } from '../../types';
+import type { MaterialDataBlock, MaterialDataBlockDestroyOptions, MaterialDataBlockOptions, UniformSemantic, UniformValue, vec2, Texture, SemanticFunc } from '../../types';
 import type { MarsRenderer } from './MarsRenderer';
 import { MarsTexture } from './MarsTexture';
 import type { UniformBlockSpec } from '../webgl/GLUniformUtils';
@@ -10,7 +10,7 @@ export declare class MarsMaterialDataBlock implements MaterialDataBlock {
     readonly _uniformValueRanges: Record<string, vec2>;
     readonly name: string;
     readonly uniformSemantics: {
-        [key: string]: UniformSemantic;
+        [key: string]: UniformSemantic | SemanticFunc;
     };
     readonly renderer?: MarsRenderer;
     readonly uboBufferMap: Record<string, UniformBlockBuffer>;
@@ -41,6 +41,6 @@ export declare class MarsMaterialDataBlock implements MaterialDataBlock {
     setUniformValues(map: {
         [p: string]: UniformValue;
     }): void;
-    setUniformSemantic(name: string, semantic: string | undefined): void;
+    setUniformSemantic(name: string, semantic: string | SemanticFunc | undefined): void;
     clone(name: string): MarsMaterialDataBlock;
 }

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<(ImageBitmap | HTMLImageElement)[]>;
+    loadMipmapImagesAsync(pointers: vec2[], bin: ArrayBuffer): Promise<(HTMLImageElement | ImageBitmap)[]>;
     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

@@ -1,9 +1,8 @@
 import type { GLGPURenderer } from './GLGPURenderer';
 import type { GLGeometry } from './GLGeometry';
-import type { RenderState } from '../../types/RenderFrame';
+import type { RenderState, SemanticFunc } 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;
@@ -36,7 +35,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 | SemanticFunc): number | Float32Array | Float64Array | Uint8Array | Uint32Array | Uint16Array | Int8Array | Int16Array | Int32Array | import("../../types").GPUBuffer | import("../../types").Texture | number[] | number[][] | import("../../types").UniformStruct | import("../../types").UniformStruct[] | SemanticFunc | import("../../types").Texture[] | 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.3.0-beta.18
+ * Version: v0.3.0-beta.181
  */
 
 // https://github.com/greggman/webgl-memory/blob/main/src/texture-utils.js

package/dist/types/Material.d.ts

@@ -4,6 +4,7 @@ import type { Immutable, TypedArray } from './type';
 import type { GPURenderer } from './Renderer';
 import type { DestroyOptions } from './constants';
 import type { Texture } from './Texture';
+import type { SemanticFunc } from './RenderFrame';
 export type UniformSemantic = 'VIEW' | 'MODEL' | 'MODELVIEW' | 'PROJECTION' | 'VIEWPROJECTION' | 'MODELVIEWPROJECTION' | string;
 export interface MaterialRenderStates {
     sampleAlphaToCoverage?: boolean;
@@ -110,7 +111,7 @@ export interface MaterialDataBlockOptions {
     uniformTextures?: Record<string, Texture | Texture[]>;
     name?: string;
     uniformSemantics?: {
-        [key: string]: UniformSemantic;
+        [key: string]: UniformSemantic | SemanticFunc;
     };
 }
 export interface MaterialDataBlockDestroyOptions {
@@ -121,11 +122,11 @@ export declare class MaterialDataBlock implements IGPUResource {
     readonly isDestroyed: boolean;
     readonly name: string;
     readonly uniformSemantics?: {
-        [key: string]: UniformSemantic;
+        [key: string]: UniformSemantic | SemanticFunc;
     };
     constructor(options: MaterialDataBlockOptions);
     hasUniformValue(name: string): boolean;
-    setUniformSemantic(name: string, semantic: string | undefined): void;
+    setUniformSemantic(name: string, semantic: string | SemanticFunc | undefined): void;
     /**
      * 多次调用次函数只会更新JS层的数据，不会直接更新GPU数据
      * 在下一次渲染前，会将JS层的数据更新到GPU

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

@@ -4,6 +4,12 @@ import type { TextureInternal } from './TextureInternal';
 export interface DataBlockInternalOptions {
     name: string;
 }
+/**
+ * struct uniform的数据结构
+ */
+export interface NativeUniformStruct {
+    [key: string]: TypedArray;
+}
 export declare abstract class DataBlockInternal implements ResourceInternal {
     readonly isDestroyed: boolean;
     /**
@@ -27,6 +33,15 @@ export declare abstract class DataBlockInternal implements ResourceInternal {
      * @param value
      */
     abstract getUniformValue(name: string, value: TypedArray): boolean;
+    /**
+     * 设置uniform的结构体数据，对于数据进行深拷贝，修改原始数据，不会影响已经传入的数据，
+     * 如果要修改数据，必须重新调用setUniformStructValues
+     */
+    abstract setUniformStructValues(name: string, values: NativeUniformStruct[]): boolean;
+    /**
+     * 获取uniform的结构体数据,获取的数据进行深拷贝,传入的数据将
+     */
+    abstract getUniformStructValue(name: string, idx: number): Record<string, ArrayBuffer> | undefined;
     abstract setUniformTextures(uniformName: string, texture: TextureInternal[] | undefined): void;
     abstract getUniformTextures(uniformName: string): TextureInternal[] | undefined;
 }

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

@@ -1,5 +1,5 @@
 import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapInternal';
-import type { TypedArray } from '../type';
+import type { TypedArray, vec2 } from '../type';
 import type { GPUCapability } from '../GPUCapability';
 import type { PredyResizeTemplate, SDFImageOptions, SDFImage } from '@predy-js/specification';
 import type { ImageBitmapInternal } from './ImageBitmapInternal';
@@ -21,6 +21,8 @@ export interface PredyRequestResponse {
     time: number;
 }
 export type PredyRequestCallback = (err: string | undefined, res: PredyRequestResponse) => void;
+export declare const DataCompressMethodZlib = 1;
+type DataCompressMethod = typeof DataCompressMethodZlib;
 export interface PredyNativeInternal {
     webpDisabled?: boolean;
     createImageBitmap(data: TypedArray | string, //图片文件的数据
@@ -53,6 +55,25 @@ export interface PredyNativeInternal {
      * @param callback
      */
     evaluateScriptURL(url: string, callback: (err: Error, result: any) => void): void;
+    /**
+     * 将float32Array转换为half float，写入Uint16Array中,
+     * 如果提供了range参数，代表float16会被重新map到range中，以此提高精度范围
+     * 提供range参数后，算法求出source的最大最小值，然后将float16重新映射到range中
+     * 如果source和target的长度不匹配，返回false
+     */
+    float32ToFloat16(source: Float32Array, target: Uint16Array, range?: vec2): boolean;
+    /**
+     * 将half float转换为float32，通过Float32Array返回，
+     * 如果提供了range参数，代表float16会被重新map到range中，以此提高精度范围
+     * 如果没有提供，float16会被直接转化为float32
+     * 如果source和target的长度不匹配，返回false
+     */
+    float16ToFloat32(source: Uint16Array, target: Float32Array, range?: vec2): boolean;
+    /**
+     * 解压数据
+     * @param data
+     */
+    inflateData(data: Uint8Array, method: DataCompressMethod): Uint8Array | undefined;
 }
 type renderSDFImageCallback = (img: SDFImage) => void;
 export {};

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

@@ -11,6 +11,7 @@ import type { GPUCapability } from '../GPUCapability';
 import type { TextureInternal, TextureInternalConstructOptions } from './TextureInternal';
 import type { AndGLContext } from './AndGLContext';
 import type { MetalInternal } from './MetalInternal';
+import type { vec2 } from '../type';
 /**
  * renderer 内部创建的对象，用来统计信息，排查资源泄漏的问题
  */
@@ -83,5 +84,9 @@ export declare abstract class RendererInternal implements ResourceInternal {
      * 每次调用此函数后，清空错误队列
      */
     abstract getErrors(): string[];
-    abstract resize(width: number, height: number): void;
+    /**
+     * resize predy view，并且相关的fbo和render pass都需要设为相应的尺寸
+     * @param size 如果不提供size，则使用当前predy view parent的尺寸
+     */
+    abstract resize(size?: vec2): void;
 }

package/package.json

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

package/types/Material.ts

@@ -4,6 +4,7 @@ import type { Immutable, TypedArray } from './type';
 import type { GPURenderer } from './Renderer';
 import type { DestroyOptions } from './constants';
 import type { Texture } from './Texture';
+import type { SemanticFunc } from './RenderFrame';
 
 export type UniformSemantic =
     | 'VIEW'
@@ -142,7 +143,7 @@ export interface MaterialDataBlockOptions {
   uniformValues?: { [key: string]: UniformValue },
   uniformTextures?: Record<string, Texture | Texture[]>,
   name?: string,
-  uniformSemantics?: { [key: string]: UniformSemantic },
+  uniformSemantics?: { [key: string]: UniformSemantic | SemanticFunc },
 }
 
 export interface MaterialDataBlockDestroyOptions {
@@ -157,13 +158,13 @@ export declare class MaterialDataBlock implements IGPUResource {
 
   readonly name: string;
 
-  readonly uniformSemantics?: { [key: string]: UniformSemantic };
+  readonly uniformSemantics?: { [key: string]: UniformSemantic | SemanticFunc };
 
   constructor (options: MaterialDataBlockOptions);
 
   hasUniformValue (name: string): boolean;
 
-  setUniformSemantic (name: string, semantic: string | undefined): void;
+  setUniformSemantic (name: string, semantic: string | SemanticFunc | undefined): void;
 
   /**
    * 多次调用次函数只会更新JS层的数据，不会直接更新GPU数据

package/types/native/DataBlockInternal.ts

@@ -5,6 +5,12 @@ import type { TextureInternal } from './TextureInternal';
 export interface DataBlockInternalOptions {
   name: string,
 }
+
+/**
+ * struct uniform的数据结构
+ */
+export interface NativeUniformStruct { [key: string]: TypedArray }
+
 export abstract class DataBlockInternal implements ResourceInternal {
   readonly isDestroyed: boolean;
   /**
@@ -33,6 +39,17 @@ export abstract class DataBlockInternal implements ResourceInternal {
    */
   abstract getUniformValue (name: string, value: TypedArray): boolean;
 
+  /**
+   * 设置uniform的结构体数据，对于数据进行深拷贝，修改原始数据，不会影响已经传入的数据，
+   * 如果要修改数据，必须重新调用setUniformStructValues
+   */
+  abstract setUniformStructValues (name: string, values: NativeUniformStruct[]): boolean;
+
+  /**
+   * 获取uniform的结构体数据,获取的数据进行深拷贝,传入的数据将
+   */
+  abstract getUniformStructValue (name: string, idx: number): Record<string, ArrayBuffer> | undefined;
+
   abstract setUniformTextures (uniformName: string, texture: TextureInternal[] | undefined): void;
 
   abstract getUniformTextures (uniformName: string): TextureInternal[] | undefined;

package/types/native/PredyNativeInternal.ts

@@ -1,8 +1,9 @@
 import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapInternal';
-import type { TypedArray } from '../type';
+import type { TypedArray, vec2 } from '../type';
 import type { GPUCapability } from '../GPUCapability';
 import type { PredyResizeTemplate, SDFImageOptions, SDFImage } from '@predy-js/specification';
 import type { ImageBitmapInternal } from './ImageBitmapInternal';
+
 export interface PredyRequestOptions {
   url: string,
   //用于测试缓存，生产中不要使用
@@ -29,6 +30,10 @@ export interface PredyRequestResponse {
 
 export type PredyRequestCallback = (err: string | undefined, res: PredyRequestResponse) => void;
 
+export const DataCompressMethodZlib = 1;
+
+type DataCompressMethod = typeof DataCompressMethodZlib;
+
 export interface PredyNativeInternal {
   webpDisabled?: boolean,
 
@@ -67,6 +72,28 @@ export interface PredyNativeInternal {
    * @param callback
    */
   evaluateScriptURL (url: string, callback: (err: Error, result: any) => void): void,
+
+  /**
+   * 将float32Array转换为half float，写入Uint16Array中,
+   * 如果提供了range参数，代表float16会被重新map到range中，以此提高精度范围
+   * 提供range参数后，算法求出source的最大最小值，然后将float16重新映射到range中
+   * 如果source和target的长度不匹配，返回false
+   */
+  float32ToFloat16(source: Float32Array, target: Uint16Array, range?: vec2): boolean,
+
+  /**
+   * 将half float转换为float32，通过Float32Array返回，
+   * 如果提供了range参数，代表float16会被重新map到range中，以此提高精度范围
+   * 如果没有提供，float16会被直接转化为float32
+   * 如果source和target的长度不匹配，返回false
+   */
+  float16ToFloat32(source: Uint16Array, target: Float32Array, range?: vec2): boolean,
+
+  /**
+   * 解压数据
+   * @param data
+   */
+  inflateData(data: Uint8Array, method: DataCompressMethod): Uint8Array | undefined,
 }
 
 type renderSDFImageCallback = (img: SDFImage) => void;

package/types/native/RendererInternal.ts

@@ -11,6 +11,7 @@ import type { GPUCapability } from '../GPUCapability';
 import type { TextureInternal, TextureInternalConstructOptions } from './TextureInternal';
 import type { AndGLContext } from './AndGLContext';
 import type { MetalInternal } from './MetalInternal';
+import type { vec2 } from '../type';
 
 /**
  * renderer 内部创建的对象，用来统计信息，排查资源泄漏的问题
@@ -109,6 +110,10 @@ export abstract class RendererInternal implements ResourceInternal {
    */
   abstract getErrors (): string[];
 
-  abstract resize (width: number, height: number): void;
+  /**
+   * resize predy view，并且相关的fbo和render pass都需要设为相应的尺寸
+   * @param size 如果不提供size，则使用当前predy view parent的尺寸
+   */
+  abstract resize (size?: vec2): void;
 }