@galacean/effects-specification 2.0.0-alpha.7 → 2.0.0-alpha.9

package/dist/fallback/migration.d.ts

@@ -1,4 +1,4 @@
-import type { JSONScene, JSONSceneLegacy } from '../src';
+import type { JSONScene, JSONSceneLegacy, BaseContent } from '../src';
 /**
  * 2.1 以下版本数据适配（mars-player@2.4.0 及以上版本支持 2.1 以下数据的适配）
  */
@@ -11,3 +11,8 @@ export declare function version22Migration(json: JSONSceneLegacy): JSONSceneLega
  * 3.0 以下版本数据适配（runtime 2.0及以上版本支持）
  */
 export declare function version30Migration(json: JSONSceneLegacy): JSONScene;
+/**
+ * 2.5 以下版本 赫尔米特数据转换成贝塞尔数据
+ */
+export declare function version24Migration(json: JSONScene): JSONScene;
+export declare function convertParam(content: BaseContent | undefined | null): void;

package/dist/fallback/utils.d.ts

@@ -1,4 +1,4 @@
-import type { FixedNumberExpression, RGBAColorValue, ColorExpression, NumberExpression, GradientColor, FixedVec3Expression, vec4, vec3, vec2 } from '../src';
+import type { FixedNumberExpression, RGBAColorValue, ColorExpression, NumberExpression, GradientColor, FixedVec3Expression, vec4, vec3, BezierKeyframeValue, vec2 } from '../src';
 import { ParticleOrigin } from '../src';
 export declare function arrAdd<T>(arr: T[], item: T): boolean | undefined;
 /**
@@ -22,7 +22,7 @@ export declare function ensureGradient(a: any, normalized?: boolean): GradientCo
 export declare function colorToArr(hex: string | number[], normalized?: boolean): vec4;
 export declare function normalizeColor(a: number[]): number[] | undefined;
 export declare function parsePercent(c: string): number;
-export declare function getGradientColor(color: string | Array<string | number[]>, normalized?: boolean): GradientColor | undefined;
+export declare function getGradientColor(color: string | Array<string | number[]> | GradientColor, normalized?: boolean): GradientColor | undefined;
 export declare function ensureFixedVec3(a: any): FixedVec3Expression | undefined;
 export declare function objectValueToNumber(o: Record<string, any>): object;
 export declare function deleteEmptyValue(o: Record<string, any>): object;
@@ -34,3 +34,4 @@ export declare function generateGUID(): string;
  */
 export declare function convertAnchor(anchor?: vec2, particleOrigin?: ParticleOrigin): vec2;
 export declare const particleOriginTranslateMap: Record<number, vec2>;
+export declare function getBezierCurveFromHermiteInGE(geHermiteCurves: number[][]): BezierKeyframeValue[];

package/dist/fallback.js

@@ -2,7 +2,7 @@
  * Name: @galacean/effects-specification
  * Description: Galacean Effects JSON Specification
  * Author: Ant Group CO., Ltd.
- * Version: v2.0.0-alpha.7
+ * Version: v2.0.0-alpha.9
  */
 
 'use strict';
