@predy-js/render-interface 0.3.1 → 0.3.2

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/MarsRenderer.d.ts

@@ -18,6 +18,7 @@ export declare class MarsRenderer implements GPURenderer {
     destroy(haltGL?: boolean): void;
     resize(width: number, height: number): void;
     cancelAnimationFrame(id: number): void;
+    resume(): void;
     getErrors(): string[];
     invalid(): void;
     requestAnimationFrame(cb: FrameRequestCallback): number;

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/src/webgl/KhronosTextureContainer.d.ts

@@ -1,4 +1,4 @@
-import type { TextureOptions, TypedArray } from '../../types';
+import type { TextureOptions } from '../../types';
 export declare class KhronosTextureContainer {
     arrayBuffer: ArrayBuffer;
     baseOffset: number;
@@ -15,9 +15,9 @@ export declare class KhronosTextureContainer {
     numberOfFaces: number;
     numberOfMipmapLevels: number;
     bytesOfKeyValueData: number;
-    constructor(arrayBuffer: ArrayBuffer, facesExpected: number, baseOffset?: number);
+    constructor(arrayBuffer: ArrayBuffer, baseOffset?: number);
     mipmaps(loadMipmaps: boolean): Array<{
-        data: TypedArray;
+        data: Uint8Array;
         width: number;
         height: number;
     }>;

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

@@ -1,5 +1,5 @@
 import type { TypedArray, vec2 } from '../../types/type';
-export declare let constants: WebGL2RenderingContext;
+export declare const constants: WebGL2RenderingContext & WEBGL_compressed_texture_astc;
 export declare function createTypedArrayByGLType(type: number, elementCount: number | ArrayBuffer): TypedArray;
 export declare function getBytesPerElementByGLType(type: number): number;
 export declare function getMatAttrLocPair(type: number): vec2;

package/dist/statistic.js

@@ -2,7 +2,7 @@
  * Name: @predy-js/render-interface
  * Description: undefined
  * Author: undefined
- * Version: v0.3.1
+ * Version: v0.3.2
  */
 
 // 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/Renderer.d.ts

@@ -59,4 +59,8 @@ export declare class GPURenderer implements IGPURenderer {
      * 此帧需要进行绘制
      */
     invalid(): void;
+    /**
+     * 用于恢复渲染的接口
+     */
+    resume(): void;
 }

package/dist/types/Texture.d.ts

@@ -25,6 +25,7 @@ export interface TextureFactorySource2DFrom {
 export interface TextureFactorySourceFromCompressed {
     type: TextureSourceType.compressed;
     url: string;
+    c?: number;
 }
 export type TextureFactorySourceCubeFrom = {
     type: TextureSourceType.image;
@@ -64,10 +65,10 @@ export interface TextureFactorySource2DMipmapsFrom {
 export type TextureFactorySourceFrom = TextureFactorySource2DBinaryMipmapsFrom | TextureFactorySourceCubeBinaryMipmapsFrom | TextureFactorySource2DFrom | TextureFactorySourceCubeFrom | TextureFactorySourceCubeMipmapsFrom | TextureFactorySource2DMipmapsFrom | TextureFactorySourceFromCompressed;
 export interface TextureFactory {
     /**
-     * 通过TextureConfigOptions可以决定图片解码时使用的格式
-     * @param options
-     * @param config texture的属性
-     */
+       * 通过TextureConfigOptions可以决定图片解码时使用的格式
+       * @param options
+       * @param config texture的属性
+       */
     loadSourceAsync(options: TextureFactorySourceFrom, config?: TextureConfigOptions): Promise<TextureOptions>;
     canOffloadTexture(texture: Texture): boolean;
     reloadTextureAsync(texture: Texture): Promise<Texture>;
@@ -150,7 +151,7 @@ export interface Texture2DSourceOptionsImageMipmaps extends TextureOptionsBase {
 export interface Texture2DSourceOptionsCompressed extends TextureOptionsBase {
     sourceType: TextureSourceType.compressed;
     mipmaps: Array<{
-        data: TypedArray;
+        data: Uint8Array;
         width: number;
         height: number;
     }>;
@@ -188,6 +189,7 @@ export interface TextureConfigOptionsBase {
 }
 export interface TextureConfigOptions extends TextureConfigOptionsBase {
     sourceFrom?: TextureFactorySourceFrom;
+    premultiplyAlpha?: boolean;
 }
 export interface TextureFormatOptions {
     format?: GLenum;

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';
@@ -13,7 +13,9 @@ export interface PredyRequestOptions {
 export declare enum PredyResourceCacheStatus {
     noCache = 0,
     cached = 1,
-    preloaded = 2
+    preloaded = 2,
+    hitCDN = 3,
+    missCDN = 4
 }
 export interface PredyRequestResponse {
     data: ArrayBuffer | string;
@@ -21,6 +23,12 @@ export interface PredyRequestResponse {
     time: number;
 }
 export type PredyRequestCallback = (err: string | undefined, res: PredyRequestResponse) => void;
+export declare const DataCompressMethodZlib = 1;
+type DataCompressMethod = typeof DataCompressMethodZlib;
+export declare enum PredyTextEncoding {
+    utf8 = 0,
+    ascii = 1
+}
 export interface PredyNativeInternal {
     webpDisabled?: boolean;
     createImageBitmap(data: TypedArray | string, //图片文件的数据
@@ -28,31 +36,57 @@ export interface PredyNativeInternal {
     getDefaultGPUCapability(): GPUCapability;
     requestWithCache(options: PredyRequestOptions, callback: PredyRequestCallback): void;
     /**
-     * decode utf8 text from data
-     * @param data
-     */
-    decodeText(data: Uint8Array): string;
+       * decode text from data
+       * @param data
+       * @param encoding 默认utf8
+       */
+    decodeText(data: Uint8Array, encoding?: PredyTextEncoding): string;
     /**
-     * 将图片绘制到画布上，同时替换文案，绘制的顺序如下
-     * 创建template.size尺寸的画布, 接下来的绘制均应用 template.offset
-     * 将images绘制到画布上，images的尺寸由image.frame决定
-     * 将数据模板content绘制到画布上,使用variables替换文案
-     * @param template
-     */
+       * 将图片绘制到画布上，同时替换文案，绘制的顺序如下
+       * 创建template.size尺寸的画布, 接下来的绘制均应用 template.offset
+       * 将images绘制到画布上，images的尺寸由image.frame决定
+       * 将数据模板content绘制到画布上,使用variables替换文案
+       * @param template
+       */
     renderImageTemplate(template: PredyResizeTemplate): ImageBitmapInternal;
     /**
-     * 异步绘制图片的模板
-     * @param options
-     * @param callback 如果传入callback就是异步绘制，否则会直接返回结果
-     */
+       * 异步绘制图片的模板
+       * @param options
+       * @param callback 如果传入callback就是异步绘制，否则会直接返回结果
+       */
     generateSDFImage(options: SDFImageOptions, callback?: renderSDFImageCallback): SDFImage | undefined;
     /**
-     * 下载并且执行脚本文件，此方法会缓存https的脚本内容
-     * 对于http的请求（开发环境），每次都重新请求
-     * @param url
-     * @param callback
-     */
+       * 下载并且执行脚本文件，此方法会缓存https的脚本内容
+       * 对于http的请求（开发环境），每次都重新请求
+       * @param url
+       * @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
+       * @param method
+       */
+    inflateData(data: Uint8Array, method: DataCompressMethod): Uint8Array | undefined;
+    /**
+     * 恢复当前的主JSContext,多个JSContext执行的时候会发生抢占，
+     * 调用此函数后，当前的JSContext会被恢复
+     */
+    restoreJSContext(): boolean;
 }
 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/dist/types/native/TextureInternal.d.ts

@@ -39,9 +39,13 @@ export declare abstract class TextureInternal implements ResourceInternal {
        */
     abstract update2DImageData(data: ImageData, mipmapLevel?: number): void;
     /**
-       * 上传压缩纹理数据
+       * 上传2D压缩纹理数据
        */
-    abstract update2DCompressedImage(data: ImageData, mipmapLevel?: number): void;
+    abstract update2DCompressedData(data: Uint8Array, mipmapLevel?: number): void;
+    /**
+       * 上传Cube压缩纹理数据
+       */
+    abstract update2DCompressedCubeData(data: Uint8Array[], mipmapLevel?: number): void;
     /**
        * imageBitmap的尺寸也必须和Texture相同
        * @param image

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@predy-js/render-interface",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "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/Renderer.ts

@@ -71,4 +71,8 @@ export declare class GPURenderer implements IGPURenderer {
    */
   invalid (): void;
 
+  /**
+   * 用于恢复渲染的接口
+   */
+  resume (): void;
 }

package/types/Texture.ts

@@ -9,7 +9,7 @@ import type { GPURenderer } from './Renderer';
  */
 export type ImageBitmapPixelFormat = WebGL2RenderingContext['RGBA8'] |
 WebGL2RenderingContext['RGBA16F'] |
-WebGL2RenderingContext['RGBA32F'] ;
+WebGL2RenderingContext['RGBA32F'];
 
 export enum TextureSourceType {
   none,
@@ -31,6 +31,7 @@ export interface TextureFactorySource2DFrom {
 export interface TextureFactorySourceFromCompressed {
   type: TextureSourceType.compressed,
   url: string,
+  c?: number,
 }
 
 export type TextureFactorySourceCubeFrom = {
@@ -46,12 +47,12 @@ export type TextureFactorySourceCubeBinaryMipmapsFrom = {
   type: TextureSourceType.mipmaps,
   bin: string,
   mipmaps: Array<[
-    TEXTURE_CUBE_MAP_POSITIVE_X: DataRange,
-    TEXTURE_CUBE_MAP_NEGATIVE_X: DataRange,
-    TEXTURE_CUBE_MAP_POSITIVE_Y: DataRange,
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: DataRange,
-    TEXTURE_CUBE_MAP_POSITIVE_Z: DataRange,
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: DataRange
+        TEXTURE_CUBE_MAP_POSITIVE_X: DataRange,
+        TEXTURE_CUBE_MAP_NEGATIVE_X: DataRange,
+        TEXTURE_CUBE_MAP_POSITIVE_Y: DataRange,
+        TEXTURE_CUBE_MAP_NEGATIVE_Y: DataRange,
+        TEXTURE_CUBE_MAP_POSITIVE_Z: DataRange,
+        TEXTURE_CUBE_MAP_NEGATIVE_Z: DataRange
   ]>,
 };
 
@@ -75,27 +76,27 @@ export interface TextureFactorySource2DMipmapsFrom {
 }
 
 export type TextureFactorySourceFrom =
-  TextureFactorySource2DBinaryMipmapsFrom
-  | TextureFactorySourceCubeBinaryMipmapsFrom
-  | TextureFactorySource2DFrom
-  | TextureFactorySourceCubeFrom
-  | TextureFactorySourceCubeMipmapsFrom
-  | TextureFactorySource2DMipmapsFrom
-  | TextureFactorySourceFromCompressed;
+    TextureFactorySource2DBinaryMipmapsFrom
+    | TextureFactorySourceCubeBinaryMipmapsFrom
+    | TextureFactorySource2DFrom
+    | TextureFactorySourceCubeFrom
+    | TextureFactorySourceCubeMipmapsFrom
+    | TextureFactorySource2DMipmapsFrom
+    | TextureFactorySourceFromCompressed;
 
 export interface TextureFactory {
   /**
-   * 通过TextureConfigOptions可以决定图片解码时使用的格式
-   * @param options
-   * @param config texture的属性
-   */
-  loadSourceAsync (options: TextureFactorySourceFrom, config?: TextureConfigOptions): Promise<TextureOptions>,
+     * 通过TextureConfigOptions可以决定图片解码时使用的格式
+     * @param options
+     * @param config texture的属性
+     */
+  loadSourceAsync(options: TextureFactorySourceFrom, config?: TextureConfigOptions): Promise<TextureOptions>,
 
-  canOffloadTexture (texture: Texture): boolean,
+  canOffloadTexture(texture: Texture): boolean,
 
-  reloadTextureAsync (texture: Texture): Promise<Texture>,
+  reloadTextureAsync(texture: Texture): Promise<Texture>,
 
-  loadCompressedTextureFromArrayBuffer (arrayBuffer: ArrayBuffer, options?: TextureOptions): TextureOptions,
+  loadCompressedTextureFromArrayBuffer(arrayBuffer: ArrayBuffer, options?: TextureOptions): TextureOptions,
 }
 
 export declare class Texture implements IGPUResource {
@@ -133,12 +134,12 @@ export interface ImageData {
 }
 
 export type TextureSourceCubeData = [
-  TEXTURE_CUBE_MAP_POSITIVE_X: ImageSource | ImageData,
-  TEXTURE_CUBE_MAP_NEGATIVE_X: ImageSource | ImageData,
-  TEXTURE_CUBE_MAP_POSITIVE_Y: ImageSource | ImageData,
-  TEXTURE_CUBE_MAP_NEGATIVE_Y: ImageSource | ImageData,
-  TEXTURE_CUBE_MAP_POSITIVE_Z: ImageSource | ImageData,
-  TEXTURE_CUBE_MAP_NEGATIVE_Z: ImageSource | ImageData
+    TEXTURE_CUBE_MAP_POSITIVE_X: ImageSource | ImageData,
+    TEXTURE_CUBE_MAP_NEGATIVE_X: ImageSource | ImageData,
+    TEXTURE_CUBE_MAP_POSITIVE_Y: ImageSource | ImageData,
+    TEXTURE_CUBE_MAP_NEGATIVE_Y: ImageSource | ImageData,
+    TEXTURE_CUBE_MAP_POSITIVE_Z: ImageSource | ImageData,
+    TEXTURE_CUBE_MAP_NEGATIVE_Z: ImageSource | ImageData
 ];
 
 // 为减少内存消耗，除了video之外，其余的数据内容会在texture生成后被置为undefined
@@ -186,7 +187,7 @@ export interface Texture2DSourceOptionsImageMipmaps extends TextureOptionsBase {
 
 export interface Texture2DSourceOptionsCompressed extends TextureOptionsBase {
   sourceType: TextureSourceType.compressed,
-  mipmaps: Array<{ data: TypedArray, width: number, height: number }>,
+  mipmaps: Array<{ data: Uint8Array, width: number, height: number }>,
   target?: WebGLRenderingContext['TEXTURE_2D'],
 }
 
@@ -204,12 +205,12 @@ export interface TextureCubeSourceOptionsImageMipmaps extends TextureOptionsBase
 }
 
 export type TextureCubeSourceURLMap = [
-  TEXTURE_CUBE_MAP_POSITIVE_X: string,
-  TEXTURE_CUBE_MAP_NEGATIVE_X: string,
-  TEXTURE_CUBE_MAP_POSITIVE_Y: string,
-  TEXTURE_CUBE_MAP_NEGATIVE_Y: string,
-  TEXTURE_CUBE_MAP_POSITIVE_Z: string,
-  TEXTURE_CUBE_MAP_NEGATIVE_Z: string
+    TEXTURE_CUBE_MAP_POSITIVE_X: string,
+    TEXTURE_CUBE_MAP_NEGATIVE_X: string,
+    TEXTURE_CUBE_MAP_POSITIVE_Y: string,
+    TEXTURE_CUBE_MAP_NEGATIVE_Y: string,
+    TEXTURE_CUBE_MAP_POSITIVE_Z: string,
+    TEXTURE_CUBE_MAP_NEGATIVE_Z: string
 ];
 
 export interface TextureConfigOptionsBase {
@@ -227,6 +228,7 @@ export interface TextureConfigOptionsBase {
 
 export interface TextureConfigOptions extends TextureConfigOptionsBase {
   sourceFrom?: TextureFactorySourceFrom,
+  premultiplyAlpha?: boolean,
 }
 
 export interface TextureFormatOptions {
@@ -242,12 +244,12 @@ export interface TextureOptionsBase extends TextureConfigOptions, TextureFormatO
 export type TextureCubeSourceOptions = TextureCubeSourceOptionsImage | TextureCubeSourceOptionsImageMipmaps;
 
 export type Texture2DSourceOptions =
-  Texture2DSourceOptionsImage
-  | Texture2DSourceOptionsData
-  | Texture2DSourceOptionsVideo
-  | Texture2DSourceOptionsImageMipmaps
-  | Texture2DSourceOptionsCompressed
-  | Texture2DSourceOptionsFrameBuffer;
+    Texture2DSourceOptionsImage
+    | Texture2DSourceOptionsData
+    | Texture2DSourceOptionsVideo
+    | Texture2DSourceOptionsImageMipmaps
+    | Texture2DSourceOptionsCompressed
+    | Texture2DSourceOptionsFrameBuffer;
 
 export type Texture2DOptions = Texture2DSourceOptions;
 

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;