@galacean/effects-core 2.3.0 → 2.3.1

package/dist/components/shape-component.d.ts

@@ -95,7 +95,6 @@ export declare class ShapeComponent extends MeshComponent {
     private hasFill;
     private shapeDirty;
     private graphicsPath;
-    private curveValues;
     private fillAttribute;
     private strokeAttributes;
     private shapeAttribute;

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.3.0
+ * Version: v2.3.1
  */
 
 'use strict';
@@ -930,10 +930,10 @@ var PluginSystem = /*#__PURE__*/ function() {
             });
         })();
     };
-    _proto.precompile = function precompile(compositions, renderer, options) {
+    _proto.precompile = function precompile(compositions, renderer) {
         for(var _iterator = _create_for_of_iterator_helper_loose(this.plugins), _step; !(_step = _iterator()).done;){
             var plugin = _step.value;
-            plugin.precompile(compositions, renderer, options);
+            plugin.precompile(compositions, renderer);
         }
     };
     _proto.loadResources = function loadResources(scene, options) {
@@ -1008,7 +1008,7 @@ function getPluginUsageInfo(name) {
    * 在加载到 JSON 后，就可以进行提前编译
    * @param json
    * @param player
-   */ _proto.precompile = function precompile(compositions, renderer, options) {};
+   */ _proto.precompile = function precompile(compositions, renderer) {};
     _proto.onCompositionConstructed = function onCompositionConstructed(composition, scene) {};
     _proto.onCompositionItemLifeBegin = function onCompositionItemLifeBegin(composition, item) {};
     _proto.onCompositionItemLifeEnd = function onCompositionItemLifeEnd(composition, item) {};
@@ -16327,7 +16327,6 @@ exports.ShapeComponent = /*#__PURE__*/ function(MeshComponent) {
         _this.hasFill = false;
         _this.shapeDirty = true;
         _this.graphicsPath = new GraphicsPath();
-        _this.curveValues = [];
         _this.vert = "\nprecision highp float;\n\nattribute vec3 aPos;//x y\n\nuniform mat4 effects_MatrixVP;\nuniform mat4 effects_MatrixInvV;\nuniform mat4 effects_ObjectToWorld;\n\nvoid main() {\n  vec4 pos = vec4(aPos.xyz, 1.0);\n  gl_Position = effects_MatrixVP * effects_ObjectToWorld * pos;\n}\n";
         _this.frag = "\nprecision highp float;\n\nuniform vec4 _Color;\n\nvoid main() {\n  vec4 color = _Color;\n  color.rgb *= color.a;\n  gl_FragColor = color;\n}\n";
         if (!_this.geometry) {
@@ -16509,31 +16508,25 @@ exports.ShapeComponent = /*#__PURE__*/ function(MeshComponent) {
                     var easingOuts = customShapeAtribute.easingOuts;
                     for(var _iterator = _create_for_of_iterator_helper_loose(customShapeAtribute.shapes), _step; !(_step = _iterator()).done;){
                         var shape = _step.value;
-                        this.curveValues = [];
                         var indices = shape.indexes;
+                        var startPoint = points[indices[0].point];
+                        this.graphicsPath.moveTo(startPoint.x, startPoint.y);
                         for(var i = 1; i < indices.length; i++){
                             var pointIndex = indices[i];
                             var lastPointIndex = indices[i - 1];
-                            this.curveValues.push({
-                                point: points[pointIndex.point],
-                                controlPoint1: easingOuts[lastPointIndex.easingOut],
-                                controlPoint2: easingIns[pointIndex.easingIn]
-                            });
-                        }
-                        // Push the last curve
-                        this.curveValues.push({
-                            point: points[indices[0].point],
-                            controlPoint1: easingOuts[indices[indices.length - 1].easingOut],
-                            controlPoint2: easingIns[indices[0].easingIn]
-                        });
-                        this.graphicsPath.moveTo(this.curveValues[this.curveValues.length - 1].point.x, this.curveValues[this.curveValues.length - 1].point.y);
-                        for(var _iterator1 = _create_for_of_iterator_helper_loose(this.curveValues), _step1; !(_step1 = _iterator1()).done;){
-                            var curveValue = _step1.value;
-                            var point = curveValue.point;
-                            var control1 = curveValue.controlPoint1;
-                            var control2 = curveValue.controlPoint2;
-                            this.graphicsPath.bezierCurveTo(control1.x, control1.y, control2.x, control2.y, point.x, point.y, 1);
+                            var point = points[pointIndex.point];
+                            var lastPoint = points[lastPointIndex.point];
+                            var control1 = easingOuts[lastPointIndex.easingOut];
+                            var control2 = easingIns[pointIndex.easingIn];
+                            this.graphicsPath.bezierCurveTo(control1.x + lastPoint.x, control1.y + lastPoint.y, control2.x + point.x, control2.y + point.y, point.x, point.y, 1);
                         }
+                        var pointIndex1 = indices[0];
+                        var lastPointIndex1 = indices[indices.length - 1];
+                        var point1 = points[pointIndex1.point];
+                        var lastPoint1 = points[lastPointIndex1.point];
+                        var control11 = easingOuts[lastPointIndex1.easingOut];
+                        var control21 = easingIns[pointIndex1.easingIn];
+                        this.graphicsPath.bezierCurveTo(control11.x + lastPoint1.x, control11.y + lastPoint1.y, control21.x + point1.x, control21.y + point1.y, point1.x, point1.y, 1);
                         if (shape.close) {
                             this.graphicsPath.closePath();
                         }
@@ -26654,14 +26647,36 @@ function getStandardInteractContent(ui) {
                     // @ts-expect-error
                     customShapeComponent.fill = customShapeComponent.shapes[0].fill;
                 }
+                // easingIn 和 easingOut 绝对坐标转相对坐标
+                var easingInFlag = new Array(customShapeComponent.easingIns.length);
+                var easingOutFlag = new Array(customShapeComponent.easingOuts.length).fill(false);
+                for(var _iterator1 = _create_for_of_iterator_helper_loose(customShapeComponent.shapes), _step1; !(_step1 = _iterator1()).done;){
+                    var shape = _step1.value;
+                    for(var _iterator2 = _create_for_of_iterator_helper_loose(shape.indexes), _step2; !(_step2 = _iterator2()).done;){
+                        var index = _step2.value;
+                        var point = customShapeComponent.points[index.point];
+                        var easingIn = customShapeComponent.easingIns[index.easingIn];
+                        var easingOut = customShapeComponent.easingOuts[index.easingOut];
+                        if (!easingInFlag[index.easingIn]) {
+                            easingIn.x -= point.x;
+                            easingIn.y -= point.y;
+                            easingInFlag[index.easingIn] = true;
+                        }
+                        if (!easingOutFlag[index.easingOut]) {
+                            easingOut.x -= point.x;
+                            easingOut.y -= point.y;
+                            easingOutFlag[index.easingOut] = true;
+                        }
+                    }
+                }
             }
         }
     }
     // Composition id 转 guid
     var compositionId = json.compositionId;
     var compositionIdToGUIDMap = {};
-    for(var _iterator1 = _create_for_of_iterator_helper_loose(json.compositions), _step1; !(_step1 = _iterator1()).done;){
-        var composition = _step1.value;
+    for(var _iterator3 = _create_for_of_iterator_helper_loose(json.compositions), _step3; !(_step3 = _iterator3()).done;){
+        var composition = _step3.value;
         var guid = generateGUID();
         compositionIdToGUIDMap[composition.id] = guid;
         if (composition.id === compositionId) {
@@ -26670,8 +26685,8 @@ function getStandardInteractContent(ui) {
         composition.id = guid;
     }
     // 预合成元素 refId 同步改为生成的合成 guid
-    for(var _iterator2 = _create_for_of_iterator_helper_loose(json.items), _step2; !(_step2 = _iterator2()).done;){
-        var item = _step2.value;
+    for(var _iterator4 = _create_for_of_iterator_helper_loose(json.items), _step4; !(_step4 = _iterator4()).done;){
+        var item = _step4.value;
         if (item.content) {
             var compositionOptions = item.content.options;
             if (compositionOptions && compositionOptions.refId !== undefined) {
@@ -27525,8 +27540,10 @@ function getStandardJSON(json) {
             json = version30Migration(version21Migration(json));
         }
         // 3.x 版本格式转换
-        if (mainVersion < 4 || mainVersion === 4 && minorVersion < 2) {
-            json = version31Migration(json);
+        if (mainVersion < 4) {
+            if (mainVersion === 3 && minorVersion < 2) {
+                json = version31Migration(json);
+            }
         }
         return json;
     }
@@ -32079,7 +32096,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem);
 registerPlugin("particle", ParticleLoader, exports.VFXItem);
 registerPlugin("cal", CalculateLoader, exports.VFXItem);
 registerPlugin("interact", InteractLoader, exports.VFXItem);
-var version = "2.3.0";
+var version = "2.3.1";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;