@galacean/effects-core 1.3.1 → 1.4.0-beta.1

package/dist/math/bezier.d.ts

@@ -0,0 +1,84 @@
+import type * as spec from '@galacean/effects-specification';
+import { Vector2 } from '@galacean/effects-math/es/core/vector2';
+import { Vector3 } from '@galacean/effects-math/es/core/vector3';
+export declare class BezierLengthData {
+    points: Array<{
+        partialLength: number;
+        point: Vector3;
+    }>;
+    totalLength: number;
+    constructor(points: Array<{
+        partialLength: number;
+        point: Vector3;
+    }>, totalLength: number);
+}
+export declare const BezierMap: Record<string, BezierEasing>;
+export declare const BezierDataMap: Record<string, BezierLengthData>;
+/**
+ * @param p1 起始点
+ * @param p2 终点
+ * @param p3 起始控制点
+ * @param p4 终止控制点
+ * @returns
+ */
+export declare function buildBezierData(p1: Vector3, p2: Vector3, p3: Vector3, p4: Vector3): {
+    data: BezierLengthData;
+    interval: Vector3;
+};
+export declare class BezierPath {
+    p1: Vector3;
+    p2: Vector3;
+    p3: Vector3;
+    p4: Vector3;
+    readonly lengthData: BezierLengthData;
+    readonly interval: Vector3;
+    readonly totalLength: number;
+    private catching;
+    constructor(p1: Vector3, p2: Vector3, p3: Vector3, p4: Vector3);
+    /**
+     * 获取路径在指定比例长度上点的坐标
+     * @param percent 路径长度的比例
+     */
+    getPointInPercent(percent: number): Vector3;
+}
+export declare class BezierEasing {
+    mX1: number;
+    mY1: number;
+    mX2: number;
+    mY2: number;
+    private precomputed;
+    private mSampleValues;
+    constructor(mX1: number, mY1: number, mX2: number, mY2: number);
+    precompute(): void;
+    getValue(x: number): number;
+    calcSampleValues(): void;
+    getTForX(aX: number): number;
+}
+export declare function buildEasingCurve(leftKeyframe: spec.BezierKeyframeValue, rightKeyframe: spec.BezierKeyframeValue): {
+    points: Vector2[];
+    timeInterval: number;
+    valueInterval: number;
+    curve: BezierEasing;
+};
+/**
+ * 根据关键帧类型获取贝塞尔曲线上的关键点
+ */
+export declare function getControlPoints(leftKeyframe: spec.BezierKeyframeValue, rightKeyframe: spec.BezierKeyframeValue, lineToBezier: boolean): ({
+    type: 'ease';
+    p0: Vector2;
+    p1: Vector2;
+    p2: Vector2;
+    p3: Vector2;
+    isHold?: boolean;
+    leftHoldLine?: boolean;
+    rightHoldLine?: boolean;
+} | {
+    type: 'line';
+    p0: Vector2;
+    p1: Vector2;
+    p2?: Vector2;
+    p3?: Vector2;
+    isHold?: boolean;
+    leftHoldLine?: boolean;
+    rightHoldLine?: boolean;
+});

package/dist/math/keyframe-info.d.ts

@@ -0,0 +1,39 @@
+import { Vector2 } from '@galacean/effects-math/es/core/vector2';
+import * as spec from '@galacean/effects-specification';
+export declare const keyframeInfo: {
+    /**
+     * 根据不同关键帧类型，获取位于曲线上的点
+     */
+    getPointInCurve(keyframe: spec.BezierKeyframeValue): Vector2;
+    /**
+     * 根据不同关键帧类型，获取位于曲线上的点的索引
+     */
+    getPointIndexInCurve(keyframe: spec.BezierKeyframeValue): {
+        xIndex: number;
+        yIndex: number;
+    };
+    /**
+     * 关键帧左侧是否为缓动类型（否则为线段）
+     */
+    isLeftSideEase(keyframe: spec.BezierKeyframeValue): keyframe is spec.EaseKeyframeValue | spec.EaseInKeyframeValue | spec.EaseHoldOutKeyframeValue;
+    /**
+     * 关键帧右侧是否为缓动类型（否则为线段）
+     */
+    isRightSideEase(keyframe: spec.BezierKeyframeValue): keyframe is spec.EaseKeyframeValue | spec.EaseOutKeyframeValue | spec.EaseHoldInKeyframeValue;
+    /**
+     * 关键帧左侧是否为缓动类型（否则为线段）
+     */
+    isKeyframeTypeLeftSideEase(keyframeType: spec.BezierKeyframeType): boolean;
+    /**
+     * 关键帧右侧是否为缓动类型（否则为线段）
+     */
+    isKeyframeTypeRightSideEase(keyframeType: spec.BezierKeyframeType): boolean;
+    /**
+     * 是否为定格进关键帧
+     */
+    isHoldInKeyframe(keyframe: spec.BezierKeyframeValue): boolean;
+    /**
+     * 是否为定格出关键帧
+     */
+    isHoldOutKeyframe(keyframe: spec.BezierKeyframeValue): boolean;
+};

