@predy-js/render-interface 0.1.52-beta.5 → 0.1.52-beta.6

package/dist/statistic.js

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

package/dist/types/Geometry.d.ts

@@ -8,12 +8,11 @@ import type { GPURenderer } from './Renderer';
  * stride:used for interleaved attributes, 2 vec4 stride is 4 * 2 * Float32Array.BYTES_PER_ELEMENTS
  * offset: offset for interleaved attributes, 1 vec4 offset is 4 * Float32Array.BYTES_PER_ELEMENTS
  * normalize: attributed should be normalized
- * location: attribute location
  * Attribute的绑定信息
  * size：向量的大小，vec4｜vec3｜vec2的大小分别为 4｜3｜2
  * stride：如果使用交错存储顶点，2个vec4的stride为 2 * 4 * Float32Array.BYTES_PER_ELEMENTS
  * offset：交错顶点的数据偏移，1个vec4的偏移为 4*Float32Array.BYTES_PER_ELEMENTS
- * location: attribute location 可以通过GL反射获得，Metal必须填写
+ * bufferIndex: 用于metal提交bufferIndex
  */
 export interface AttributeBase {
     size: number;
@@ -21,7 +20,7 @@ export interface AttributeBase {
     offset?: number;
     instanceDivisor?: number;
     normalize?: boolean;
-    location?: number;
+    bufferIndex?: number;
 }
 /**
  * if data provided, type can be inferred from its data

package/dist/types/ShaderLibrary.d.ts

@@ -34,8 +34,8 @@ export interface ShaderCompileResult {
     status: ShaderCompileResultStatus;
     cacheId?: string;
     error?: string | null;
-    compileTime?: number;
     shared?: boolean;
+    compileTime?: number;
 }
 /**
  * @example
@@ -50,10 +50,6 @@ export interface ShaderCompileResult {
 export interface ShaderLibrary {
     readonly cacheIds: string[];
     getShaderResult(cacheId: string): ShaderCompileResult | undefined;
-    /**
-     * 添加shader
-     * @param shader
-     */
     addShader(shader: Shader): string;
     /**
        * @param cacheId

package/dist/types/Texture.d.ts

@@ -203,7 +203,6 @@ export interface TextureFormatOptions {
     type?: GLenum;
 }
 export interface TextureOptionsBase extends TextureConfigOptions, TextureFormatOptions {
-    sourceType?: TextureSourceType;
 }
 export type TextureCubeSourceOptions = TextureCubeSourceOptionsImage | TextureCubeSourceOptionsImageMipmaps;
 export type Texture2DSourceOptions = Texture2DSourceOptionsImage | Texture2DSourceOptionsData | Texture2DSourceOptionsVideo | Texture2DSourceOptionsImageMipmaps | Texture2DSourceOptionsCompressed | Texture2DSourceOptionsFrameBuffer;

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

@@ -5,10 +5,6 @@ export interface DataBlockInternalOptions {
 }
 export declare abstract class DataBlockInternal implements ResourceInternal {
     readonly isDestroyed: boolean;
-    /**
-     * UBO的name，如果没有找到对应的UBO就用setUniform
-     * UBO的Layout只有一种，如果不同shader中使用同名UBO，请创建不同的DataBlock对象
-     */
     readonly name: string;
     protected constructor(options: DataBlockInternalOptions);
     abstract destroy(): void;

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

@@ -1,14 +1,9 @@
 import type { AttributeWithType, GeometryOptions } from '../Geometry';
 import type { ResourceInternal } from './ResourceInternal';
 import type { GPUBufferInternal } from './GPUBufferInternal';
-interface GeometryBufferLayout {
-    index: number;
-    name: string;
-}
 export interface GeometryInternalOptions extends Omit<GeometryOptions, 'attributes' | 'index'> {
     attributes: Record<string, AttributeWithType>;
     buffers: Record<string, GPUBufferInternal>;
-    bufferLayouts: GeometryBufferLayout[];
     indexBuffer?: GPUBufferInternal;
     indexBufferType?: IndexBufferType;
 }
@@ -38,4 +33,3 @@ export declare abstract class GeometryInternal implements ResourceInternal {
        */
     abstract destroy(): void;
 }
-export {};

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

@@ -5,13 +5,14 @@ import type { TextureInternal } from './TextureInternal';
 export interface MaterialInternalOptions {
     states: MaterialRenderStates;
     dataBlocks: DataBlockInternal[];
-    shaderCacheId: string;
+    shaderCacheId?: string;
+    _mtlFrag?: string;
+    _mtlVert?: string;
     name: string;
 }
 export declare abstract class MaterialInternal implements ResourceInternal {
     readonly isDestroyed: boolean;
     readonly name: string;
-    readonly shaderCacheId: string;
     dataBlocks: DataBlockInternal[];
     protected constructor(options: MaterialInternalOptions);
     abstract destroy(): void;

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

@@ -4,6 +4,7 @@ import type { RenderPassClearAction, RenderPassStoreAction } from '../RenderPass
 import type { TextureInternal } from './TextureInternal';
 import type { RenderPassStorageObject } from '../RenderPass';
 import type { RenderPassAttachmentStorageType } from '../RenderPass';
+import type { Mesh } from '../Mesh';
 export interface RenderPassColorAttachmentInternal {
     readonly storageType: RenderPassAttachmentStorageType.color;
     readonly texture: TextureInternal;
@@ -28,12 +29,12 @@ export interface RenderPassDepthStencilAttachmentOptionsInternal {
 }
 export interface RenderPassOptionsInternal {
     clearAction: RenderPassClearAction;
+    storeAction: RenderPassStoreAction;
     attachments: RenderPassColorAttachmentInternal[];
+    depthStencilAttachment: RenderPassDepthStencilAttachmentOptionsInternal;
     name: string;
-    meshes: MeshInternal[];
-    multiSample?: number;
-    storeAction?: RenderPassStoreAction;
-    depthStencilAttachment?: RenderPassDepthStencilAttachmentOptionsInternal;
+    meshes: Mesh[];
+    multiSample: number;
     viewport?: [x: number, y: number, width: number, height: number];
 }
 export declare abstract class RenderPassInternal implements ResourceInternal {

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

@@ -16,12 +16,6 @@ import type { ImageBitmapCallback, ImageBitmapConstructor } from './ImageBitmapI
 export interface InternalResInfo {
     buffer: number;
     geometry: number;
-    material: number;
-    texture: number;
-    dataBlock: number;
-    mesh: number;
-    renderPass: number;
-    frame: number;
 }
 export declare abstract class RendererInternal implements ResourceInternal {
     readonly isDestroyed: boolean;

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

@@ -4,29 +4,22 @@ 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'];
-}
-export interface TextureInternalConstructOptions extends TextureInternalOptions {
     width: number;
     height: number;
-    image?: ImageBitmapInternal;
 }
 export declare abstract class TextureInternal implements ResourceInternal {
     readonly isDestroyed: boolean;
     readonly width: number;
     readonly height: number;
     readonly name: string;
-    readonly options: TextureInternalOptions;
+    readonly options: Omit<TextureInternalOptions, 'cube' | 'image'>;
     protected constructor(options: TextureInternalOptions);
-    abstract resize(width: number, height: number): boolean;
+    abstract reset(options: TextureInternalOptions): boolean;
     abstract destroy(): void;
     /**
-     * 上传整张解码后图片数据,数据尺寸必须和Texture尺寸定义相同
-     */
-    abstract update2DImageData(data: TypedArray, mipmapLevel?: number): void;
-    /**
-     * 上传压缩纹理数据
+     * 上传整张图片数据,数据尺寸必须和Texture尺寸定义相同
      */
-    abstract update2DCompressedImage(data: TypedArray, mipmapLevel?: number): void;
+    abstract update2DData(data: TypedArray, mipmapLevel?: number): void;
     /**
      * imageBitmap的尺寸也必须和Texture相同
      * @param image

package/package.json

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