@galacean/effects-webgl 2.0.0-alpha.2 → 2.0.0-alpha.4

package/dist/gl-material.d.ts

@@ -1,8 +1,7 @@
-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 { Engine, GlobalUniforms, MaterialData, MaterialDestroyOptions, MaterialProps, MaterialStates, Renderer, Texture, UndefinedAble } from '@galacean/effects-core';
+import { Material, Shader, math } from '@galacean/effects-core';
 import type { GLPipelineContext } from './gl-pipeline-context';
-import type { GLShader } from './gl-shader';
+import type { GLShaderVariant } from './gl-shader';
 type Color = math.Color;
 type Vector2 = math.Vector2;
 type Vector3 = math.Vector3;
@@ -12,7 +11,8 @@ type Matrix4 = math.Matrix4;
 type Quaternion = math.Quaternion;
 declare const Vector4: typeof math.Vector4, Matrix4: typeof math.Matrix4;
 export declare class GLMaterial extends Material {
-    shader: GLShader;
+    shader: Shader;
+    shaderVariant: GLShaderVariant;
     private floats;
     private ints;
     private vector2s;
@@ -26,10 +26,13 @@ export declare class GLMaterial extends Material {
     private floatArrays;
     private vector4Arrays;
     private matrixArrays;
-    samplers: string[];
-    uniforms: string[];
-    uniformDirtyFlag: boolean;
-    glMaterialState: GLMaterialState;
+    private samplers;
+    private uniforms;
+    private uniformDirtyFlag;
+    private macrosDirtyFlag;
+    private readonly macros;
+    private glMaterialState;
+    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]>;
@@ -74,9 +77,9 @@ export declare class GLMaterial extends Material {
     set frontFace(value: UndefinedAble<number>);
     get cullFace(): UndefinedAble<number>;
     set cullFace(value: UndefinedAble<number>);
-    enableKeyword(keyword: string): void;
-    disableKeyword(keyword: string): void;
-    isKeywordEnabled(keyword: string): boolean;
+    enableMacro(keyword: string): void;
+    disableMacro(keyword: string): void;
+    isMacroEnabled(keyword: string): boolean;
     createMaterialStates(states: MaterialStates): void;
     get isDestroyed(): boolean;
     /**shader和texture的GPU资源初始化。 */

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

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

package/dist/gl-shader.d.ts

@@ -1,5 +1,5 @@
 import type { ShaderCompileResult, ShaderWithSource, Texture, Engine, math } from '@galacean/effects-core';
-import { Shader } from '@galacean/effects-core';
+import { ShaderVariant } from '@galacean/effects-core';
 import type { GLProgram } from './gl-program';
 import type { GLPipelineContext } from './gl-pipeline-context';
 type Color = math.Color;
@@ -9,7 +9,7 @@ type Vector4 = math.Vector4;
 type Matrix3 = math.Matrix3;
 type Matrix4 = math.Matrix4;
 type Quaternion = math.Quaternion;
-export declare class GLShader extends Shader {
+export declare class GLShaderVariant extends ShaderVariant {
     pipelineContext: GLPipelineContext;
     program: GLProgram;
     compileResult: ShaderCompileResult;

package/package.json

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