@galacean/effects-core 2.9.1-beta.0 → 2.9.1

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.9.1-beta.0
+ * Version: v2.9.1
  */
 
 'use strict';
@@ -32764,21 +32764,37 @@ function version36Migration(json) {
             var itemWorldPerPixel = textItem.transform.scale.x / ((_textComponent_options_textWidth = (_textComponent_options = textComponent.options) == null ? void 0 : _textComponent_options.textWidth) != null ? _textComponent_options_textWidth : 1);
             var defaultWorldPerPixel = 0.0123;
             var scaleFactor = itemWorldPerPixel / defaultWorldPerPixel;
+            var oldScaleX = textItem.transform.scale.x;
+            var oldScaleY = textItem.transform.scale.y;
+            var oldScaleZ = textItem.transform.scale.z;
             for(var _iterator = _create_for_of_iterator_helper_loose(json.items), _step1; !(_step1 = _iterator()).done;){
                 var item = _step1.value;
                 if (item.parentId === textItem.id && item.transform) {
-                    item.transform.scale.x *= textItem.transform.scale.x / scaleFactor;
-                    item.transform.scale.y *= textItem.transform.scale.y / scaleFactor;
-                    item.transform.scale.z *= textItem.transform.scale.z / scaleFactor;
+                    item.transform.scale.x *= oldScaleX / scaleFactor;
+                    item.transform.scale.y *= oldScaleY / scaleFactor;
+                    item.transform.scale.z *= oldScaleZ / scaleFactor;
                 }
             }
             textItem.transform.scale.x = scaleFactor;
             textItem.transform.scale.y = scaleFactor;
             textItem.transform.scale.z = scaleFactor;
+            textItemScaleInfos.push({
+                item: textItem,
+                scaleFactor: scaleFactor,
+                oldScaleX: oldScaleX,
+                oldScaleY: oldScaleY,
+                oldScaleZ: oldScaleZ
+            });
         }
     };
+    var _json_animations;
     // 兼容老数据 text item 的 transform scale 问题，老版本 text item 的 scale 实际上是 size，新的版本中 scale 和 size 分离
+    var textItemScaleInfos = [];
     for(var _iterator = _create_for_of_iterator_helper_loose(json.items), _step; !(_step = _iterator()).done;)_loop();
+    // 迁移 AnimationClip 中指向 text item 的 scaleCurves 关键帧
+    if (textItemScaleInfos.length > 0 && ((_json_animations = json.animations) == null ? void 0 : _json_animations.length)) {
+        migrateTextScaleCurves(json, textItemScaleInfos);
+    }
     // 生成 item 的 children 字段，CompositionComponent 的 children 字段
     var itemMap = new Map();
     var compositionMap = new Map();
@@ -33183,6 +33199,181 @@ function convertSpineData(resource, content, jsonScene) {
         })
     };
 }
