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

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/cal/calculate-vfx-item.d.ts

@@ -3,12 +3,12 @@ import type * as spec from '@galacean/effects-specification';
 import type { ValueGetter } from '../../math';
 import { AnimationPlayable } from './animation-playable';
 import type { ItemBasicTransform, ItemLinearVelOverLifetime } from './calculate-item';
-import { Playable } from './playable-graph';
+import { Playable, PlayableAsset } from './playable-graph';
 /**
  * @since 2.0.0
  * @internal
  */
-export declare class AnimationClipPlayable extends AnimationPlayable {
+export declare class TransformAnimationPlayable extends AnimationPlayable {
     originalTransform: ItemBasicTransform;
     protected sizeSeparateAxes: boolean;
     protected sizeXOverLifetime: ValueGetter<number>;
@@ -45,6 +45,11 @@ export declare class AnimationClipPlayable extends AnimationPlayable {
     private sampleAnimation;
     fromData(data: TransformAnimationData): void;
 }
+export declare class TransformAnimationPlayableAsset extends PlayableAsset {
+    transformAnimationData: TransformAnimationData;
+    createPlayable(): Playable;
+    fromData(data: TransformAnimationData): void;
+}
 export interface TransformAnimationData {
     /**
      * 元素大小变化属性
@@ -63,7 +68,7 @@ export interface TransformAnimationData {
  * @since 2.0.0
  * @internal
  */
-export declare class ActivationClipPlayable extends Playable {
+export declare class ActivationPlayable extends Playable {
     onGraphStart(): void;
     onPlayablePlay(): void;
     onPlayableDestroy(): void;

package/dist/plugins/cal/playable-graph.d.ts

@@ -60,3 +60,7 @@ export declare class PlayableOutput {
     onGraphStart(): void;
     processFrame(dt: number): void;
 }
+export declare abstract class PlayableAsset {
+    abstract createPlayable(): Playable;
+    fromData(data: any): void;
+}

package/dist/plugins/cal/track.d.ts

@@ -1,22 +1,21 @@
 import type { VFXItem, VFXItemContent } from '../../vfx-item';
-import { Playable, PlayableOutput } from './playable-graph';
+import { Playable, PlayableAsset, PlayableOutput } from './playable-graph';
 /**
  * @since 2.0.0
  * @internal
  */
-export declare class Track {
+export declare class Track extends PlayableAsset {
     id: string;
     name: string;
     bindingItem: VFXItem<VFXItemContent>;
     private clips;
     private clipSeed;
-    constructor();
     createOutput(): PlayableOutput;
     /**
      * 重写该方法以创建自定义混合器
      */
     createMixerPlayable(): Playable;
-    createPlayebleTree(): Playable;
+    createPlayable(): Playable;
     createClip<T extends Playable>(classConstructor: new () => T, name?: string): TimelineClip;
     getClips(): TimelineClip[];
     findClip(name: string): TimelineClip | undefined;

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/dist/vfx-item.d.ts

@@ -1,10 +1,10 @@
 import { Vector3 } from '@galacean/effects-math/es/core/vector3';
 import * as spec from '@galacean/effects-specification';
+import { type VFXItemData } from './asset-loader';
 import { RendererComponent } from './components';
 import type { Component } from './components/component';
 import { ItemBehaviour } from './components/component';
 import type { Composition } from './composition';
-import { type VFXItemData } from './asset-loader';
 import { EffectsObject } from './effects-object';
 import type { Engine } from './engine';
 import type { BoundingBoxData, CameraController, HitTestBoxParams, HitTestCustomParams, HitTestSphereParams, HitTestTriangleParams, InteractComponent, ParticleSystem, SpriteComponent } from './plugins';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.4",
   "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.2",
     "@galacean/effects-math": "1.0.1",
     "uuid": "9.0.1"
   },