@galacean/effects-core 2.0.0-alpha.17 → 2.0.0-alpha.19

package/dist/material/utils.d.ts

@@ -1,17 +1,17 @@
 import * as spec from '@galacean/effects-specification';
-import type { ShaderMarcos } from '../render';
+import type { ShaderMacros } from '../render';
 import type { Material } from './material';
 import { ShaderType } from './types';
 export declare function valIfUndefined<T>(val: any, def: T): T;
 export declare function getPreMultiAlpha(blending?: number): number;
 /**
  * 生成 shader，检测到 WebGL1 上下文会降级
- * @param marcos - 宏定义数组
+ * @param macros - 宏定义数组
  * @param shader - 原始 shader 文本
  * @param shaderType - shader 类型
  * @return 去除版本号的 shader 文本
  */
-export declare function createShaderWithMarcos(marcos: ShaderMarcos, shader: string, shaderType: ShaderType, level: number): string;
+export declare function createShaderWithMacros(macros: ShaderMacros, shader: string, shaderType: ShaderType, level: number): string;
 export declare function setBlendMode(material: Material, blendMode?: number): void;
 export declare function setSideMode(material: Material, side: spec.SideMode): void;
 export declare function setMaskMode(material: Material, maskMode: spec.MaskMode): void;

package/dist/math/value-getter.d.ts

