@predy-js/render-interface 0.1.65 → 0.1.66-beta.10

package/dist/statistic.js

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

package/dist/types/Texture.d.ts

@@ -80,45 +80,26 @@ export declare class Texture implements IGPUResource {
     assignRenderer(renderer: GPURenderer): Texture;
 }
 type ImageSource = ImageBitmap | HTMLImageElement | HTMLCanvasElement;
+export interface ImageData {
+    data: TypedArray;
+    width: number;
+    height: number;
+}
 export type TextureSourceCubeData = [
-    TEXTURE_CUBE_MAP_POSITIVE_X: ImageSource | {
-        data: TypedArray;
-        width: number;
-        height: number;
-    },
-    TEXTURE_CUBE_MAP_NEGATIVE_X: ImageSource | {
-        data: TypedArray;
-        width: number;
-        height: number;
-    },
-    TEXTURE_CUBE_MAP_POSITIVE_Y: ImageSource | {
-        data: TypedArray;
-        width: number;
-        height: number;
-    },
-    TEXTURE_CUBE_MAP_NEGATIVE_Y: ImageSource | {
-        data: TypedArray;
-        width: number;
-        height: number;
-    },
-    TEXTURE_CUBE_MAP_POSITIVE_Z: ImageSource | {
-        data: TypedArray;
-        width: number;
-        height: number;
-    },
-    TEXTURE_CUBE_MAP_NEGATIVE_Z: ImageSource | {
-        data: TypedArray;
-        width: number;
-        height: number;
-    }
+    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
 ];
 export type TextureSourceOptions = Texture2DSourceOptions | TextureCubeSourceOptions;
 export interface Texture2DSourceOptionsNone extends TextureOptionsBase {
-    sourceType?: TextureSourceType.none;
+    sourceType: TextureSourceType.none;
     target?: GLenum;
 }
 export interface Texture2DSourceOptionsImage extends TextureOptionsBase {
-    sourceType?: TextureSourceType.image;
+    sourceType: TextureSourceType.image;
     image: ImageSource;
     target?: WebGLRenderingContext['TEXTURE_2D'];
     generateMipmap?: boolean;
@@ -132,7 +113,7 @@ export interface Texture2DSourceOptionsFrameBuffer extends TextureOptionsBase {
     target?: WebGLRenderingContext['TEXTURE_2D'];
 }
 export interface Texture2DSourceOptionsData extends TextureOptionsBase {
-    sourceType?: TextureSourceType.data;
+    sourceType: TextureSourceType.data;
     data: {
         data: TypedArray;
         width: number;
@@ -141,13 +122,13 @@ export interface Texture2DSourceOptionsData extends TextureOptionsBase {
     target?: WebGLRenderingContext['TEXTURE_2D'];
 }
 export interface Texture2DSourceOptionsVideo extends TextureOptionsBase {
-    sourceType?: TextureSourceType.video;
+    sourceType: TextureSourceType.video;
     video: HTMLVideoElement;
     target?: WebGLRenderingContext['TEXTURE_2D'];
     generateMipmap?: boolean;
 }
 export interface Texture2DSourceOptionsImageMipmaps extends TextureOptionsBase {
-    sourceType?: TextureSourceType.mipmaps;
+    sourceType: TextureSourceType.mipmaps;
     mipmaps: Array<ImageSource | {
         data: TypedArray;
         width: number;
@@ -156,7 +137,7 @@ export interface Texture2DSourceOptionsImageMipmaps extends TextureOptionsBase {
     target?: WebGLRenderingContext['TEXTURE_2D'];
 }
 export interface Texture2DSourceOptionsCompressed extends TextureOptionsBase {
-    sourceType?: TextureSourceType.compressed;
+    sourceType: TextureSourceType.compressed;
     mipmaps: Array<{
         data: TypedArray;
         width: number;
@@ -171,7 +152,7 @@ export interface TextureCubeSourceOptionsImage extends TextureOptionsBase {
     generateMipmap?: boolean;
 }
 export interface TextureCubeSourceOptionsImageMipmaps extends TextureOptionsBase {
-    sourceType?: TextureSourceType.mipmaps;
+    sourceType: TextureSourceType.mipmaps;
     mipmaps: Array<TextureSourceCubeData>;
     target: WebGLRenderingContext['TEXTURE_CUBE_MAP'];
 }
@@ -203,7 +184,7 @@ export interface TextureFormatOptions {
     type?: GLenum;
 }
 export interface TextureOptionsBase extends TextureConfigOptions, TextureFormatOptions {
-    sourceType?: TextureSourceType;
+    sourceType: TextureSourceType;
 }
 export type TextureCubeSourceOptions = TextureCubeSourceOptionsImage | TextureCubeSourceOptionsImageMipmaps;
 export type Texture2DSourceOptions = Texture2DSourceOptionsImage | Texture2DSourceOptionsData | Texture2DSourceOptionsVideo | Texture2DSourceOptionsImageMipmaps | Texture2DSourceOptionsCompressed | Texture2DSourceOptionsFrameBuffer;

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

@@ -1,4 +1,14 @@
 import type { MaterialInternal } from './MaterialInternal';
+import type { vec2 } from '../type';
+import type { TextureInternal } from './TextureInternal';
+import type { RenderPassInternal } from './RenderPassInternal';
+export interface TextureGpuInfo {
+    format: number;
+    type: number;
+    target: number;
+    mipmaps: vec2[];
+    handle: number;
+}
 export declare abstract class AndGLContext {
     abstract isEnabled(param: GLenum): boolean;
     /**
@@ -24,4 +34,7 @@ export declare abstract class AndGLContext {
      * 为了Android 测试，会主动调用设置状态到GPU, IOS 暂不调用
      */
     abstract setupStates(mtl: MaterialInternal): void;
+    abstract getTextureGpuInfo(texture: TextureInternal): TextureGpuInfo;
+    abstract getTexParameter(target: GLenum, pname: GLenum): number;
+    abstract bindRenderPass(renderPass: RenderPassInternal): void;
 }

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

@@ -1,6 +1,4 @@
 export interface ImageBitmapConstructor {
-    resizeWidth?: number;
-    resizeHeight?: number;
 }
 export declare abstract class ImageBitmapInternal {
     /**

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

@@ -1,8 +1,6 @@
 import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapInternal';
+import type { TypedArray } from '../type';
 export declare abstract class PredyNativeInternal {
-    abstract createImageBitmap(data: ArrayBuffer | string, //图片文件的数据
+    abstract createImageBitmap(data: TypedArray | string, //图片文件的数据
     options: ImageBitmapConstructor, callback: ImageBitmapCallback): void;
 }
-declare global {
-    let predyNative: PredyNativeInternal;
-}

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

@@ -11,6 +11,7 @@ import type { GPUCapability } from '../GPUCapability';
 import type { TextureInternal, TextureInternalConstructOptions } from './TextureInternal';
 import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapInternal';
 import type { AndGLContext } from './AndGLContext';
+import type { TypedArray } from '../type';
 /**
  * renderer 内部创建的对象，用来统计信息，排查资源泄漏的问题
  */
@@ -67,6 +68,6 @@ export declare abstract class RendererInternal implements ResourceInternal {
        */
     abstract getErrors(): string[];
     abstract resize(width: number, height: number): void;
-    abstract createImageBitmap(data: ArrayBuffer | string, //图片文件的数据
+    abstract createImageBitmap(data: TypedArray | string, //图片文件的数据
     options: ImageBitmapConstructor, callback: ImageBitmapCallback): void;
 }

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

@@ -1,18 +1,15 @@
-import type { TextureFormatOptions, TextureConfigOptionsBase } from '../Texture';
+import type { TextureFormatOptions, TextureConfigOptionsBase, ImageData } from '../Texture';
 import type { ResourceInternal } from './ResourceInternal';
-import type { TypedArray } from '../type';
 import type { ImageBitmapInternal } from './ImageBitmapInternal';
 export interface TextureInternalOptions extends TextureFormatOptions, Omit<TextureConfigOptionsBase, 'keepImageSource'> {
     target: WebGLRenderingContext['TEXTURE_CUBE_MAP'] | WebGLRenderingContext['TEXTURE_2D'];
-    noMipmap?: boolean;
+    mipmapCount?: number;
 }
 export interface TextureInternalConstructOptions extends TextureInternalOptions {
     width: number;
     height: number;
-    image?: ImageBitmapInternal;
-    cubeImages?: Array<TextureInternalCubeImages>;
 }
-export type TextureInternalCubeImages<T extends ImageBitmapInternal | TypedArray = ImageBitmapInternal> = [
+export type TextureInternalCubeImages<T extends ImageBitmapInternal | ImageData = ImageBitmapInternal> = [
     positiveX: T,
     nagtiveX: T,
     positiveY: T,
@@ -32,7 +29,7 @@ export declare abstract class TextureInternal implements ResourceInternal {
     /**
        * 上传cubeImage解码后的数据
        */
-    abstract updateCubeImagesData(images: TextureInternalCubeImages<TypedArray>, mipmapLevel?: number): void;
+    abstract updateCubeImagesData(images: TextureInternalCubeImages<ImageData>, mipmapLevel?: number): void;
     /**
        * 上传cubeImage
        */
@@ -40,11 +37,11 @@ export declare abstract class TextureInternal implements ResourceInternal {
     /**
        * 上传整张解码后图片数据,数据尺寸必须和Texture尺寸定义相同
        */
-    abstract update2DImageData(data: TypedArray, mipmapLevel?: number): void;
+    abstract update2DImageData(data: ImageData, mipmapLevel?: number): void;
     /**
        * 上传压缩纹理数据
        */
-    abstract update2DCompressedImage(data: TypedArray, mipmapLevel?: number): void;
+    abstract update2DCompressedImage(data: ImageData, mipmapLevel?: number): void;
     /**
        * imageBitmap的尺寸也必须和Texture相同
        * @param image

package/package.json

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

package/types/Texture.ts

@@ -112,13 +112,19 @@ export declare class Texture implements IGPUResource {
 
 type ImageSource = ImageBitmap | HTMLImageElement | HTMLCanvasElement;
 
+export interface ImageData {
+  data: TypedArray,
+  width: number,
+  height: number,
+}
+
 export type TextureSourceCubeData = [
-  TEXTURE_CUBE_MAP_POSITIVE_X: ImageSource | { data: TypedArray, width: number, height: number },
-  TEXTURE_CUBE_MAP_NEGATIVE_X: ImageSource | { data: TypedArray, width: number, height: number },
-  TEXTURE_CUBE_MAP_POSITIVE_Y: ImageSource | { data: TypedArray, width: number, height: number },
-  TEXTURE_CUBE_MAP_NEGATIVE_Y: ImageSource | { data: TypedArray, width: number, height: number },
-  TEXTURE_CUBE_MAP_POSITIVE_Z: ImageSource | { data: TypedArray, width: number, height: number },
-  TEXTURE_CUBE_MAP_NEGATIVE_Z: ImageSource | { data: TypedArray, width: number, height: number }
+  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
@@ -128,12 +134,12 @@ export type TextureSourceCubeData = [
 export type TextureSourceOptions = Texture2DSourceOptions | TextureCubeSourceOptions;
 
 export interface Texture2DSourceOptionsNone extends TextureOptionsBase {
-  sourceType?: TextureSourceType.none,
+  sourceType: TextureSourceType.none,
   target?: GLenum,
 }
 
 export interface Texture2DSourceOptionsImage extends TextureOptionsBase {
-  sourceType?: TextureSourceType.image,
+  sourceType: TextureSourceType.image,
   image: ImageSource,
   target?: WebGLRenderingContext['TEXTURE_2D'],
   generateMipmap?: boolean,
@@ -146,26 +152,26 @@ export interface Texture2DSourceOptionsFrameBuffer extends TextureOptionsBase {
 }
 
 export interface Texture2DSourceOptionsData extends TextureOptionsBase {
-  sourceType?: TextureSourceType.data,
+  sourceType: TextureSourceType.data,
   data: { data: TypedArray, width: number, height: number },
   target?: WebGLRenderingContext['TEXTURE_2D'],
 }
 
 export interface Texture2DSourceOptionsVideo extends TextureOptionsBase {
-  sourceType?: TextureSourceType.video,
+  sourceType: TextureSourceType.video,
   video: HTMLVideoElement,
   target?: WebGLRenderingContext['TEXTURE_2D'],
   generateMipmap?: boolean,
 }
 
 export interface Texture2DSourceOptionsImageMipmaps extends TextureOptionsBase {
-  sourceType?: TextureSourceType.mipmaps,
+  sourceType: TextureSourceType.mipmaps,
   mipmaps: Array<ImageSource | { data: TypedArray, width: number, height: number }>,
   target?: WebGLRenderingContext['TEXTURE_2D'],
 }
 
 export interface Texture2DSourceOptionsCompressed extends TextureOptionsBase {
-  sourceType?: TextureSourceType.compressed,
+  sourceType: TextureSourceType.compressed,
   mipmaps: Array<{ data: TypedArray, width: number, height: number }>,
   target?: WebGLRenderingContext['TEXTURE_2D'],
 }
@@ -178,7 +184,7 @@ export interface TextureCubeSourceOptionsImage extends TextureOptionsBase {
 }
 
 export interface TextureCubeSourceOptionsImageMipmaps extends TextureOptionsBase {
-  sourceType?: TextureSourceType.mipmaps,
+  sourceType: TextureSourceType.mipmaps,
   mipmaps: Array<TextureSourceCubeData>,
   target: WebGLRenderingContext['TEXTURE_CUBE_MAP'],
 }
@@ -216,7 +222,7 @@ export interface TextureFormatOptions {
 }
 
 export interface TextureOptionsBase extends TextureConfigOptions, TextureFormatOptions {
-  sourceType?: TextureSourceType,
+  sourceType: TextureSourceType,
 }
 
 export type TextureCubeSourceOptions = TextureCubeSourceOptionsImage | TextureCubeSourceOptionsImageMipmaps;

package/types/native/AndGLContext.ts

@@ -1,4 +1,15 @@
 import type { MaterialInternal } from './MaterialInternal';
+import type { vec2 } from '../type';
+import type { TextureInternal } from './TextureInternal';
+import type { RenderPassInternal } from './RenderPassInternal';
+
+export interface TextureGpuInfo {
+  format: number,
+  type: number,
+  target: number,
+  mipmaps: vec2[],
+  handle: number,
+}
 
 export abstract class AndGLContext {
   abstract isEnabled (param: GLenum): boolean;
@@ -31,4 +42,10 @@ export abstract class AndGLContext {
    * 为了Android 测试，会主动调用设置状态到GPU, IOS 暂不调用
    */
   abstract setupStates (mtl: MaterialInternal): void;
+
+  abstract getTextureGpuInfo (texture: TextureInternal): TextureGpuInfo;
+
+  abstract getTexParameter (target: GLenum, pname: GLenum): number;
+
+  abstract bindRenderPass (renderPass: RenderPassInternal): void;
 }

package/types/native/ImageBitmapInternal.ts

@@ -1,6 +1,4 @@
 export interface ImageBitmapConstructor {
-  resizeWidth?: number,
-  resizeHeight?: number,
 }
 
 export abstract class ImageBitmapInternal {

package/types/native/PredyNativeInternal.ts

@@ -1,10 +1,7 @@
 import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapInternal';
+import type { TypedArray } from '../type';
 
 export declare abstract class PredyNativeInternal {
-  abstract createImageBitmap (data: ArrayBuffer | string, //图片文件的数据
+  abstract createImageBitmap (data: TypedArray | string, //图片文件的数据
     options: ImageBitmapConstructor, callback: ImageBitmapCallback): void;
 }
-// 给全局global 添加  predyNative: PredyNativeInternal
-declare global {
-  let predyNative: PredyNativeInternal;
-}

package/types/native/RendererInternal.ts

@@ -11,6 +11,7 @@ import type { GPUCapability } from '../GPUCapability';
 import type { TextureInternal, TextureInternalConstructOptions } from './TextureInternal';
 import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapInternal';
 import type { AndGLContext } from './AndGLContext';
+import type { TypedArray } from '../type';
 
 /**
  * renderer 内部创建的对象，用来统计信息，排查资源泄漏的问题
@@ -91,7 +92,7 @@ export abstract class RendererInternal implements ResourceInternal {
   abstract resize (width: number, height: number): void;
 
   abstract createImageBitmap (
-    data: ArrayBuffer | string, //图片文件的数据
+    data: TypedArray | string, //图片文件的数据
     options: ImageBitmapConstructor,
     callback: ImageBitmapCallback
   ): void;

package/types/native/TextureInternal.ts

@@ -1,22 +1,18 @@
-import type { TextureFormatOptions, TextureConfigOptionsBase } from '../Texture';
+import type { TextureFormatOptions, TextureConfigOptionsBase, ImageData } from '../Texture';
 import type { ResourceInternal } from './ResourceInternal';
-import type { TypedArray } from '../type';
 import type { ImageBitmapInternal } from './ImageBitmapInternal';
 
 export interface TextureInternalOptions extends TextureFormatOptions, Omit<TextureConfigOptionsBase, 'keepImageSource'> {
   target: WebGLRenderingContext['TEXTURE_CUBE_MAP'] | WebGLRenderingContext['TEXTURE_2D'],
-  noMipmap?: boolean,
+  mipmapCount?: number,
 }
 
 export interface TextureInternalConstructOptions extends TextureInternalOptions {
   width: number,
   height: number,
-  image?: ImageBitmapInternal,
-  //mipmap cube images
-  cubeImages?: Array<TextureInternalCubeImages>,
 }
 
-export type TextureInternalCubeImages<T extends ImageBitmapInternal | TypedArray = ImageBitmapInternal> = [
+export type TextureInternalCubeImages<T extends ImageBitmapInternal | ImageData = ImageBitmapInternal> = [
     positiveX: T,
     nagtiveX: T,
     positiveY: T,
@@ -46,7 +42,7 @@ export abstract class TextureInternal implements ResourceInternal {
   /**
      * 上传cubeImage解码后的数据
      */
-  abstract updateCubeImagesData (images: TextureInternalCubeImages<TypedArray>, mipmapLevel?: number): void;
+  abstract updateCubeImagesData (images: TextureInternalCubeImages<ImageData>, mipmapLevel?: number): void;
 
   /**
      * 上传cubeImage
@@ -56,13 +52,13 @@ export abstract class TextureInternal implements ResourceInternal {
   /**
      * 上传整张解码后图片数据,数据尺寸必须和Texture尺寸定义相同
      */
-  abstract update2DImageData (data: TypedArray, mipmapLevel?: number): void;
+  abstract update2DImageData (data: ImageData, mipmapLevel?: number): void;
 
   /**
      * 上传压缩纹理数据
      */
 
-  abstract update2DCompressedImage (data: TypedArray, mipmapLevel?: number): void;
+  abstract update2DCompressedImage (data: ImageData, mipmapLevel?: number): void;
 
   /**
      * imageBitmap的尺寸也必须和Texture相同

package/types/native/declare.d.ts

@@ -0,0 +1,5 @@
+// 给全局global 添加  predyNative: PredyNativeInternal
+import { PredyNativeInternal } from './PredyNativeInternal';
+declare global {
+  let predyNative: PredyNativeInternal;
+}