+/**
+ * 批量迁移所有指向 textItem（或其子元素）的 scaleCurves 关键帧。
+ * Animator 组件挂在 composition 上，path 从 composition 的顶层 item 开始解析。
+ * 所有 Map 只构建一次，避免每个 text item 重复分配。
+ */ function migrateTextScaleCurves(json, textItemScaleInfos) {
+    // 建立 id → item 和 id → children 映射
+    var idToItem = new Map();
+    var childrenMap = new Map();
+    for(var _iterator = _create_for_of_iterator_helper_loose(json.items), _step; !(_step = _iterator()).done;){
+        var item = _step.value;
+        idToItem.set(item.id, item);
+        if (item.parentId) {
+            var children = childrenMap.get(item.parentId);
+            if (!children) {
+                children = [];
+                childrenMap.set(item.parentId, children);
+            }
+            children.push(item);
+        }
+    }
+    // 为每个 textItem 收集子孙 id 集合，并建立 targetId → scaleInfo 的快速查找
+    var textItemIdToInfo = new Map();
+    var textChildIdToInfo = new Map();
+    for(var _iterator1 = _create_for_of_iterator_helper_loose(textItemScaleInfos), _step1; !(_step1 = _iterator1()).done;){
+        var info = _step1.value;
+        textItemIdToInfo.set(info.item.id, info);
+        // 只收集直接子节点，深层后代已通过直接子节点的静态 scale 调整继承了正确的变换
+        var children1 = childrenMap.get(info.item.id);
+        if (children1) {
+            for(var _iterator2 = _create_for_of_iterator_helper_loose(children1), _step2; !(_step2 = _iterator2()).done;){
+                var child = _step2.value;
+                textChildIdToInfo.set(child.id, info);
+            }
+        }
+    }
+    // 建立 component id → component 映射
+    var componentMap = new Map();
+    for(var _iterator3 = _create_for_of_iterator_helper_loose(json.components), _step3; !(_step3 = _iterator3()).done;){
+        var comp = _step3.value;
+        componentMap.set(comp.id, comp);
+    }
+    // 建立 animation id → data 映射
+    var animationMap = new Map();
+    for(var _iterator4 = _create_for_of_iterator_helper_loose(json.animations), _step4; !(_step4 = _iterator4()).done;){
+        var anim = _step4.value;
+        animationMap.set(anim.id, anim);
+    }
+    // 遍历所有 composition，找 Animator 组件并处理其 scaleCurves
+    for(var _iterator5 = _create_for_of_iterator_helper_loose(json.compositions), _step5; !(_step5 = _iterator5()).done;){
+        var composition = _step5.value;
+        var _animatorData_graphAsset, _graphAsset_graphDataSet;
+        var animatorComp = void 0;
+        var compositionComp = void 0;
+        for(var _iterator6 = _create_for_of_iterator_helper_loose(composition.components), _step6; !(_step6 = _iterator6()).done;){
+            var compRef = _step6.value;
+            var comp1 = componentMap.get(compRef.id);
+            if ((comp1 == null ? void 0 : comp1.dataType) === DataType.Animator) {
+                animatorComp = comp1;
+            } else if ((comp1 == null ? void 0 : comp1.dataType) === DataType.CompositionComponent) {
+                compositionComp = comp1;
+            }
+            if (animatorComp && compositionComp) {
+                break;
+            }
+        }
+        if (!animatorComp) {
+            continue;
+        }
+        // 获取 composition 的顶层 items
+        var topItems = void 0;
+        if (compositionComp) {
+            var ccData = compositionComp;
+            var items = ccData.items;
+            if (items) {
+                topItems = [];
+                for(var _iterator7 = _create_for_of_iterator_helper_loose(items), _step7; !(_step7 = _iterator7()).done;){
+                    var ref = _step7.value;
+                    var item1 = idToItem.get(ref.id);
+                    if (item1 && !item1.parentId) {
+                        topItems.push(item1);
+                    }
+                }
+            }
+        }
+        if ((!topItems || topItems.length === 0) && composition.children) {
+            topItems = [];
+            for(var _iterator8 = _create_for_of_iterator_helper_loose(composition.children), _step8; !(_step8 = _iterator8()).done;){
+                var ref1 = _step8.value;
+                var item2 = idToItem.get(ref1.id);
+                if (item2) {
+                    topItems.push(item2);
+                }
+            }
+        }
+        if (!topItems || topItems.length === 0) {
+            continue;
+        }
+        // 获取 Animator 关联的 AnimationClip
+        var animatorData = animatorComp;
+        var graphAsset = animationMap.get((_animatorData_graphAsset = animatorData.graphAsset) == null ? void 0 : _animatorData_graphAsset.id);
+        if (!(graphAsset == null ? void 0 : (_graphAsset_graphDataSet = graphAsset.graphDataSet) == null ? void 0 : _graphAsset_graphDataSet.resources)) {
+            continue;
+        }
+        for(var _iterator9 = _create_for_of_iterator_helper_loose(graphAsset.graphDataSet.resources), _step9; !(_step9 = _iterator9()).done;){
+            var clipRef = _step9.value;
+            var clip = animationMap.get(clipRef.id);
+            if (!(clip == null ? void 0 : clip.scaleCurves)) {
+                continue;
+            }
+            for(var _iterator10 = _create_for_of_iterator_helper_loose(clip.scaleCurves), _step10; !(_step10 = _iterator10()).done;){
+                var scaleCurve = _step10.value;
+                var target = resolveTargetFromTopItems(topItems, scaleCurve.path, childrenMap);
+                if (!target) {
+                    continue;
+                }
+                var selfInfo = textItemIdToInfo.get(target.id);
+                if (selfInfo) {
+                    // 曲线指向 textItem 自身：从旧 scale 空间转换到新 scale 空间
+                    scaleVector3CurveKeyFrames(scaleCurve.keyFrames, selfInfo.scaleFactor / selfInfo.oldScaleX, selfInfo.scaleFactor / selfInfo.oldScaleY, selfInfo.scaleFactor / selfInfo.oldScaleZ);
+                    continue;
+                }
+                var childInfo = textChildIdToInfo.get(target.id);
+                if (childInfo) {
+                    // 曲线指向 textItem 的子元素：补偿父元素 scale 变化
+                    scaleVector3CurveKeyFrames(scaleCurve.keyFrames, childInfo.oldScaleX / childInfo.scaleFactor, childInfo.oldScaleY / childInfo.scaleFactor, childInfo.oldScaleZ / childInfo.scaleFactor);
+                }
+            }
+        }
+    }
+}
+function resolveTargetFromTopItems(topItems, path, childrenMap) {
+    var _loop = function(i) {
+        var _childrenMap_get;
+        current = (_childrenMap_get = childrenMap.get(current.id)) == null ? void 0 : _childrenMap_get.find(function(c) {
+            return c.name === segments[i];
+        });
+    };
+    if (!path) {
+        return undefined;
+    }
+    var segments = path.split("/");
+    var current = topItems.find(function(item) {
+        return item.name === segments[0];
+    });
+    for(var i = 1; i < segments.length && current; i++)_loop(i);
+    return current;
+}
+function scaleVector3CurveKeyFrames(keyFrames, factorX, factorY, factorZ) {
+    if (!Array.isArray(keyFrames) || keyFrames[0] !== ValueType.VECTOR3_CURVE) {
+        return;
+    }
+    var value = keyFrames[1];
+    if (!Array.isArray(value) || value.length !== 3) {
+        return;
+    }
+    scaleBezierValue(value[0], factorX);
+    scaleBezierValue(value[1], factorY);
+    scaleBezierValue(value[2], factorZ);
+}
+function scaleBezierValue(bezier, factor) {
+    if (!Array.isArray(bezier) || bezier[0] !== ValueType.BEZIER_CURVE || !Array.isArray(bezier[1])) {
+        return;
+    }
+    var keyframes = bezier[1];
+    for(var _iterator = _create_for_of_iterator_helper_loose(keyframes), _step; !(_step = _iterator()).done;){
+        var kf = _step.value;
+        if (!Array.isArray(kf) || kf.length < 2 || !Array.isArray(kf[1])) {
+            continue;
+        }
+        var values = kf[1];
+        for(var i = 1; i < values.length; i += 2){
+            values[i] *= factor;
+        }
+    }
+}
 
 function getStandardParticleContent(particle) {
     var options = particle.options;
@@ -33459,7 +33650,7 @@ function getStandardSpriteContent(sprite, transform) {
     return ret;
 }
 
-var version$1 = "2.9.1-beta.0";
+var version$1 = "2.9.1";
 var v0 = /^(\d+)\.(\d+)\.(\d+)(-(\w+)\.\d+)?$/;
 var standardVersion = /^(\d+)\.(\d+)$/;
 var reverseParticle = false;
@@ -38513,7 +38704,7 @@ registerPlugin("text", TextLoader);
 registerPlugin("sprite", SpriteLoader);
 registerPlugin("particle", ParticleLoader);
 registerPlugin("interact", InteractLoader);
-var version = "2.9.1-beta.0";
+var version = "2.9.1";
 logger.info("Core version: " + version + ".");
 
 exports.ActivationMixerPlayable = ActivationMixerPlayable;