@galacean/effects-webgl 1.2.0 → 2.0.0-alpha.0

package/dist/gl-geometry.d.ts

@@ -1,4 +1,4 @@
-import type { Disposable, GeometryProps, spec, Engine } from '@galacean/effects-core';
+import type { Engine, GeometryData, GeometryProps, spec } from '@galacean/effects-core';
 import { Geometry } from '@galacean/effects-core';
 import type { GLGPUBufferProps } from './gl-gpu-buffer';
 import { GLGPUBuffer } from './gl-gpu-buffer';
@@ -7,7 +7,7 @@ import type { GLVertexArrayObject } from './gl-vertex-array-object';
 /**
  * 应用层 Geometry 对象，本身不直接保存 GPU 资源而是通过 geometryInternal 成员保存 GPU 资源
  */
-export declare class GLGeometry extends Geometry implements Disposable {
+export declare class GLGeometry extends Geometry {
     /**
      * 索引缓冲区
      */
@@ -36,8 +36,7 @@ export declare class GLGeometry extends Geometry implements Disposable {
     private dirtyFlags;
     private attributesName;
     private destroyed;
-    engine?: Engine;
-    constructor(engine: Engine, props: GeometryProps);
+    constructor(engine: Engine, props?: GeometryProps);
     get isDestroyed(): boolean;
     get isInitialized(): boolean;
     getOptions(): {
@@ -63,7 +62,7 @@ export declare class GLGeometry extends Geometry implements Disposable {
     getAttributeData(name: string): spec.TypedArray | undefined;
     setAttributeSubData(name: string, offset: number, data: spec.TypedArray): void;
     getIndexData(): spec.TypedArray | undefined;
-    setIndexData(data?: spec.TypedArray): void;
+    setIndexData(data: spec.TypedArray): void;
     setIndexSubData(offset: number, data: spec.TypedArray): void;
     getAttributeStride(name: string): number;
     getAttributeNames(): string[];
@@ -74,5 +73,7 @@ export declare class GLGeometry extends Geometry implements Disposable {
     private getAttributeBufferOption;
     createIndicesBuffer(pipelineContext: GLPipelineContext, data: spec.TypedArray): GLGPUBuffer;
     flush(): void;
+    private processProps;
+    fromData(data: GeometryData): void;
     dispose(): void;
 }

package/dist/gl-material.d.ts

@@ -1,9 +1,9 @@
-import type { MaterialDestroyOptions, MaterialProps, MaterialStates, UndefinedAble, Texture, Engine, GlobalUniforms } from '@galacean/effects-core';
+import type { MaterialDestroyOptions, MaterialProps, MaterialStates, UndefinedAble, Texture, GlobalUniforms, Renderer, MaterialData } from '@galacean/effects-core';
 import { Material, math } from '@galacean/effects-core';
 import { GLMaterialState } from './gl-material-state';
 import type { GLPipelineContext } from './gl-pipeline-context';
 import type { GLShader } from './gl-shader';
-import type { GLRenderer } from './gl-renderer';
+type Color = math.Color;
 type Vector2 = math.Vector2;
 type Vector3 = math.Vector3;
 type Vector4 = math.Vector4;
@@ -13,24 +13,23 @@ type Quaternion = math.Quaternion;
 declare const Vector4: typeof math.Vector4, Matrix4: typeof math.Matrix4;
 export declare class GLMaterial extends Material {
     shader: GLShader;
-    floats: Record<string, number>;
-    ints: Record<string, number>;
-    vector2s: Record<string, Vector2>;
-    vector3s: Record<string, Vector3>;
-    vector4s: Record<string, Vector4>;
-    quaternions: Record<string, Quaternion>;
-    matrices: Record<string, Matrix4>;
-    matrice3s: Record<string, Matrix3>;
-    textures: Record<string, Texture>;
-    floatArrays: Record<string, number[]>;
-    vector4Arrays: Record<string, number[]>;
-    matrixArrays: Record<string, number[]>;
+    private floats;
+    private ints;
+    private vector2s;
+    private vector3s;
+    private vector4s;
+    private colors;
+    private quaternions;
+    private matrices;
+    private matrice3s;
+    private textures;
+    private floatArrays;
+    private vector4Arrays;
+    private matrixArrays;
     samplers: string[];
     uniforms: string[];
     uniformDirtyFlag: boolean;
     glMaterialState: GLMaterialState;
-    private engine?;
-    constructor(engine: Engine, props: MaterialProps);
     get blending(): UndefinedAble<boolean>;
     set blending(blending: UndefinedAble<boolean>);
     get blendColor(): UndefinedAble<[r: number, g: number, b: number, a: number]>;
@@ -83,7 +82,7 @@ export declare class GLMaterial extends Material {
     /**shader和texture的GPU资源初始化。 */
     initialize(): void;
     setupStates(pipelineContext: GLPipelineContext): void;
-    use(renderer: GLRenderer, globalUniforms?: GlobalUniforms): void;
+    use(renderer: Renderer, globalUniforms?: GlobalUniforms): void;
     getFloat(name: string): number | null;
     setFloat(name: string, value: number): void;
     getInt(name: string): number | null;
@@ -96,6 +95,8 @@ export declare class GLMaterial extends Material {
     setVector3(name: string, value: Vector3): void;
     getVector4(name: string): Vector4 | null;
     setVector4(name: string, value: Vector4): void;
+    getColor(name: string): Color | null;
+    setColor(name: string, value: Color): void;
     getQuaternion(name: string): Quaternion | null;
     setQuaternion(name: string, value: Quaternion): void;
     getMatrix(name: string): Matrix4 | null;
@@ -110,6 +111,13 @@ export declare class GLMaterial extends Material {
     setTexture(name: string, texture: Texture): void;
     hasUniform(name: string): boolean;
     clone(props?: MaterialProps): Material;
+    fromData(data: MaterialData): void;
+    /**
+     * @since 2.0.0
+     * @param sceneData
+     * @returns
+     */
+    toData(): MaterialData;
     cloneUniforms(sourceMaterial: Material): void;
     private checkUniform;
     dispose(options?: MaterialDestroyOptions): void;

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

@@ -1,6 +1,7 @@
 import type { Disposable, Texture, math } from '@galacean/effects-core';
 import { GLShaderLibrary } from './gl-shader-library';
 import type { GLEngine } from './gl-engine';
+type Color = math.Color;
 type Vector2 = math.Vector2;
 type Vector3 = math.Vector3;
 type Vector4 = math.Vector4;
@@ -304,6 +305,7 @@ export declare class GLPipelineContext implements Disposable {
     setVector2(uniform: Nullable<WebGLUniformLocation>, value: Vector2): void;
     setVector3(uniform: Nullable<WebGLUniformLocation>, value: Vector3): void;
     setVector4(uniform: Nullable<WebGLUniformLocation>, value: Vector4): void;
+    setColor(uniform: Nullable<WebGLUniformLocation>, value: Color): void;
     setQuaternion(uniform: Nullable<WebGLUniformLocation>, value: Quaternion): void;
     setVector4Array(uniform: Nullable<WebGLUniformLocation>, array: number[]): void;
     setMatrix(uniform: Nullable<WebGLUniformLocation>, value: Matrix4): void;

package/dist/gl-renderer.d.ts

@@ -1,5 +1,5 @@
-import type { Disposable, FrameBuffer, Geometry, LostHandler, Material, Mesh, RenderFrame, RenderPass, RenderPassClearAction, RenderPassStoreAction, RestoreHandler, ShaderLibrary, math } from '@galacean/effects-core';
-import { Renderer, FilterMode, RenderTextureFormat } from '@galacean/effects-core';
+import type { Disposable, FrameBuffer, 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';
@@ -19,7 +19,7 @@ export declare class GLRenderer extends Renderer implements Disposable {
     get width(): number;
     renderRenderFrame(renderFrame: RenderFrame): void;
     renderRenderPass(pass: RenderPass): void;
-    renderMeshes(meshes: Mesh[]): void;
+    renderMeshes(meshes: RendererComponent[]): void;
     setGlobalFloat(name: string, value: number): void;
     setGlobalInt(name: string, value: number): void;
     setGlobalMatrix(name: string, value: Matrix4): void;

package/dist/gl-shader.d.ts

@@ -2,6 +2,7 @@ import type { ShaderCompileResult, ShaderWithSource, Texture, Engine, math } fro
 import { Shader } from '@galacean/effects-core';
 import type { GLProgram } from './gl-program';
 import type { GLPipelineContext } from './gl-pipeline-context';
+type Color = math.Color;
 type Vector2 = math.Vector2;
 type Vector3 = math.Vector3;
 type Vector4 = math.Vector4;
@@ -16,7 +17,7 @@ export declare class GLShader extends Shader {
     initialized: boolean;
     uniformLocations: Record<string, WebGLUniformLocation | null>;
     private samplerChannels;
-    constructor(source: ShaderWithSource);
+    constructor(engine: Engine, source: ShaderWithSource);
     initialize(engine: Engine): void;
     setFloat(name: string, value: number): void;
     setInt(name: string, value: number): void;
@@ -25,12 +26,14 @@ export declare class GLShader extends Shader {
     setVector2(name: string, value: Vector2): void;
     setVector3(name: string, value: Vector3): void;
     setVector4(name: string, value: Vector4): void;
+    setColor(name: string, value: Color): void;
     setQuaternion(name: string, value: Quaternion): void;
     setMatrix(name: string, value: Matrix4): void;
     setMatrix3(name: string, value: Matrix3): void;
     setVector4Array(name: string, array: number[]): void;
     setMatrixArray(name: string, array: number[]): void;
     fillShaderInformation(uniformNames: string[], samplers: string[]): void;
+    toData(): void;
     dispose(): void;
 }
 export {};

package/dist/gl-texture.d.ts

@@ -5,7 +5,7 @@ export declare class GLTexture extends Texture implements Disposable, RestoreHan
     target: GLenum;
     private pipelineContext;
     private initialized;
-    constructor(engine: Engine, source: TextureSourceOptions);
+    constructor(engine: Engine, source?: TextureSourceOptions);
     /** 绑定当前Texture对象。*/
     bind(force?: boolean): void;
     /** 初始化Texture的GPU资源。*/
@@ -14,6 +14,7 @@ export declare class GLTexture extends Texture implements Disposable, RestoreHan
     release(): void;
     update(sourceOptions: TextureSourceOptions): void;
     setTextureFilters(gl: WebGLRenderingContext | WebGL2RenderingContext, target: GLenum, options: TextureConfigOptions): void;
+    fromData(data: any): void;
     private texImage2D;
     private texImage2DData;
     private resizeImage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-webgl",
-  "version": "1.2.0",
+  "version": "2.0.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": "1.2.0"
+    "@galacean/effects-core": "2.0.0-alpha.0"
   },
   "scripts": {
     "prebuild": "pnpm clean",