@@ -33,6 +33,7 @@ export declare class StaticValue extends ValueGetter<number> {
     getValue(time?: number): number;
     toUniform(): Float32Array;
     map(func: (n: number) => number): this;
+    getMaxTime(): number;
 }
 export declare class RandomSetValue<T> extends ValueGetter<T> {
     private items;

package/dist/plugins/cal/calculate-vfx-item.d.ts

@@ -103,6 +103,7 @@ export interface FloatCurve {
     keyFrames: ValueGetter<number>;
 }
 export declare class AnimationClip extends EffectsObject {
+    duration: number;
     positionCurves: PositionCurve[];
     rotationCurves: RotationCurve[];
     scaleCurves: ScaleCurve[];

package/dist/plugins/cal/timeline-asset.d.ts

@@ -2,14 +2,14 @@ import type { DataPath, EffectsObjectData } from '@galacean/effects-specificatio
 import type { RuntimeClip, TrackAsset } from '../timeline/track';
 import type { FrameContext, PlayableGraph } from './playable-graph';
 import { Playable, PlayableAsset } from './playable-graph';
-import type { Engine } from '../../engine';
+import type { Constructor } from '../../utils';
 export interface TimelineAssetData extends EffectsObjectData {
     tracks: DataPath[];
 }
 export declare class TimelineAsset extends PlayableAsset {
     tracks: TrackAsset[];
     createPlayable(graph: PlayableGraph): Playable;
-    createTrack<T extends TrackAsset>(classConstructor: new (engine: Engine) => T, parent: TrackAsset, name?: string): T;
+    createTrack<T extends TrackAsset>(classConstructor: Constructor<T>, parent: TrackAsset, name?: string): T;
     fromData(data: TimelineAssetData): void;
 }
 export declare class TimelinePlayable extends Playable {

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

@@ -151,7 +151,7 @@ export declare class ParticleMesh implements ParticleMeshData {
     removePoint(index: number): void;
     setPoint(index: number, point: Point): void;
 }
-export declare function getParticleMeshShader(item: spec.ParticleItem, env: string | undefined, gpuCapability: GPUCapability): {
+export declare function getParticleMeshShader(item: spec.ParticleItem, gpuCapability: GPUCapability, env?: string): {
     shader: SharedShaderWithSource;
     vertex: number;
     fragment: number;

package/dist/plugins/particle/particle-vfx-item.d.ts

@@ -7,6 +7,7 @@ import { ParticleSystem } from './particle-system';
  */
 export declare class ParticleBehaviourPlayable extends Playable {
     particleSystem: ParticleSystem;
+    lastTime: number;
     start(context: FrameContext): void;
     processFrame(context: FrameContext): void;
 }

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

@@ -56,4 +56,4 @@ export declare class TrailMesh {
     setPointStartPos(index: number, pos: Vector3): void;
     onUpdate(escapeTime: number): any;
 }
-export declare function getTrailMeshShader(trails: spec.ParticleTrail, particleMaxCount: number, name: string, env: string | undefined, gpuCapability: GPUCapability): ShaderWithSource;
+export declare function getTrailMeshShader(trails: spec.ParticleTrail, particleMaxCount: number, name: string, gpuCapability: GPUCapability, env?: string): ShaderWithSource;

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

@@ -20,16 +20,12 @@ export type SpriteRegionData = {
     size: spec.vec2;
 };
 export declare let maxSpriteMeshItemCount: number;
-export declare let maxSpriteTextureCount: number;
 export declare function setSpriteMeshMaxItemCountByGPU(gpuCapability: GPUCapabilityDetail): 16 | 32 | undefined;
 export declare function getImageItemRenderInfo(item: SpriteComponent): SpriteItemRenderInfo;
 export declare function spriteMeshShaderFromFilter(level: number, options?: {
-    count?: number;
-    ignoreBlend?: boolean;
     wireframe?: boolean;
     env?: string;
 }): SharedShaderWithSource;
 export declare function spriteMeshShaderIdFromRenderInfo(renderInfo: SpriteItemRenderInfo, count: number): string;
 export declare function spriteMeshShaderFromRenderInfo(renderInfo: SpriteItemRenderInfo, count: number, level: number, env?: string): SharedShaderWithSource;
 export declare function setMaxSpriteMeshItemCount(count: number): void;
-export declare function setSpriteMeshMaxFragmentTextures(count: number): void;

package/dist/plugins/text/text-item.d.ts

@@ -4,20 +4,35 @@ import type { SpriteItemProps } from '../sprite/sprite-item';
 import { SpriteComponent } from '../sprite/sprite-item';
 import { TextLayout } from './text-layout';
 import { TextStyle } from './text-style';
+import type { Material } from '../../material';
 export declare const DEFAULT_FONTS: string[];
+export interface TextComponent extends TextComponentBase {
+}
 /**
  * @since 2.0.0
  * @internal
  */
 export declare class TextComponent extends SpriteComponent {
-    textStyle: TextStyle;
     isDirty: boolean;
+    constructor(engine: Engine, props?: spec.TextContent);
+    update(dt: number): void;
+    fromData(data: SpriteItemProps): void;
+    updateWithOptions(options: spec.TextContentOptions): void;
+    updateTexture(flipY?: boolean): void;
+}
+export declare class TextComponentBase {
+    textStyle: TextStyle;
     canvas: HTMLCanvasElement;
     context: CanvasRenderingContext2D | null;
     textLayout: TextLayout;
     text: string;
+    /***** mix 类型兼容用 *****/
+    isDirty: boolean;
+    engine: Engine;
+    material: Material;
+    /***** mix 类型兼容用 *****/
     private char;
-    constructor(engine: Engine, props?: spec.TextContent);
+    updateWithOptions(options: spec.TextContentOptions): void;
     /**
      * 设置字号大小
      * @param value - 字号
@@ -108,13 +123,11 @@ export declare class TextComponent extends SpriteComponent {
      * @returns
      */
     setFontScale(value: number): void;
-    update(dt: number): void;
     /**
      * 更新文本
      * @returns
      */
-    updateTexture(): void;
-    fromData(data: SpriteItemProps): void;
+    updateTexture(flipY?: boolean): void;
     private getFontDesc;
     private setupOutline;
     private setupShadow;

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

@@ -1,7 +1,8 @@
 import { ItemEndBehavior } from '@galacean/effects-specification';
-import type { Engine } from '../../engine';
 import type { PlayableGraph } from '../cal/playable-graph';
 import { Playable, PlayableAsset, PlayableOutput } from '../cal/playable-graph';
+import { ParticleSystem } from '../particle/particle-system';
+import type { Constructor } from '../../utils';
 /**
  * @since 2.0.0
  * @internal
@@ -42,7 +43,7 @@ export declare class TrackAsset extends PlayableAsset {
     createPlayable(graph: PlayableGraph): Playable;
     getChildTracks(): TrackAsset[];
     addChild(child: TrackAsset): void;
-    createClip<T extends PlayableAsset>(classConstructor: new (engine: Engine) => T, name?: string): TimelineClip;
+    createClip<T extends PlayableAsset>(classConstructor: Constructor<T>, name?: string): TimelineClip;
     getClips(): TimelineClip[];
     findClip(name: string): TimelineClip | undefined;
     addClip(clip: TimelineClip): void;
@@ -57,6 +58,7 @@ export declare class RuntimeClip {
     playable: Playable;
     parentMixer: Playable;
     track: TrackAsset;
+    particleSystem: ParticleSystem;
     constructor(clip: TimelineClip, clipPlayable: Playable, parentMixer: Playable, track: TrackAsset);
     set enable(value: boolean);
     evaluateAt(localTime: number): void;

package/dist/render/shader.d.ts

@@ -1,7 +1,7 @@
 import type * as spec from '@galacean/effects-specification';
 import { EffectsObject } from '../effects-object';
 import type { Engine } from '../engine';
-export type ShaderMarcos = [key: string, value: string | number | boolean][];
+export type ShaderMacros = [key: string, value: string | number | boolean][];
 export declare enum ShaderCompileResultStatus {
     noShader = 0,
     success = 1,
@@ -39,7 +39,7 @@ export interface InstancedShaderWithSource {
     /**
      * shader的宏定义
      */
-    marcos?: ShaderMarcos;
+    macros?: ShaderMacros;
     /**
      * shader是否共享
      */
@@ -65,7 +65,7 @@ export interface SharedShaderWithSource {
     /**
      * shader的宏定义
      */
-    marcos?: ShaderMarcos;
+    macros?: ShaderMacros;
     /**
      * 是否共用GLProgram
      * shared为true时，
@@ -94,7 +94,7 @@ export interface ShaderLibrary {
         [cacheId: string]: ShaderCompileResult;
     };
     addShader(shader: ShaderWithSource): void;
-    createShader(shaderSource: ShaderWithSource, macros?: ShaderMarcos): ShaderVariant;
+    createShader(shaderSource: ShaderWithSource, macros?: ShaderMacros): ShaderVariant;
     /**
      * @param cacheId
      */

package/dist/texture/utils.d.ts

@@ -2,5 +2,5 @@ import type * as spec from '@galacean/effects-specification';
 import type { Texture2DSourceOptions, TextureCubeSourceOptions } from './types';
 import type { Engine } from '../engine';
 type TextureJSONOptions = spec.SerializedTextureSource & spec.TextureConfigOptionsBase & spec.TextureFormatOptions;
-export declare function deserializeMipmapTexture(texOpts: TextureJSONOptions, bins: ArrayBuffer[], files: spec.BinaryFile[] | undefined, engine: Engine): Promise<Texture2DSourceOptions | TextureCubeSourceOptions>;
+export declare function deserializeMipmapTexture(textureOptions: TextureJSONOptions, bins: ArrayBuffer[], engine: Engine, files?: spec.BinaryFile[]): Promise<Texture2DSourceOptions | TextureCubeSourceOptions>;
 export {};

package/dist/utils/array.d.ts

@@ -16,4 +16,4 @@ export declare function removeItem<T>(arr: T[], value: T): T[];
  * @returns
  */
 export declare function addItemWithOrder<T extends Record<string, any>>(arr: T[], item: T, property: string, descending?: boolean): void;
-export declare function enlargeBuffer<T extends TypedArray>(typeArray: T, length: number, increase: number | undefined, maxSize: number): T;
+export declare function enlargeBuffer<T extends TypedArray>(typeArray: T, length: number, maxSize: number, increase?: number): T;

package/dist/utils/index.d.ts

@@ -12,6 +12,9 @@ export type Immutable<O> = O extends Record<any, any> ? {
 export type PickEnum<T, K extends T> = {
     [P in keyof K]: P extends K ? P : never;
 };
+export interface Constructor<T = unknown> {
+    new (...args: any[]): T;
+}
 export declare enum DestroyOptions {
     destroy = 0,
     keep = 1,
@@ -77,3 +80,4 @@ export declare function randomInRange(min: number, max: number): number;
 export declare function throwDestroyedError(): void;
 export declare function generateGUID(): string;
 export declare function base64ToFile(base64: string, filename?: string, contentType?: string): File;
+export declare function applyMixins<T extends Constructor, K extends Constructor>(derivedCtrl: T, baseCtrls: K[]): void;

package/dist/vfx-item.d.ts

@@ -7,8 +7,8 @@ import { EffectsObject } from './effects-object';
 import type { Engine } from './engine';
 import type { BoundingBoxData, CameraController, HitTestBoxParams, HitTestCustomParams, HitTestSphereParams, HitTestTriangleParams, InteractComponent, ParticleSystem, SpriteComponent } from './plugins';
 import { Transform } from './transform';
-import { type Disposable } from './utils';
-export type VFXItemContent = ParticleSystem | SpriteComponent | CameraController | InteractComponent | void | {};
+import type { Constructor, Disposable } from './utils';
+export type VFXItemContent = ParticleSystem | SpriteComponent | CameraController | InteractComponent | undefined | {};
 export type VFXItemConstructor = new (engine: Engine, props: VFXItemProps, composition: Composition) => VFXItem;
 export type VFXItemProps = spec.Item & {
     items: VFXItemProps[];
@@ -122,19 +122,19 @@ export declare class VFXItem extends EffectsObject implements Disposable {
      * 添加组件
      * @param classConstructor - 要添加的组件类型
      */
-    addComponent<T extends Component>(classConstructor: new (engine: Engine) => T): T;
+    addComponent<T extends Component>(classConstructor: Constructor<T>): T;
     /**
      * 获取某一类型的组件。如果当前元素绑定了多个同类型的组件只返回第一个
      * @param classConstructor - 要获取的组件类型
      * @returns 查询结果中符合类型的第一个组件
      */
-    getComponent<T extends Component>(classConstructor: new (engine: Engine) => T): T;
+    getComponent<T extends Component>(classConstructor: Constructor<T>): T;
     /**
      * 获取某一类型的所有组件
      * @param classConstructor - 要获取的组件
      * @returns 一个组件列表，包含所有符合类型的组件
      */
-    getComponents<T extends Component>(classConstructor: new (engine: Engine) => T): T[];
+    getComponents<T extends Component>(classConstructor: Constructor<T>): T[];
     setParent(vfxItem: VFXItem): void;
     /**
      * 元素动画结束播放时回调函数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "2.0.0-alpha.17",
+  "version": "2.0.0-alpha.19",
   "description": "Galacean Effects runtime core for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",