@galacean/effects-core 2.3.0-alpha.1 → 2.3.0-beta.0

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

@@ -134,9 +134,9 @@ export declare class ParticleMesh implements ParticleMeshData {
     };
     speedOverLifetime?: ValueGetter<number>;
     time: number;
+    maxCount: number;
     readonly useSprite?: boolean;
     readonly textureOffsets: number[];
-    readonly maxCount: number;
     readonly anchor: Vector2;
     private cachedRotationVector3;
     private cachedRotationMatrix;

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

@@ -157,6 +157,17 @@ export declare class ParticleSystem extends Component {
     get timePassed(): number;
     get lifetime(): number;
     get particleCount(): number;
+    /**
+     * 获取当前粒子系统的最大粒子数。当系统的粒子数量达到最大值时，发射器会暂时停止发射粒子。
+     * @since 2.3.0
+     */
+    get maxParticles(): number;
+    /**
+     * 设置当前粒子系统的最大粒子数。当系统的粒子数量达到最大值时，发射器会暂时停止发射粒子。
+     * 注意：暂时不支持增加拖尾数量
+     * @since 2.3.0
+     */
+    set maxParticles(count: number);
     isFrozen(): boolean;
     isEnded(): boolean;
     initEmitterTransform(): void;

package/dist/plugins/shape/build-line.d.ts

@@ -1,5 +1,5 @@
-export type LineCap = 'butt' | 'round' | 'square';
-export type LineJoin = 'round' | 'bevel' | 'miter';
+import type { Color } from '@galacean/effects-math/es/core/color';
+import * as spec from '@galacean/effects-specification';
 export declare const closePointEps = 0.0001;
 export declare const curveEps = 0.0001;
 /**
@@ -11,11 +11,13 @@ export interface StrokeAttributes {
     /** The alignment of the stroke. */
     alignment: number;
     /** The line cap style to use. */
-    cap: LineCap;
+    cap: spec.LineCap;
     /** The line join style to use. */
-    join: LineJoin;
+    join: spec.LineJoin;
     /** The miter limit to use. */
     miterLimit: number;
+    /** Stroke color */
+    color: Color;
 }
 /**
  * Builds a line to draw using the polygon method.

package/dist/plugins/shape/graphics-path.d.ts

@@ -31,6 +31,12 @@ export declare class GraphicsPath {
      * @returns The instance of the current object for chaining.
      */
     moveTo(x: number, y: number): GraphicsPath;
+    /**
+     * Closes the current path by drawing a straight line back to the start.
+     * If the shape is already closed or there are no points in the path, this method does nothing.
+     * @returns The instance of the current object for chaining.
+     */
+    closePath(): this;
     /**
      * Draws an ellipse at the specified location and with the given x and y radii.
      * An optional transformation can be applied, allowing for rotation, scaling, and translation.
@@ -51,7 +57,7 @@ export declare class GraphicsPath {
      * @param transform - An optional `Matrix` object to apply a transformation to the rectangle.
      * @returns The instance of the current object for chaining.
      */
-    rect(x: number, y: number, w: number, h: number, transform?: Matrix4): this;
+    rect(x: number, y: number, w: number, h: number, roundness: number, transform?: Matrix4): this;
     polyStar(pointCount: number, outerRadius: number, innerRadius: number, outerRoundness: number, innerRoundness: number, starType: StarType, transform?: Matrix4): this;
     clear(): GraphicsPath;
 }

package/dist/plugins/shape/polygon.d.ts

@@ -60,4 +60,8 @@ export declare class Polygon extends ShapePrimitive {
     getY(): number;
     build(points: number[]): void;
     triangulate(points: number[], vertices: number[], verticesOffset: number, indices: number[], indicesOffset: number): void;
+    /**
+     * 获取直线上最远的两个端点坐标组成的三角形
+     */
+    private getLineEndPointsTriangle;
 }

package/dist/plugins/shape/rectangle.d.ts