package/dist/math/utils.d.ts

@@ -1,7 +1,8 @@
 import * as spec from '@galacean/effects-specification';
 import type { vec2, vec3, vec4 } from '@galacean/effects-specification';
-import type { TriangleLike } from '@galacean/effects-math/es/core/index';
-import { Vector3, Ray } from '@galacean/effects-math/es/core/index';
+import { Vector3 } from '@galacean/effects-math/es/core/vector3';
+import { Ray } from '@galacean/effects-math/es/core/ray';
+import type { TriangleLike } from '@galacean/effects-math/es/core/type';
 import type { Camera } from '../camera';
 export type vec = number[];
 export declare function ensureVec3(num?: any): vec3;
@@ -17,3 +18,6 @@ export declare function convertAnchor(anchor?: vec2, particleOrigin?: spec.Parti
 export declare function nearestPowerOfTwo(value: number): number;
 export declare function setRayFromCamera(x: number, y: number, camera: Camera): Ray;
 export declare function trianglesFromRect(position: Vector3, halfWidth: number, halfHeight: number): TriangleLike[];
+export declare function decimalEqual(a: number, b: number, epsilon?: number): boolean;
+export declare function numberToFix(a: number, fixed?: number): number;
+export declare function pointOnLine(x1: number, y1: number, x2: number, y2: number, x3: number, y3: number): boolean;

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

@@ -1,5 +1,9 @@
+import type { Vector2 } from '@galacean/effects-math/es/core/vector2';
+import { Vector3 } from '@galacean/effects-math/es/core/vector3';
 import * as spec from '@galacean/effects-specification';
 import type { ColorStop } from '../utils';
+import type { BezierEasing } from './bezier';
+import { BezierPath } from './bezier';
 interface KeyFrameMeta {
     curves: ValueGetter<any>[];
     index: number;
@@ -8,6 +12,7 @@ interface KeyFrameMeta {
     curveCount: number;
 }
 export declare class ValueGetter<T> {
+    static getAllData(meta: KeyFrameMeta, halfFloat?: boolean): Uint16Array | Float32Array;
     constructor(arg: any);
     onCreate(props: any): void;
     getIntegrateValue(t0: number, t1: number, timeScale?: number): T;
@@ -16,6 +21,7 @@ export declare class ValueGetter<T> {
     toUniform(meta: KeyFrameMeta): Float32Array;
     map(func: (n: T) => T): void;
     scaleXCoord(scale: number): ValueGetter<T>;
+    toData(): ArrayLike<number>;
 }
 export declare class StaticValue extends ValueGetter<number> {
     private value;
@@ -65,28 +71,6 @@ export declare class GradientValue extends ValueGetter<number[]> {
     getStops(): ColorStop[];
     getValue(time: number): number[];
 }
-export type KeyFrame = {
-    inTangent: number;
-    outTangent: number;
-    time: number;
-    value: number;
-};
-export declare class CurveValue extends ValueGetter<number> {
-    keys: KeyFrame[] | number[][];
-    min: number;
-    dist: number;
-    isCurveValue: boolean;
-    static getAllData(meta: KeyFrameMeta, halfFloat?: boolean): Uint16Array | Float32Array;
-    onCreate(props: number[] & number[][]): void;
-    getValue(time: number): number;
-    getIntegrateByTime(t0: number, t1: number): number;
-    getIntegrateValue(t0: number, t1: number, ts: number): number;
-    integrate(time: number, byTime: boolean): number;
-    toData(): Float32Array;
-    toUniform(meta: any): Float32Array;
-    map(func: (num: number) => number): this;
-    scaleXCoord(scale: number): this;
-}
 export declare class LineSegments extends ValueGetter<number> {
     isLineSeg: boolean;
     keys: number[][];
@@ -103,17 +87,34 @@ export declare class LineSegments extends ValueGetter<number> {
     map(func: (k: number) => number): this;
     scaleXCoord(scale: number): this;
 }
-export declare class PathSegments extends ValueGetter<number[]> {
+export declare class BezierCurve extends ValueGetter<number> {
+    curveMap: Record<string, {
+        points: Vector2[];
+        timeInterval: number;
+        valueInterval: number;
+        curve: BezierEasing;
+    }>;
     keys: number[][];
-    values: number[][];
-    onCreate(props: number[][][]): void;
-    getValue(time: number): number[];
-    calculateVec(i: number, dt: number): number[];
+    onCreate(props: spec.BezierKeyframeValue[]): void;
+    getValue(time: number): number;
+    getIntegrateValue(t0: number, t1: number, ts?: number): number;
+    getIntegrateByTime(t0: number, t1: number): number;
+    getCurveIntegrateValue(curveKey: string, time: number): number;
+    getCurveValue(curveKey: string, time: number): number;
+    toUniform(meta: KeyFrameMeta): Float32Array;
+    toData(): Float32Array;
 }
-export declare class BezierSegments extends PathSegments {
-    cps: number[][];
-    onCreate(props: number[][][]): void;
-    calculateVec(i: number, t: number): number[];
+export declare class BezierCurvePath extends ValueGetter<Vector3> {
+    curveSegments: Record<string, {
+        points: Vector2[];
+        easingCurve: BezierEasing;
+        timeInterval: number;
+        valueInterval: number;
+        pathCurve: BezierPath;
+    }>;
+    onCreate(props: spec.BezierCurvePathValue): void;
+    getValue(time: number): Vector3;
+    getPercValue(curveKey: string, time: number): number;
 }
 export declare function createValueGetter(args: any): ValueGetter<any>;
 export declare function getKeyFrameMetaByRawValue(meta: KeyFrameMeta, value?: [type: spec.ValueType, value: any]): void;

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

@@ -1,4 +1,4 @@
-import * as spec from '@galacean/effects-specification';
+import type * as spec from '@galacean/effects-specification';
 import type { Composition } from '../../composition';
 import type { Renderer, RenderFrame } from '../../render';
 import { type VFXItem } from '../../vfx-item';

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

@@ -1,8 +1,9 @@
 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 { Matrix4 } from '@galacean/effects-math/es/core/matrix4';
+import { Vector2 } from '@galacean/effects-math/es/core/vector2';
+import { Vector3 } from '@galacean/effects-math/es/core/vector3';
 import type { Composition } from '../../composition';
-import type { ValueGetter } from '../../math';
+import { ValueGetter } from '../../math';
 import type { SharedShaderWithSource, GPUCapability } from '../../render';
 import { Geometry, Mesh } from '../../render';
 import { Texture } from '../../texture';

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

@@ -25,3 +25,4 @@ export declare class ParticleVFXItem extends VFXItem<ParticleSystem> {
     getBoundingBox(): void | BoundingBoxSphere;
     getHitTestParams(force?: boolean): void | HitTestCustomParams;
 }
+export declare const particleUniformTypeMap: Record<string, string>;

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 { Vector3 } from '@galacean/effects-math/es/core/vector3';
+import type { Matrix4 } from '@galacean/effects-math/es/core/matrix4';
+import { ValueGetter } from '../../math';
 import type { ShaderWithSource, GPUCapability } from '../../render';
 import { Geometry, Mesh } from '../../render';
 import { Texture } from '../../texture';
 import type { Engine } from '../../engine';
-import type { ValueGetter } from '../../math';
 export type TrailMeshConstructor = {
     maxTrailCount: number;
     pointCountPerTrail: number;

package/dist/semantic-map.d.ts

@@ -8,7 +8,7 @@ export declare class SemanticMap implements Disposable {
     constructor(semantics?: Record<string, SemanticGetter>);
     toObject(): Record<string, SemanticGetter>;
     setSemantic(name: string, value?: SemanticGetter): void;
-    getSemanticValue(name: string, state: RenderingData): number | Float32Array | Int32Array | Float64Array | Uint8Array | Uint32Array | Uint16Array | Int8Array | Int16Array | number[] | number[][] | import("@galacean/effects-math/es").Matrix4 | import("@galacean/effects-math/es").Vector3 | import("./texture").Texture | import("@galacean/effects-math/es").Vector2 | import("@galacean/effects-math/es").Vector4 | import("@galacean/effects-math/es").Matrix3 | import("./texture").Texture[] | import("./material").UniformStruct | import("./material").UniformStruct[] | SemanticFunc | undefined;
+    getSemanticValue(name: string, state: RenderingData): number | Float32Array | Int32Array | Float64Array | Uint8Array | Uint32Array | Uint16Array | Int8Array | Int16Array | number[] | number[][] | import("@galacean/effects-math/es").Vector2 | import("@galacean/effects-math/es").Vector3 | import("@galacean/effects-math/es").Matrix4 | import("./texture").Texture | import("@galacean/effects-math/es").Vector4 | import("@galacean/effects-math/es").Matrix3 | import("./texture").Texture[] | import("./material").UniformStruct | import("./material").UniformStruct[] | SemanticFunc | undefined;
     hasSemanticValue(name: string): boolean;
     dispose(): void;
 }

package/dist/shader/index.d.ts

@@ -4,7 +4,6 @@ export { default as compatibleVert } from './compatible.vert.glsl';
 export { default as itemFrameFrag } from './item-frame.frag.glsl';
 export { default as integrate } from './integrate.glsl';
 export { default as itemVert } from './item.vert.glsl';
-export { default as itemDefine } from './item.define.glsl';
 export { default as itemFrag } from './item.frag.glsl';
 export { default as particleFrag } from './particle.frag.glsl';
 export { default as particleVert } from './particle.vert.glsl';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "1.3.1",
+  "version": "1.4.0-beta.1",
   "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.1.0",
+    "@galacean/effects-specification": "1.2.0-beta.0",
     "@galacean/effects-math": "1.0.1"
   },
   "scripts": {