@@ -926,15 +926,27 @@ function ensureFixedNumber(a) {
         return [ValueType.CONSTANT, a];
     }
     if (a) {
-        if (a[0] === 'lines') {
+        var valueType = a[0];
+        var valueData = a[1];
+        if (Array.isArray(valueType)) {
+            // 没有数据类型的数据
+            return;
+        }
+        if (valueType === 'static' || valueType === ValueType.CONSTANT) {
+            return [ValueType.CONSTANT, a[1]];
+        }
+        if (valueType === 'lines') {
             return [ValueType.LINE, a[1]];
         }
-        if (a[0] === 'curve') {
-            return [ValueType.CURVE, a[1]];
+        if (valueType === ValueType.LINE) {
+            // @ts-expect-error
+            var keyframes = valueData.map(function (data) { return [BezierKeyframeType.LINE, data]; });
+            return [ValueType.BEZIER_CURVE, keyframes];
         }
-        if (a[0] === 'static') {
-            return [ValueType.CONSTANT, a[1]];
+        if (valueType === 'curve' || valueType === ValueType.CURVE) {
+            return [ValueType.BEZIER_CURVE, getBezierCurveFromHermiteInGE(valueData)];
         }
+        return a;
     }
 }
 function ensureFixedNumberWithRandom(a, p) {
@@ -960,6 +972,7 @@ function ensureColorExpression(a, normalized) {
         else if (a[0] === 'color') {
             return [ValueType.RGBA_COLOR, colorToArr(a[1], normalized)];
         }
+        return a;
     }
 }
 function ensureNumberExpression(a) {
@@ -1027,6 +1040,9 @@ function parsePercent(c) {
 }
 function getGradientColor(color, normalized) {
     if (Array.isArray(color)) {
+        if (color[0] === ValueType.GRADIENT_COLOR) {
+            return color;
+        }
         // @ts-expect-error
         return (color[0] === 'gradient' || color[0] === 'color') && ensureGradient(color[1], normalized);
     }
@@ -1039,12 +1055,36 @@ function ensureFixedVec3(a) {
         if (a.length === 3) {
             return [ValueType.CONSTANT_VEC3, a];
         }
-        if (a[0] === 'path') {
-            return [ValueType.LINEAR_PATH, a[1]];
-        }
-        if (a[0] === 'bezier') {
-            return [ValueType.BEZIER_PATH, a[1]];
+        var valueType = a[0];
+        if (valueType === 'path' ||
+            valueType === 'bezier' ||
+            valueType === ValueType.BEZIER_PATH ||
+            valueType === ValueType.LINEAR_PATH) {
+            var valueData = a[1];
+            var easing = valueData[0];
+            var points = valueData[1];
+            var controlPoints = valueData[2];
+            var bezierEasing = getBezierCurveFromHermiteInGE(easing);
+            // linear path没有controlPoints
+            if (!controlPoints) {
+                controlPoints = [];
+                for (var keyframeIndex = 0; keyframeIndex < points.length; keyframeIndex++) {
+                    var point = points[keyframeIndex].slice();
+                    if (keyframeIndex === 0) {
+                        controlPoints.push(point);
+                    }
+                    else if (keyframeIndex < points.length - 1) {
+                        controlPoints.push(point);
+                        controlPoints.push(point);
+                    }
+                    else {
+                        controlPoints.push(point);
+                    }
+                }
+            }
+            return [ValueType.BEZIER_CURVE_PATH, [bezierEasing, points, controlPoints]];
         }
+        return a;
     }
 }
 function objectValueToNumber(o) {
@@ -1162,6 +1202,50 @@ var particleOriginTranslateMap = (_a = {},
     _a[ParticleOrigin.PARTICLE_ORIGIN_RIGHT_BOTTOM] = [0.5, -0.5],
     _a[ParticleOrigin.PARTICLE_ORIGIN_RIGHT_TOP] = [0.5, 0.5],
     _a);
+function getBezierCurveFromHermite(m0, m1, p0, p3) {
+    var xStart = p0[0];
+    var yStart = p0[1];
+    var xEnd = p3[0];
+    var yEnd = p3[1];
+    var dt = xEnd - xStart;
+    m0 = m0 * dt;
+    m1 = m1 * dt;
+    var bezierControlPoints = [[xStart + (xEnd - xStart) / 3, yStart + m0 / 3], [xEnd - (xEnd - xStart) / 3, yEnd - m1 / 3]];
+    return bezierControlPoints;
+}
+function getBezierCurveFromHermiteInGE(geHermiteCurves) {
+    var ymax = -1000000;
+    var ymin = 1000000;
+    for (var i = 0; i < geHermiteCurves.length; i++) {
+        ymax = Math.max(ymax, geHermiteCurves[i][1]);
+        ymin = Math.min(ymin, geHermiteCurves[i][1]);
+    }
+    var geBezierCurves = [[geHermiteCurves[0][0], geHermiteCurves[0][1]]];
+    for (var i = 0; i < geHermiteCurves.length - 1; i++) {
+        var m0 = geHermiteCurves[i][3] * (ymax - ymin);
+        var m1 = geHermiteCurves[i + 1][2] * (ymax - ymin);
+        var p0 = [geHermiteCurves[i][0], geHermiteCurves[i][1]];
+        var p3 = [geHermiteCurves[i + 1][0], geHermiteCurves[i + 1][1]];
+        if (p0[0] != p3[0]) {
+            var bezierControlPoints = getBezierCurveFromHermite(m0, m1, p0, p3);
+            var p1 = bezierControlPoints[0];
+            var p2 = bezierControlPoints[1];
+            geBezierCurves[geBezierCurves.length - 1].push(p1[0]);
+            geBezierCurves[geBezierCurves.length - 1].push(p1[1]);
+            geBezierCurves.push([p2[0], p2[1], p3[0], p3[1]]);
+        }
+        else {
+            geBezierCurves[geBezierCurves.length - 1].push(p3[0]);
+            geBezierCurves[geBezierCurves.length - 1].push(p3[1]);
+        }
+    }
+    // 添加关键帧类型
+    return geBezierCurves.map(function (curve, index) {
+        return index === 0 ? [BezierKeyframeType.EASE_OUT, curve]
+            : index === geBezierCurves.length - 1 ? [BezierKeyframeType.EASE_IN, curve]
+                : [BezierKeyframeType.EASE, curve];
+    });
+}
 
 function getStandardParticleContent(particle) {
     var _a;
@@ -1787,12 +1871,66 @@ function version30Migration(json) {
     result.version = '3.0';
     return result;
 }
+/**
+ * 2.5 以下版本 赫尔米特数据转换成贝塞尔数据
+ */
+function version24Migration(json) {
+    // 曲线转换成贝塞尔
+    json.compositions.map(function (comp) {
+        var e_4, _a;
+        try {
+            for (var _b = __values(comp.items), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var item = _c.value;
+                convertParam(item.content);
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_4) throw e_4.error; }
+        }
+    });
+    return json;
+}
+function convertParam(content) {
+    var e_5, _a;
+    if (!content) {
+        return;
+    }
+    try {
+        for (var _b = __values(Object.keys(content)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var key = _c.value;
+            var value = content[key];
+            var isArray = Array.isArray(value);
+            if (isArray && value.length === 2 && Array.isArray(value[1])) {
+                if (key === 'path') {
+                    content[key] = ensureFixedVec3(value);
+                }
+                else {
+                    content[key] = ensureFixedNumber(value);
+                }
+            }
+            else if (!isArray && typeof value === 'object') {
+                convertParam(value);
+            }
+        }
+    }
+    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_5) throw e_5.error; }
+    }
+}
 
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
 function getStandardJSON(json) {
-    var _a, _b;
+    var _a;
     if (!json || typeof json !== 'object') {
         throw Error('expect a json object');
     }
@@ -1802,9 +1940,14 @@ function getStandardJSON(json) {
         reverseParticle = ((_a = (/^(\d+)/).exec(json.version)) === null || _a === void 0 ? void 0 : _a[0]) === '0';
         return version30Migration(version21Migration(getStandardJSONFromV0(json)));
     }
-    var mainVersion = (_b = standardVersion.exec(json.version)) === null || _b === void 0 ? void 0 : _b[1];
+    var vs = standardVersion.exec(json.version) || [];
+    var mainVersion = Number(vs[1]);
+    var minorVersion = Number(vs[2]);
     if (mainVersion) {
-        if (Number(mainVersion) < 3) {
+        if (mainVersion < 2 || (mainVersion === 2 && minorVersion < 4)) {
+            json = version24Migration(json);
+        }
+        if (mainVersion < 3) {
             return version30Migration(version21Migration(json));
         }
         return json;
@@ -2079,6 +2222,7 @@ exports.ensureRGBAValue = ensureRGBAValue;
 exports.ensureValueGetter = ensureValueGetter;
 exports.forEach = forEach;
 exports.generateGUID = generateGUID;
+exports.getBezierCurveFromHermiteInGE = getBezierCurveFromHermiteInGE;
 exports.getGradientColor = getGradientColor;
 exports.getStandardComposition = getStandardComposition;
 exports.getStandardImage = getStandardImage;