@@ -1,129 +1,62 @@
 import { ShapePrimitive } from './shape-primitive';
 /**
- * The `Rectangle` object is an area defined by its position, as indicated by its upper-left corner
- * point (`x`, `y`) and by its `width` and its `height`.
+ * The `Rectangle` object is an area defined by its position, as indicated by its top-left corner
+ * point (`x`, `y`) and by its `width` and its `height`, including a `roundness` property that
+ * defines the roundness of the rounded corners.
+ * @memberof maths
  */
 export declare class Rectangle extends ShapePrimitive {
     /**
      * The X coordinate of the upper-left corner of the rectangle
-     * @default 0
      */
     x: number;
     /**
      * The Y coordinate of the upper-left corner of the rectangle
-     * @default 0
      */
     y: number;
     /**
      * The overall width of this rectangle
-     *  @default 0
      */
     width: number;
     /**
      * The overall height of this rectangle
-     * @default 0
      */
     height: number;
+    /**
+     * Controls the roundness of the rounded corners
+     */
+    roundness: number;
     /**
      * @param x - The X coordinate of the upper-left corner of the rectangle
      * @param y - The Y coordinate of the upper-left corner of the rectangle
-     * @param width - The overall width of the rectangle
-     * @param height - The overall height of the rectangle
+     * @param width - The overall width of this rectangle
+     * @param height - The overall height of this rectangle
+     * @param roundness - Controls the roundness of the rounded corners
      */
-    constructor(x?: string | number, y?: string | number, width?: string | number, height?: string | number);
-    /** Returns the left edge of the rectangle. */
-    get left(): number;
-    /** Returns the right edge of the rectangle. */
-    get right(): number;
-    /** Returns the top edge of the rectangle. */
-    get top(): number;
-    /** Returns the bottom edge of the rectangle. */
-    get bottom(): number;
-    /** Determines whether the Rectangle is empty. */
-    isEmpty(): boolean;
-    /** A constant empty rectangle. This is a new object every time the property is accessed */
-    static get EMPTY(): Rectangle;
+    constructor(x?: number, y?: number, width?: number, height?: number, roundness?: number);
     /**
-     * Creates a clone of this Rectangle
-     * @returns a copy of the rectangle
+     * Returns the framing rectangle of the rectangle as a Rectangle object
+     * @param out - optional rectangle to store the result
+     * @returns The framing rectangle
      */
-    clone(): Rectangle;
+    getBounds(out?: Rectangle): Rectangle;
     /**
-     * Converts a Bounds object to a Rectangle object.
-     * @param bounds - The bounds to copy and convert to a rectangle.
-     * @returns Returns itself.
+     * Creates a clone of this rectangle.
+     * @returns - A copy of the rectangle.
      */
+    clone(): Rectangle;
     /**
      * Copies another rectangle to this one.
      * @param rectangle - The rectangle to copy from.
      * @returns Returns itself.
      */
-    copyFrom(rectangle: Rectangle): Rectangle;
+    copyFrom(rectangle: Rectangle): this;
     /**
      * Copies this rectangle to another one.
      * @param rectangle - The rectangle to copy to.
      * @returns Returns given parameter.
      */
     copyTo(rectangle: Rectangle): Rectangle;
-    /**
-     * Checks whether the x and y coordinates given are contained within this Rectangle
-     * @param x - The X coordinate of the point to test
-     * @param y - The Y coordinate of the point to test
-     * @returns Whether the x/y coordinates are within this Rectangle
-     */
-    contains(x: number, y: number): boolean;
-    /**
-     * Checks whether the x and y coordinates given are contained within this rectangle including the stroke.
-     * @param x - The X coordinate of the point to test
-     * @param y - The Y coordinate of the point to test
-     * @param strokeWidth - The width of the line to check
-     * @returns Whether the x/y coordinates are within this rectangle
-     */
-    strokeContains(x: number, y: number, strokeWidth: number): boolean;
-    /**
-     * Determines whether the `other` Rectangle transformed by `transform` intersects with `this` Rectangle object.
-     * Returns true only if the area of the intersection is >0, this means that Rectangles
-     * sharing a side are not overlapping. Another side effect is that an arealess rectangle
-     * (width or height equal to zero) can't intersect any other rectangle.
-     * @param {Rectangle} other - The Rectangle to intersect with `this`.
-     * @param {Matrix} transform - The transformation matrix of `other`.
-     * @returns {boolean} A value of `true` if the transformed `other` Rectangle intersects with `this`; otherwise `false`.
-     */
-    /**
-     * Pads the rectangle making it grow in all directions.
-     * If paddingY is omitted, both paddingX and paddingY will be set to paddingX.
-     * @param paddingX - The horizontal padding amount.
-     * @param paddingY - The vertical padding amount.
-     * @returns Returns itself.
-     */
-    pad(paddingX?: number, paddingY?: number): this;
-    /**
-     * Fits this rectangle around the passed one.
-     * @param rectangle - The rectangle to fit.
-     * @returns Returns itself.
-     */
-    fit(rectangle: Rectangle): this;
-    /**
-     * Enlarges rectangle that way its corners lie on grid
-     * @param resolution - resolution
-     * @param eps - precision
-     * @returns Returns itself.
-     */
-    ceil(resolution?: number, eps?: number): this;
-    /**
-     * Enlarges this rectangle to include the passed rectangle.
-     * @param rectangle - The rectangle to include.
-     * @returns Returns itself.
-     */
-    enlarge(rectangle: Rectangle): this;
-    /**
-     * Returns the framing rectangle of the rectangle as a Rectangle object
-     * @param out - optional rectangle to store the result
-     * @returns The framing rectangle
-     */
-    getBounds(out?: Rectangle): Rectangle;
-    getX(): number;
-    getY(): number;
-    build(points: number[]): number[];
+    build(points: number[]): void;
     triangulate(points: number[], vertices: number[], verticesOffset: number, indices: number[], indicesOffset: number): void;
 }

package/dist/plugins/shape/shape-path.d.ts

@@ -28,6 +28,12 @@ export declare class ShapePath {
      */
     bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number, smoothness?: number): ShapePath;
     moveTo(x: number, y: number): ShapePath;
