@galacean/effects-webgl 2.7.4 → 2.8.0-alpha.0

package/dist/gl-engine.d.ts

@@ -1,8 +1,7 @@
-import type { GLRendererInternal } from './gl-renderer-internal';
-import type { GLRenderer } from './gl-renderer';
-import { GLShaderLibrary } from './gl-shader-library';
-import type { Nullable, Texture, math } from '@galacean/effects-core';
+import type { EngineOptions, Nullable, Texture, math } from '@galacean/effects-core';
 import { Engine } from '@galacean/effects-core';
+import { GLShaderLibrary } from './gl-shader-library';
+import { GLContextManager } from './gl-context-manager';
 type Color = math.Color;
 type Vector2 = math.Vector2;
 type Vector3 = math.Vector3;
@@ -11,9 +10,10 @@ type Matrix3 = math.Matrix3;
 type Matrix4 = math.Matrix4;
 type Quaternion = math.Quaternion;
 export declare class GLEngine extends Engine {
-    gl: WebGLRenderingContext | WebGL2RenderingContext;
     textureUnitDict: Record<string, WebGLTexture | null>;
     shaderLibrary: GLShaderLibrary;
+    gl: WebGLRenderingContext | WebGL2RenderingContext;
+    context: GLContextManager;
     private readonly maxTextureCount;
     private glCapabilityCache;
     private currentFramebuffer;
@@ -21,10 +21,9 @@ export declare class GLEngine extends Engine {
     private currentRenderbuffer;
     private activeTextureIndex;
     private pixelStorei;
-    constructor(gl: WebGLRenderingContext | WebGL2RenderingContext);
+    private restoreCompositionsCache;
+    constructor(canvas: HTMLCanvasElement, options?: EngineOptions);
     dispose(): void;
-    getGLRenderer(): GLRenderer;
-    getGLRendererInternal(): GLRendererInternal;
     reset(): void;
     toggle(capability: GLenum, enable?: boolean): void;
     /**

package/dist/gl-renderbuffer.d.ts

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

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

@@ -1,41 +1 @@
-import type { Disposable, LostHandler, Material, Geometry } from '@galacean/effects-core';
-import type { GLFramebuffer } from './gl-framebuffer';
-import type { GLGPUBuffer } from './gl-gpu-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';
-export declare class GLRendererInternal implements Disposable, LostHandler {
-    engine: GLEngine;
-    emptyTexture2D: GLTexture;
-    emptyTextureCube: GLTexture;
-    gl: WebGLRenderingContext | WebGL2RenderingContext;
-    readonly name: string;
-    readonly textures: GLTexture[];
-    private readonly renderbuffers;
-    private readonly framebuffers;
-    private sourceFbo;
-    private targetFbo;
-    private destroyed;
-    constructor(engine: GLEngine);
-    get height(): number;
-    get width(): number;
-    get canvas(): HTMLCanvasElement | OffscreenCanvas;
-    get isDestroyed(): boolean;
-    copy2(source: GLTexture, target: GLTexture): void;
-    resetColorAttachments(rp: GLFramebuffer, colors: GLTexture[]): void;
-    createGLRenderbuffer(renderbuffer: GLRenderbuffer): WebGLRenderbuffer | null;
-    resize(width: number, height: number): void;
-    drawGeometry(geometry: Geometry, material: Material, subMeshIndex: number): void;
-    createGLFramebuffer(framebuffer: GLFramebuffer, name?: string): WebGLFramebuffer | null;
-    /**创建包裹VAO对象。 */
-    createVAO(name?: string): GLVertexArrayObject | undefined;
-    deleteGLTexture(texture: GLTexture): void;
-    deleteGPUBuffer(buffer: GLGPUBuffer | null): void;
-    deleteGLFramebuffer(framebuffer: GLFramebuffer): void;
-    deleteGLRenderbuffer(renderbuffer: GLRenderbuffer): void;
-    private deleteResource;
-    lost(e: Event): void;
-    dispose(): void;
-}
 export declare function assignInspectorName(obj: Record<string, any> | null, name?: string, id?: string): void;

package/dist/gl-renderer.d.ts

@@ -1,22 +1,26 @@
-import type { Disposable, Framebuffer, GLType, Geometry, LostHandler, Material, RenderFrame, RenderPass, RenderPassClearAction, RenderPassStoreAction, RendererComponent, RestoreHandler, ShaderLibrary, math } from '@galacean/effects-core';
+import type { Disposable, Engine, Framebuffer, Geometry, Material, RenderFrame, RenderPass, RenderPassClearAction, RenderPassStoreAction, RendererComponent, ShaderLibrary, math } from '@galacean/effects-core';
 import { FilterMode, RenderTextureFormat, Renderer } from '@galacean/effects-core';
-import { ExtWrap } from './ext-wrap';
-import { GLContextManager } from './gl-context-manager';
-import { GLRendererInternal } from './gl-renderer-internal';
+import { GLFramebuffer } from './gl-framebuffer';
+import { GLTexture } from './gl-texture';
+import type { GLRenderbuffer } from './gl-renderbuffer';
+import { GLVertexArrayObject } from './gl-vertex-array-object';
+import type { GLGPUBuffer } from './gl-gpu-buffer';
 type Matrix4 = math.Matrix4;
 type Vector4 = math.Vector4;
 type Vector3 = math.Vector3;
 export declare class GLRenderer extends Renderer implements Disposable {
-    readonly canvas: HTMLCanvasElement | OffscreenCanvas;
-    glRenderer: GLRendererInternal;
-    extension: ExtWrap;
-    framebuffer: Framebuffer;
     temporaryRTs: Record<string, Framebuffer>;
-    readonly context: GLContextManager;
-    constructor(canvas: HTMLCanvasElement | OffscreenCanvas, framework: GLType, renderOptions?: WebGLContextAttributes);
-    get isDestroyed(): boolean;
+    readonly name: string;
+    private sourceFbo;
+    private targetFbo;
+    private disposed;
+    get gl(): WebGLRenderingContext | WebGL2RenderingContext;
     get height(): number;
     get width(): number;
+    get canvas(): HTMLCanvasElement | OffscreenCanvas;
+    get isDisposed(): boolean;
+    get context(): import("packages/effects-webgl/src/gl-context-manager").GLContextManager;
+    constructor(engine: Engine);
     renderRenderFrame(renderFrame: RenderFrame): void;
     renderRenderPass(pass: RenderPass): void;
     renderMeshes(meshes: RendererComponent[]): void;
@@ -28,12 +32,9 @@ export declare class GLRenderer extends Renderer implements Disposable {
     setGlobalVector3(name: string, value: Vector3): void;
     drawGeometry(geometry: Geometry, matrix: Matrix4, 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;
-    addRestoreHandler(restoreHandler: RestoreHandler): void;
     getShaderLibrary(): ShaderLibrary | undefined;
     getWidth(): number;
     getHeight(): number;
@@ -42,5 +43,15 @@ export declare class GLRenderer extends Renderer implements Disposable {
     restore(): void;
     resize(width: number, height: number): void;
     private checkGlobalUniform;
+    copy2(source: GLTexture, target: GLTexture): void;
+    createGLRenderbuffer(renderbuffer: GLRenderbuffer): WebGLRenderbuffer | null;
+    createGLFramebuffer(name?: string): WebGLFramebuffer | null;
+    /**创建包裹VAO对象。 */
+    createVAO(name?: string): GLVertexArrayObject | undefined;
+    deleteGLTexture(texture: GLTexture): void;
+    deleteGPUBuffer(buffer: GLGPUBuffer | null): void;
+    deleteGLFramebuffer(framebuffer: GLFramebuffer): void;
+    deleteGLRenderbuffer(renderbuffer: GLRenderbuffer): void;
+    private deleteResource;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-webgl",
-  "version": "2.7.4",
+  "version": "2.8.0-alpha.0",
   "description": "Galacean Effects runtime webgl for the web",
   "types": "./dist/index.d.ts",
   "files": [
@@ -38,7 +38,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@galacean/effects-core": "2.7.4"
+    "@galacean/effects-core": "2.8.0-alpha.0"
   },
   "scripts": {
     "prebuild": "pnpm clean",

package/dist/ext-wrap.d.ts

@@ -1,22 +0,0 @@
-import type { Disposable } from '@galacean/effects-core';
-import { RenderPass } from '@galacean/effects-core';
-import type { GLRenderer } from './gl-renderer';
-import type { GLTexture } from './gl-texture';
-/**
- * 常用的 GPU 方法，不是规范必须实现的
- */
-export interface RendererExtensions {
-    copyTexture?: (source: GLTexture, tex: GLTexture) => void;
-    resetColorAttachments?: (rp: RenderPass, colorAttachments: GLTexture[]) => void;
-}
-export declare class ExtWrap implements RendererExtensions, Disposable {
-    readonly renderer: GLRenderer;
-    private copyRenderPass?;
-    constructor(renderer: GLRenderer);
-    resetColorAttachments(rp: RenderPass, colorTextures: GLTexture[]): void;
-    copyTexture(source: GLTexture, tex: GLTexture): void;
-    copy2(source: GLTexture, target: GLTexture): void;
-    copy1(source: GLTexture, target: GLTexture): void;
-    private createCopyRenderPass;
-    dispose(): void;
-}