@galacean/effects-core 2.0.0-alpha.3 → 2.0.0-alpha.5

package/dist/material/material.d.ts

@@ -320,9 +320,9 @@ export declare abstract class Material extends EffectsObject implements Disposab
      */
     abstract hasUniform(name: string): boolean;
     /******** 预留接口，暂时不用实现 ***********************/
-    abstract enableKeyword(keyword: string): void;
-    abstract disableKeyword(keyword: string): void;
-    abstract isKeywordEnabled(keyword: string): boolean;
+    abstract enableMacro(keyword: string): void;
+    abstract disableMacro(keyword: string): void;
+    abstract isMacroEnabled(keyword: string): boolean;
     /***************************************************/
     /**
      * Material 的克隆方法（不接入滤镜，本方法可以不做实现）

package/dist/plugins/interact/interact-mesh.d.ts

@@ -1,8 +1,8 @@
 import type * as spec from '@galacean/effects-specification';
+import type { Engine } from '../../engine';
 import type { MeshRendererOptions } from '../../render';
 import { Mesh } from '../../render';
 import type { Transform } from '../../transform';
-import type { Engine } from '../../engine';
 export declare class InteractMesh {
     private readonly transform;
     private readonly engine;

package/dist/plugins/particle/particle-mesh.d.ts

@@ -1,12 +1,12 @@
-import type * as spec from '@galacean/effects-specification';
 import type { Matrix4 } from '@galacean/effects-math/es/core/index';
 import { Vector2, Vector3 } from '@galacean/effects-math/es/core/index';
+import type * as spec from '@galacean/effects-specification';
+import type { Engine } from '../../engine';
 import type { ValueGetter } from '../../math';
-import type { SharedShaderWithSource, GPUCapability } from '../../render';
+import type { GPUCapability, SharedShaderWithSource } from '../../render';
 import { Geometry, Mesh } from '../../render';
 import { Texture } from '../../texture';
 import { Transform } from '../../transform';
-import type { Engine } from '../../engine';
 export type Point = {
     vel: Vector3;
     lifetime: number;

package/dist/plugins/particle/trail-mesh.d.ts

@@ -1,12 +1,12 @@
-import type * as spec from '@galacean/effects-specification';
-import type { vec4, GradientStop } from '@galacean/effects-specification';
-import { Vector3 } from '@galacean/effects-math/es/core/index';
 import type { Matrix4 } from '@galacean/effects-math/es/core/index';
-import type { ShaderWithSource, GPUCapability } from '../../render';
-import { Geometry, Mesh } from '../../render';
-import { Texture } from '../../texture';
+import { Vector3 } from '@galacean/effects-math/es/core/index';
+import type * as spec from '@galacean/effects-specification';
+import type { GradientStop, vec4 } from '@galacean/effects-specification';
 import type { Engine } from '../../engine';
 import type { ValueGetter } from '../../math';
+import type { GPUCapability, ShaderWithSource } from '../../render';
+import { Geometry, Mesh } from '../../render';
+import { Texture } from '../../texture';
 export type TrailMeshProps = {
     maxTrailCount: number;
     pointCountPerTrail: number;

package/dist/render/shader.d.ts

@@ -1,3 +1,4 @@
+import type { ShaderData } from '../asset-loader';
 import { EffectsObject } from '../effects-object';
 import type { Engine } from '../engine';
 export type ShaderMarcos = [key: string, value: string | number | boolean][];
@@ -78,16 +79,22 @@ export interface SharedShaderWithSource {
     cacheId?: string;
 }
 export type ShaderWithSource = InstancedShaderWithSource | SharedShaderWithSource;
-export declare abstract class Shader extends EffectsObject {
+export declare abstract class ShaderVariant extends EffectsObject {
     readonly source: ShaderWithSource;
+    shader: Shader;
     constructor(engine: Engine, source: ShaderWithSource);
 }
+export declare class Shader extends EffectsObject {
+    shaderData: ShaderData;
+    createVariant(macros?: Record<string, number | boolean>): ShaderVariant;
+    fromData(data: ShaderData): void;
+}
 export interface ShaderLibrary {
     readonly shaderResults: {
         [cacheId: string]: ShaderCompileResult;
     };
     addShader(shader: ShaderWithSource): void;
-    createShader(shaderSource: ShaderWithSource): Shader;
+    createShader(shaderSource: ShaderWithSource, macros?: ShaderMarcos): ShaderVariant;
     /**
      * @param cacheId
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.5",
   "description": "Galacean Effects runtime core for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",
@@ -42,7 +42,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@galacean/effects-specification": "1.0.1",
+    "@galacean/effects-specification": "2.0.0-alpha.3",
     "@galacean/effects-math": "1.0.1",
     "uuid": "9.0.1"
   },