@galacean/effects-webgl 2.0.0-alpha.9 → 2.0.0-beta.1

package/dist/gl-context-manager.d.ts

@@ -1,13 +1,13 @@
-import type { LostHandler, RestoreHandler } from '@galacean/effects-core';
+import type { GLType, LostHandler, RestoreHandler } from '@galacean/effects-core';
 export declare class GLContextManager {
     canvas: HTMLCanvasElement | OffscreenCanvas | null;
-    readonly glType: 'webgl' | 'webgl2';
+    readonly glType: GLType;
     gl: WebGLRenderingContext | WebGL2RenderingContext | null;
     private readonly contextLostListener;
     private readonly contextRestoredListener;
     private readonly restoreHandlers;
     private readonly lostHandlers;
-    constructor(canvas: HTMLCanvasElement | OffscreenCanvas | null, glType?: 'webgl' | 'webgl2', options?: WebGLContextAttributes);
+    constructor(canvas: HTMLCanvasElement | OffscreenCanvas | null, glType?: GLType, options?: WebGLContextAttributes);
     dispose(): void;
     addLostHandler(lostHandler: LostHandler): void;
     removeLostHandler(lostHandler: LostHandler): void;

package/dist/{gl-frame-buffer.d.ts → gl-framebuffer.d.ts}

@@ -1,12 +1,12 @@
-import type { Disposable, FrameBufferProps, RenderBuffer, Renderer, Texture } from '@galacean/effects-core';
-import { FrameBuffer, RenderPassDestroyAttachmentType } from '@galacean/effects-core';
-import { GLRenderBuffer } from './gl-render-buffer';
+import type { Disposable, FramebufferProps, Renderbuffer, Renderer, Texture } from '@galacean/effects-core';
+import { Framebuffer, RenderPassDestroyAttachmentType } from '@galacean/effects-core';
+import { GLRenderbuffer } from './gl-renderbuffer';
 import type { GLRenderer } from './gl-renderer';
 import { GLTexture } from './gl-texture';
 import type { GLEngine } from './gl-engine';
-export declare class GLFrameBuffer extends FrameBuffer implements Disposable {
+export declare class GLFramebuffer extends Framebuffer implements Disposable {
     storeInvalidAttachments?: GLenum[];
-    depthStencilRenderBuffer?: GLRenderBuffer;
+    depthStencilRenderbuffer?: GLRenderbuffer;
     depthTexture?: GLTexture;
     stencilTexture?: GLTexture;
     colorTextures: GLTexture[];
@@ -14,9 +14,9 @@ export declare class GLFrameBuffer extends FrameBuffer implements Disposable {
     engine: GLEngine;
     readonly renderer: GLRenderer;
     private readonly attachmentTextures;
-    constructor(props: FrameBufferProps, renderer: Renderer);
-    get stencilStorage(): RenderBuffer | undefined;
-    get depthStorage(): RenderBuffer | undefined;
+    constructor(props: FramebufferProps, renderer: Renderer);
+    get stencilStorage(): Renderbuffer | undefined;
+    get depthStorage(): Renderbuffer | undefined;
     getDepthTexture(): Texture | undefined;
     getStencilTexture(): Texture | undefined;
     getColorTextures(): Texture[];
@@ -27,7 +27,7 @@ export declare class GLFrameBuffer extends FrameBuffer implements Disposable {
     bind(): void;
     resetColorTextures(colorTextures?: Texture[]): void;
     resize(x: number, y: number, width: number, height: number): void;
-    dispose(opt?: {
+    dispose(options?: {
         depthStencilAttachment?: RenderPassDestroyAttachmentType;
     }): void;
 }

package/dist/gl-geometry.d.ts

@@ -1,5 +1,5 @@
-import type { Engine, GeometryData, GeometryProps, spec } from '@galacean/effects-core';
-import { Geometry } from '@galacean/effects-core';
+import type { Engine, GeometryProps, SkinProps } from '@galacean/effects-core';
+import { spec, Geometry } from '@galacean/effects-core';
 import type { GLGPUBufferProps } from './gl-gpu-buffer';
 import { GLGPUBuffer } from './gl-gpu-buffer';
 import type { GLPipelineContext } from './gl-pipeline-context';
@@ -29,6 +29,7 @@ export declare class GLGeometry extends Geometry {
     buffers: Record<string, GLGPUBuffer>;
     indices?: spec.TypedArray;
     readonly vaos: Record<string, GLVertexArrayObject | undefined>;
+    skin: SkinProps;
     protected initialized: boolean;
     private options?;
     private attributesReleasable;
@@ -70,10 +71,14 @@ export declare class GLGeometry extends Geometry {
     getDrawStart(): number;
     setDrawCount(count: number): void;
     getDrawCount(): number;
+    getSkinProps(): SkinProps;
     private getAttributeBufferOption;
     createIndicesBuffer(pipelineContext: GLPipelineContext, data: spec.TypedArray): GLGPUBuffer;
     flush(): void;
     private processProps;
-    fromData(data: GeometryData): void;
+    fromData(data: spec.GeometryData): void;
     dispose(): void;
+    private createVertexTypedArray;
+    private createIndexTypedArray;
+    private hasSemantic;
 }

package/dist/gl-material.d.ts

@@ -1,7 +1,6 @@
 import type { Engine, GlobalUniforms, MaterialDestroyOptions, MaterialProps, MaterialStates, Renderer, Texture, UndefinedAble } from '@galacean/effects-core';
 import { spec, Material, math } from '@galacean/effects-core';
 import type { GLPipelineContext } from './gl-pipeline-context';
-import type { GLShaderVariant } from './gl-shader';
 type Color = math.Color;
 type Vector2 = math.Vector2;
 type Vector3 = math.Vector3;
@@ -11,7 +10,6 @@ type Matrix4 = math.Matrix4;
 type Quaternion = math.Quaternion;
 declare const Vector4: typeof math.Vector4, Matrix4: typeof math.Matrix4;
 export declare class GLMaterial extends Material {
-    shaderVariant: GLShaderVariant;
     private floats;
     private ints;
     private vector2s;
@@ -29,7 +27,6 @@ export declare class GLMaterial extends Material {
     private uniforms;
     private uniformDirtyFlag;
     private macrosDirtyFlag;
-    private readonly macros;
     private glMaterialState;
     constructor(engine: Engine, props?: MaterialProps);
     get blending(): UndefinedAble<boolean>;
@@ -83,6 +80,7 @@ export declare class GLMaterial extends Material {
     get isDestroyed(): boolean;
     /**shader和texture的GPU资源初始化。 */
     initialize(): void;
+    createShaderVariant(): void;
     setupStates(pipelineContext: GLPipelineContext): void;
     use(renderer: Renderer, globalUniforms?: GlobalUniforms): void;
     getFloat(name: string): number | null;

package/dist/gl-pipeline-context.d.ts

@@ -1,4 +1,4 @@
-import type { Disposable, Texture, math } from '@galacean/effects-core';
+import type { Disposable, Nullable, Texture, math } from '@galacean/effects-core';
 import { GLShaderLibrary } from './gl-shader-library';
 import type { GLEngine } from './gl-engine';
 type Color = math.Color;
@@ -8,7 +8,6 @@ type Vector4 = math.Vector4;
 type Matrix3 = math.Matrix3;
 type Matrix4 = math.Matrix4;
 type Quaternion = math.Quaternion;
-export type Nullable<T> = T | null;
 export declare class GLPipelineContext implements Disposable {
     engine: GLEngine;
     gl: WebGLRenderingContext | WebGL2RenderingContext;
@@ -18,7 +17,7 @@ export declare class GLPipelineContext implements Disposable {
     private glCapabilityCache;
     private currentFramebuffer;
     private currentTextureBinding;
-    private currentRenderBuffer;
+    private currentRenderbuffer;
     private activeTextureIndex;
     private pixelStorei;
     constructor(engine: GLEngine, gl: WebGLRenderingContext | WebGL2RenderingContext);
@@ -48,7 +47,7 @@ export declare class GLPipelineContext implements Disposable {
      * gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer);
      */
     bindFramebuffer(target: GLenum, framebuffer: WebGLFramebuffer | null): void;
-    bindRenderBuffer(target: GLenum, renderBuffer: WebGLRenderbuffer | null): void;
+    bindRenderbuffer(target: GLenum, renderbuffer: WebGLRenderbuffer | null): void;
     /**
      * 绑定系统 framebuffer
      */

package/dist/gl-program.d.ts

@@ -20,13 +20,11 @@ export interface ProgramUniformInfo {
 export declare class GLProgram implements Disposable {
     engine: GLEngine;
     readonly program: WebGLProgram;
-    private readonly shared;
     private readonly id;
     private readonly uniformBlockMap;
     private attribInfoMap;
-    private uniformInfoMap;
     private pipelineContext;
-    constructor(engine: GLEngine, program: WebGLProgram, shared: boolean, id: string);
+    constructor(engine: GLEngine, program: WebGLProgram, id: string);
     bind(): void;
     /**
      * 绑定 vao 对象并设置顶点属性
@@ -34,7 +32,7 @@ export declare class GLProgram implements Disposable {
      * @param geometry
      * @returns
      */
-    setupAttributes(geometry: GLGeometry): GLVertexArrayObject;
+    setupAttributes(geometry: GLGeometry): GLVertexArrayObject | undefined;
     createAttribMap(): Record<string, ProgramAttributeInfo>;
     dispose(): void;
 }

package/dist/{gl-render-buffer.d.ts → gl-renderbuffer.d.ts}

@@ -1,11 +1,11 @@
-import type { RenderBufferProps } from '@galacean/effects-core';
-import { RenderBuffer } from '@galacean/effects-core';
+import type { RenderbufferProps } from '@galacean/effects-core';
+import { Renderbuffer } from '@galacean/effects-core';
 import type { GLRendererInternal } from './gl-renderer-internal';
-export declare class GLRenderBuffer extends RenderBuffer {
+export declare class GLRenderbuffer extends Renderbuffer {
     buffer: WebGLRenderbuffer | null;
     private initialized;
     private renderer?;
-    constructor(props: RenderBufferProps, renderer?: GLRendererInternal);
+    constructor(props: RenderbufferProps, renderer?: GLRendererInternal);
     initialize(renderer: GLRendererInternal): void;
     setSize(width: number, height: number): void;
     dispose(): void;

package/dist/gl-renderer-internal.d.ts

@@ -1,8 +1,8 @@
 import type { Disposable, LostHandler, Material, Geometry } from '@galacean/effects-core';
-import type { GLFrameBuffer } from './gl-frame-buffer';
+import type { GLFramebuffer } from './gl-framebuffer';
 import type { GLGPUBuffer } from './gl-gpu-buffer';
 import type { GLPipelineContext } from './gl-pipeline-context';
-import type { GLRenderBuffer } from './gl-render-buffer';
+import type { GLRenderbuffer } from './gl-renderbuffer';
 import { GLTexture } from './gl-texture';
 import { GLVertexArrayObject } from './gl-vertex-array-object';
 import type { GLEngine } from './gl-engine';
@@ -14,8 +14,8 @@ export declare class GLRendererInternal implements Disposable, LostHandler {
     gl: WebGLRenderingContext | WebGL2RenderingContext;
     readonly name: string;
     readonly textures: GLTexture[];
-    private readonly renderBuffers;
-    private readonly frameBuffers;
+    private readonly renderbuffers;
+    private readonly framebuffers;
     private sourceFbo;
     private targetFbo;
     private destroyed;
@@ -25,19 +25,19 @@ export declare class GLRendererInternal implements Disposable, LostHandler {
     get canvas(): HTMLCanvasElement | OffscreenCanvas;
     get isDestroyed(): boolean;
     copy2(source: GLTexture, target: GLTexture): void;
-    resetColorAttachments(rp: GLFrameBuffer, colors: GLTexture[]): void;
-    createGLRenderBuffer(renderbuffer: GLRenderBuffer): WebGLRenderbuffer | null;
+    resetColorAttachments(rp: GLFramebuffer, colors: GLTexture[]): void;
+    createGLRenderbuffer(renderbuffer: GLRenderbuffer): WebGLRenderbuffer | null;
     resize(width: number, height: number): void;
-    drawGeometry(geometry: Geometry, material: Material): void;
-    createGLFrameBuffer(frameBuffer: GLFrameBuffer, name?: string): WebGLFramebuffer | null;
+    drawGeometry(geometry: Geometry, material: Material, subMeshIndex: number): void;
+    createGLFramebuffer(framebuffer: GLFramebuffer, name?: string): WebGLFramebuffer | null;
     /**创建包裹VAO对象。 */
-    createVAO(name: string): GLVertexArrayObject | undefined;
+    createVAO(name?: string): GLVertexArrayObject | undefined;
     deleteGLTexture(texture: GLTexture): void;
     deleteGPUBuffer(buffer: GLGPUBuffer | null): void;
-    deleteGLFrameBuffer(frameBuffer: GLFrameBuffer): void;
-    deleteGLRenderBuffer(renderbuffer: GLRenderBuffer): void;
+    deleteGLFramebuffer(framebuffer: GLFramebuffer): void;
+    deleteGLRenderbuffer(renderbuffer: GLRenderbuffer): void;
     private deleteResource;
     lost(e: Event): void;
-    dispose(haltGL?: boolean): void;
+    dispose(): void;
 }
-export declare function assignInspectorName(obj: Record<string, any>, name?: string, id?: string): void;
+export declare function assignInspectorName(obj: Record<string, any> | null, name?: string, id?: string): void;

package/dist/gl-renderer.d.ts

@@ -1,19 +1,20 @@
-import type { Disposable, FrameBuffer, Geometry, LostHandler, Material, RenderFrame, RenderPass, RenderPassClearAction, RenderPassStoreAction, RendererComponent, RestoreHandler, ShaderLibrary } from '@galacean/effects-core';
+import type { Disposable, Framebuffer, GLType, Geometry, LostHandler, Material, RenderFrame, RenderPass, RenderPassClearAction, RenderPassStoreAction, RendererComponent, RestoreHandler, ShaderLibrary } from '@galacean/effects-core';
 import { FilterMode, RenderTextureFormat, Renderer, math } from '@galacean/effects-core';
 import { ExtWrap } from './ext-wrap';
 import { GLContextManager } from './gl-context-manager';
 import { GLPipelineContext } from './gl-pipeline-context';
 import { GLRendererInternal } from './gl-renderer-internal';
 type Matrix4 = math.Matrix4;
+type Vector4 = math.Vector4;
 export declare class GLRenderer extends Renderer implements Disposable {
     readonly canvas: HTMLCanvasElement | OffscreenCanvas;
     glRenderer: GLRendererInternal;
     extension: ExtWrap;
-    frameBuffer: FrameBuffer;
-    temporaryRTs: Record<string, FrameBuffer>;
+    framebuffer: Framebuffer;
+    temporaryRTs: Record<string, Framebuffer>;
     pipelineContext: GLPipelineContext;
     readonly context: GLContextManager;
-    constructor(canvas: HTMLCanvasElement | OffscreenCanvas, framework: 'webgl' | 'webgl2', renderOptions?: WebGLContextAttributes);
+    constructor(canvas: HTMLCanvasElement | OffscreenCanvas, framework: GLType, renderOptions?: WebGLContextAttributes);
     get isDestroyed(): boolean;
     get height(): number;
     get width(): number;
@@ -21,12 +22,14 @@ export declare class GLRenderer extends Renderer implements Disposable {
     renderRenderPass(pass: RenderPass): void;
     renderMeshes(meshes: RendererComponent[]): void;
     setGlobalFloat(name: string, value: number): void;
+    setGlobalVector4(name: string, value: Vector4): void;
+    getGlobalVector4(name: string): Vector4;
     setGlobalInt(name: string, value: number): void;
     setGlobalMatrix(name: string, value: Matrix4): void;
-    drawGeometry(geometry: Geometry, material: Material): void;
-    setFrameBuffer(frameBuffer: FrameBuffer | null): void;
-    getFrameBuffer(): FrameBuffer | null;
-    getTemporaryRT(name: string, width: number, height: number, depthBuffer: number, filter: FilterMode, format: RenderTextureFormat): FrameBuffer | null;
+    drawGeometry(geometry: Geometry, material: Material, subMeshIndex?: number): void;
+    setFramebuffer(framebuffer: Framebuffer | null): void;
+    getFramebuffer(): Framebuffer;
+    getTemporaryRT(name: string, width: number, height: number, depthBuffer: number, filter: FilterMode, format: RenderTextureFormat): Framebuffer;
     setViewport(x: number, y: number, width: number, height: number): void;
     clear(action: RenderPassStoreAction | RenderPassClearAction): void;
     addLostHandler(lostHandler: LostHandler): void;
@@ -34,7 +37,7 @@ export declare class GLRenderer extends Renderer implements Disposable {
     getShaderLibrary(): ShaderLibrary | undefined;
     getWidth(): number;
     getHeight(): number;
-    dispose(haltGL?: boolean): void;
+    dispose(): void;
     lost(e: Event): void;
     restore(): void;
     resize(width: number, height: number): void;

package/dist/gl-shader-library.d.ts

@@ -1,4 +1,4 @@
-import type { Disposable, RestoreHandler, ShaderCompileResult, ShaderLibrary, ShaderMarcos, ShaderWithSource } from '@galacean/effects-core';
+import type { Disposable, RestoreHandler, ShaderCompileResult, ShaderLibrary, ShaderMacros, ShaderWithSource } from '@galacean/effects-core';
 import { GLShaderVariant } from './gl-shader';
 import type { GLPipelineContext } from './gl-pipeline-context';
 import type { GLEngine } from './gl-engine';
@@ -14,8 +14,8 @@ export declare class GLShaderLibrary implements ShaderLibrary, Disposable, Resto
     private cachedShaders;
     constructor(engine: GLEngine, pipelineContext: GLPipelineContext);
     compileAllShaders(asyncCallback?: (results: ShaderCompileResult[]) => void): void;
-    addShader(shaderSource: ShaderWithSource, macros?: ShaderMarcos): string;
-    createShader(shaderSource: ShaderWithSource, macros?: ShaderMarcos): GLShaderVariant;
+    addShader(shaderSource: ShaderWithSource, macros?: ShaderMacros): string;
+    createShader(shaderSource: ShaderWithSource, macros?: ShaderMacros): GLShaderVariant;
     compileShader(shader: GLShaderVariant, asyncCallback?: (result: ShaderCompileResult) => void): void;
     private computeShaderCacheId;
     private createProgram;

package/dist/gl-shader.d.ts

@@ -18,7 +18,7 @@ export declare class GLShaderVariant extends ShaderVariant {
     uniformLocations: Record<string, WebGLUniformLocation | null>;
     private samplerChannels;
     constructor(engine: Engine, source: ShaderWithSource);
-    initialize(engine: Engine): void;
+    initialize(): void;
     setFloat(name: string, value: number): void;
     setInt(name: string, value: number): void;
     setFloats(name: string, value: number[]): void;

package/dist/gl-texture.d.ts

@@ -6,9 +6,13 @@ export declare class GLTexture extends Texture implements Disposable, RestoreHan
     private pipelineContext;
     private initialized;
     constructor(engine: Engine, source?: TextureSourceOptions);
-    /** 绑定当前Texture对象。*/
+    /**
+     * 绑定当前 Texture 对象
+     */
     bind(force?: boolean): void;
-    /** 初始化Texture的GPU资源。*/
+    /**
+     * 初始化 Texture 的 GPU 资源
+     */
     initialize(): void;
     clone(): GLTexture;
     release(): void;

package/dist/gl-vertex-array-object.d.ts

@@ -1,7 +1,6 @@
 import type { Disposable } from '@galacean/effects-core';
 import type { GLEngine } from './gl-engine';
 export declare class GLVertexArrayObject implements Disposable {
-    private engine;
     ready: boolean;
     disposed: boolean;
     readonly vao: WebGLVertexArrayObject | null;

package/dist/index.d.ts

@@ -2,11 +2,12 @@ export * from './gl-geometry';
 export * from './gl-renderer';
 export * from './gl-material';
 export * from './gl-renderer-internal';
-export * from './gl-render-buffer';
+export * from './gl-renderbuffer';
 export * from './gl-texture';
-export * from './gl-frame-buffer';
+export * from './gl-framebuffer';
 export * from './gl-gpu-buffer';
 export * from './gl-vertex-array-object';
 export * from './gl-pipeline-context';
 export * from './gl-shader-library';
 export * from './gl-engine';
+export * from './gl-shader';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-webgl",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.1",
   "description": "Galacean Effects runtime webgl for the web",
   "types": "./dist/index.d.ts",
   "files": [
@@ -38,12 +38,13 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@galacean/effects-core": "2.0.0-alpha.9"
+    "string-hash": "^1.1.3",
+    "@galacean/effects-core": "2.0.0-beta.1"
   },
   "scripts": {
     "prebuild": "pnpm clean",
     "build": "pnpm build:declaration",
     "build:declaration": "tsc -d --emitDeclarationOnly",
-    "clean": "rimraf dist && rimraf '*+(.tsbuildinfo)'"
+    "clean": "rimraf dist && rimraf \"*+(.tsbuildinfo)\""
   }
 }