+    /**
+     * Closes the current path by drawing a straight line back to the start.
+     * If the shape is already closed or there are no points in the path, this method does nothing.
+     * @returns The instance of the current object for chaining.
+     */
+    closePath(): this;
     /**
      * Draws an ellipse at the specified location and with the given x and y radii.
      * An optional transformation can be applied, allowing for rotation, scaling, and translation.
@@ -49,7 +55,7 @@ export declare class ShapePath {
      * @param transform - An optional `Matrix` object to apply a transformation to the rectangle.
      * @returns The instance of the current object for chaining.
      */
-    rect(x: number, y: number, w: number, h: number, transform?: Matrix4): this;
+    rect(x: number, y: number, w: number, h: number, roundness: number, transform?: Matrix4): this;
     /**
      * Draws a given shape on the canvas.
      * This is a generic method that can draw any type of shape specified by the `ShapePrimitive` parameter.

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

@@ -29,6 +29,10 @@ export declare class TextComponent extends BaseRenderComponent {
      * 文本行数
      */
     lineCount: number;
+    /**
+     * 每一行文本的最大宽度
+     */
+    protected maxLineWidth: number;
     protected readonly SCALE_FACTOR = 0.1;
     protected readonly ALPHA_FIX_VALUE: number;
     constructor(engine: Engine, props?: TextItemProps);
@@ -51,7 +55,9 @@ export declare class TextComponentBase {
     item: VFXItem;
     renderer: ItemRenderer;
     /***** mix 类型兼容用 *****/
+    protected maxLineWidth: number;
     private char;
+    protected renderText(options: spec.TextContentOptions): void;
     updateWithOptions(options: spec.TextContentOptions): void;
     private getLineCount;
     /**
@@ -120,6 +126,16 @@ export declare class TextComponentBase {
      * @returns
      */
     setShadowBlur(value: number): void;
+    /**
+     * 设置文本溢出模式
+     *
+     * - clip: 当文本内容超出边界框时，多余的会被截断。
+     * - display: 该模式下会显示所有文本，会自动调整文本字号以保证显示完整。
+     * > 当存在多行时，部分行内文本可能存在文本字号变小的情况，其他行为正常情况
+     *
+     * @param overflow - 文本溢出模式
+     */
+    setOverflow(overflow: spec.TextOverflow): void;
     /**
      * 设置阴影颜色
      * @param value - 阴影颜色

package/dist/scene.d.ts

@@ -2,6 +2,7 @@ import type * as spec from '@galacean/effects-specification';
 import type { Texture } from './texture';
 import type { PluginSystem } from './plugin-system';
 import type { PickEnum } from './utils';
+import type { AssetManager } from './asset-manager';
 export type ImageLike = spec.HTMLImageLike | ArrayBuffer | Texture;
 export type SceneRenderLevel = PickEnum<spec.RenderLevel, spec.RenderLevel.A | spec.RenderLevel.B | spec.RenderLevel.S>;
 /**
@@ -36,6 +37,11 @@ export declare namespace Scene {
         url: string;
         options?: SceneLoadOptions;
     };
+    export interface LoadResult {
+        scene: Scene;
+        assetManager: AssetManager;
+        options: SceneLoadOptions;
+    }
     /**
      * 接受用于加载的数据类型
      */

package/dist/vfx-item.d.ts

@@ -27,10 +27,6 @@ export declare class VFXItem extends EffectsObject implements Disposable {
      * 元素的变换包含位置、旋转、缩放。
      */
     transform: Transform;
-    /**
-     * 合成属性
-     */
-    composition: Composition | null;
     /**
      * 元素动画的当前时间
      */
@@ -83,6 +79,10 @@ export declare class VFXItem extends EffectsObject implements Disposable {
     private listIndex;
     private isEnabled;
     private eventProcessor;
+    /**
+     * 合成属性
+     */
+    private _composition;
     /**
      *
      * @param item
@@ -136,6 +136,14 @@ export declare class VFXItem extends EffectsObject implements Disposable {
      * 返回元素创建的数据
      */
     get content(): VFXItemContent;
+    /**
+     * 获取元素的合成
+     */
+    get composition(): Composition | null;
+    /**
+     * 设置元素的合成
+     */
+    set composition(value: Composition);
     /**
      * 播放完成后是否需要再使用，是的话生命周期结束后不会 dispose
      */
@@ -295,6 +303,7 @@ export declare class VFXItem extends EffectsObject implements Disposable {
      */
     dispose(): void;
     private resetChildrenParent;
+    private instantiatePreComposition;
 }
 export declare namespace Item {
     function is<T extends spec.Item>(item: spec.Item, type: spec.ItemType): item is T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "2.3.0-alpha.1",
+  "version": "2.3.0-beta.0",
   "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": "2.2.0-alpha.3",
+    "@galacean/effects-specification": "2.2.0-alpha.4",
     "@galacean/effects-math": "1.1.0",
     "flatbuffers": "24.3.25",
     "uuid": "9.0.1",