@galacean/effects 2.0.0-alpha.13 → 2.0.0-alpha.14

package/dist/alipay.js

@@ -18492,7 +18492,7 @@ exports.TransformPlayableAsset = __decorate([
     _proto.processFrame = function processFrame(context) {};
     return ActivationPlayable;
 }(Playable);
-var ActivationPlayableAsset = /*#__PURE__*/ function(PlayableAsset) {
+exports.ActivationPlayableAsset = /*#__PURE__*/ function(PlayableAsset) {
     _inherits(ActivationPlayableAsset, PlayableAsset);
     function ActivationPlayableAsset() {
         return PlayableAsset.apply(this, arguments);
@@ -18503,6 +18503,9 @@ var ActivationPlayableAsset = /*#__PURE__*/ function(PlayableAsset) {
     };
     return ActivationPlayableAsset;
 }(PlayableAsset);
+exports.ActivationPlayableAsset = __decorate([
+    effectsClass("ActivationPlayableAsset")
+], exports.ActivationPlayableAsset);
 exports.AnimationClip = /*#__PURE__*/ function(EffectsObject) {
     _inherits(AnimationClip, EffectsObject);
     function AnimationClip() {
@@ -18684,6 +18687,9 @@ exports.TrackAsset = /*#__PURE__*/ function(PlayableAsset) {
     _proto.getChildTracks = function getChildTracks() {
         return this.children;
     };
+    _proto.addChild = function addChild(child) {
+        this.children.push(child);
+    };
     _proto.createClip = function createClip(classConstructor, name) {
         var newClip = new exports.TimelineClip();
         newClip.asset = new classConstructor(this.engine);
@@ -18761,9 +18767,10 @@ var RuntimeClip = /*#__PURE__*/ function() {
         var weight = 1.0;
         var ended = false;
         var started = false;
+        var boundItem = this.track.binding;
         if (localTime > clip.start + clip.duration + 0.001 && clip.endBehaviour === ItemEndBehavior.destroy) {
-            var _this_track_binding_getComponent;
-            if (exports.VFXItem.isParticle(this.track.binding) && !((_this_track_binding_getComponent = this.track.binding.getComponent(exports.ParticleSystem)) == null ? void 0 : _this_track_binding_getComponent.destroyed)) {
+            var _boundItem_getComponent;
+            if (exports.VFXItem.isParticle(boundItem) && !((_boundItem_getComponent = boundItem.getComponent(exports.ParticleSystem)) == null ? void 0 : _boundItem_getComponent.destroyed)) {
                 weight = 1.0;
             } else {
                 weight = 0.0;
@@ -18779,7 +18786,6 @@ var RuntimeClip = /*#__PURE__*/ function() {
             this.playable.play();
         }
         this.parentMixer.setInputWeight(this.playable, weight);
-        var boundItem = this.track.binding;
         // 判断动画是否结束
         if (ended && !boundItem.ended) {
             boundItem.ended = true;
@@ -18816,6 +18822,64 @@ var RuntimeClip = /*#__PURE__*/ function() {
     return RuntimeClip;
 }();
 
+exports.ObjectBindingTrack = /*#__PURE__*/ function(TrackAsset1) {
+    _inherits(ObjectBindingTrack, TrackAsset1);
+    function ObjectBindingTrack() {
+        return TrackAsset1.apply(this, arguments);
+    }
+    var _proto = ObjectBindingTrack.prototype;
+    _proto.create = function create(timelineAsset) {
+        var boundItem = this.binding;
+        this.options = {
+            start: boundItem.start,
+            duration: boundItem.duration,
+            looping: boundItem.endBehavior === ItemEndBehavior.loop,
+            endBehavior: boundItem.endBehavior || ItemEndBehavior.destroy
+        };
+        this.name = boundItem.name;
+        // 添加粒子动画 clip
+        if (boundItem.getComponent(exports.ParticleSystem)) {
+            var particleTrack = timelineAsset.createTrack(exports.TrackAsset, this, "ParticleTrack");
+            particleTrack.binding = this.binding;
+            var particleClip = particleTrack.createClip(ParticleBehaviourPlayableAsset);
+            particleClip.start = boundItem.start;
+            particleClip.duration = boundItem.duration;
+            particleClip.endBehaviour = boundItem.endBehavior;
+        }
+    };
+    _proto.toLocalTime = function toLocalTime(time) {
+        var localTime = time - this.options.start;
+        var duration = this.options.duration;
+        if (localTime - duration > 0.001) {
+            if (this.options.endBehavior === END_BEHAVIOR_RESTART) {
+                localTime = localTime % duration;
+            } else if (this.options.endBehavior === END_BEHAVIOR_FREEZE) {
+                localTime = Math.min(duration, localTime);
+            }
+        }
+        return localTime;
+    };
+    _proto.fromData = function fromData(data) {
+        TrackAsset1.prototype.fromData.call(this, data);
+        this.data = data;
+    };
+    return ObjectBindingTrack;
+}(exports.TrackAsset);
+exports.ObjectBindingTrack = __decorate([
+    effectsClass("ObjectBindingTrack")
+], exports.ObjectBindingTrack);
+
+exports.TransformTrack = /*#__PURE__*/ function(TrackAsset) {
+    _inherits(TransformTrack, TrackAsset);
+    function TransformTrack() {
+        return TrackAsset.apply(this, arguments);
+    }
+    return TransformTrack;
+}(exports.TrackAsset);
+exports.TransformTrack = __decorate([
+    effectsClass("TransformTrack")
+], exports.TransformTrack);
+
 var ActivationMixerPlayable = /*#__PURE__*/ function(Playable) {
     _inherits(ActivationMixerPlayable, Playable);
     function ActivationMixerPlayable() {
@@ -18870,6 +18934,9 @@ exports.ActivationTrack = /*#__PURE__*/ function(TrackAsset) {
         return TrackAsset.apply(this, arguments);
     }
     var _proto = ActivationTrack.prototype;
+    _proto.initializeBinding = function initializeBinding(parentBinding) {
+        this.binding = parentBinding;
+    };
     _proto.createTrackMixer = function createTrackMixer(graph) {
         return new ActivationMixerPlayable(graph);
     };
@@ -18879,85 +18946,6 @@ exports.ActivationTrack = __decorate([
     effectsClass("ActivationTrack")
 ], exports.ActivationTrack);
 
-exports.ObjectBindingTrack = /*#__PURE__*/ function(TrackAsset1) {
-    _inherits(ObjectBindingTrack, TrackAsset1);
-    function ObjectBindingTrack() {
-        var _this;
-        _this = TrackAsset1.apply(this, arguments) || this;
-        _this.trackSeed = 0;
-        return _this;
-    }
-    var _proto = ObjectBindingTrack.prototype;
-    _proto.create = function create() {
-        this.options = {
-            start: this.binding.start,
-            duration: this.binding.duration,
-            looping: this.binding.endBehavior === ItemEndBehavior.loop,
-            endBehavior: this.binding.endBehavior || ItemEndBehavior.destroy
-        };
-        this.id = this.binding.id;
-        this.name = this.binding.name;
-        var activationTrack = this.createTrack(exports.ActivationTrack, "ActivationTrack");
-        activationTrack.binding = this.binding;
-        activationTrack.createClip(ActivationPlayableAsset, "ActivationTimelineClip");
-        // 添加粒子动画 clip
-        if (this.binding.getComponent(exports.ParticleSystem)) {
-            var particleTrack = this.createTrack(exports.TrackAsset, "ParticleTrack");
-            particleTrack.binding = this.binding;
-            particleTrack.createClip(ParticleBehaviourPlayableAsset);
-        }
-        // TODO TimelineClip 需要传入 start 和 duration 数据
-        for(var _iterator = _create_for_of_iterator_helper_loose(this.children), _step; !(_step = _iterator()).done;){
-            var track = _step.value;
-            for(var _iterator1 = _create_for_of_iterator_helper_loose(track.getClips()), _step1; !(_step1 = _iterator1()).done;){
-                var clip = _step1.value;
-                clip.start = this.binding.start;
-                clip.duration = this.binding.duration;
-                clip.endBehaviour = this.binding.endBehavior;
-            }
-        }
-    };
-    _proto.toLocalTime = function toLocalTime(time) {
-        var localTime = time - this.options.start;
-        var duration = this.options.duration;
-        if (localTime - duration > 0.001) {
-            if (this.options.endBehavior === END_BEHAVIOR_RESTART) {
-                localTime = localTime % duration;
-            } else if (this.options.endBehavior === END_BEHAVIOR_FREEZE) {
-                localTime = Math.min(duration, localTime);
-            }
-        }
-        return localTime;
-    };
-    _proto.createTrack = function createTrack(classConstructor, name) {
-        var newTrack = new classConstructor(this.engine);
-        newTrack.binding = this.binding;
-        newTrack.id = (this.trackSeed++).toString();
-        newTrack.name = name ? name : "Track" + newTrack.id;
-        this.children.push(newTrack);
-        return newTrack;
-    };
-    _proto.fromData = function fromData(data) {
-        TrackAsset1.prototype.fromData.call(this, data);
-        this.data = data;
-    };
-    return ObjectBindingTrack;
-}(exports.TrackAsset);
-exports.ObjectBindingTrack = __decorate([
-    effectsClass("ObjectBindingTrack")
-], exports.ObjectBindingTrack);
-
-exports.TransformTrack = /*#__PURE__*/ function(TrackAsset) {
-    _inherits(TransformTrack, TrackAsset);
-    function TransformTrack() {
-        return TrackAsset.apply(this, arguments);
-    }
-    return TransformTrack;
-}(exports.TrackAsset);
-exports.TransformTrack = __decorate([
-    effectsClass("TransformTrack")
-], exports.TransformTrack);
-
 exports.SpriteColorTrack = /*#__PURE__*/ function(TrackAsset) {
     _inherits(SpriteColorTrack, TrackAsset);
     function SpriteColorTrack() {
@@ -18982,14 +18970,27 @@ exports.TimelineAsset = /*#__PURE__*/ function(PlayableAsset) {
         this.graph = graph;
         var timelinePlayable = new TimelinePlayable(graph);
         timelinePlayable.setTraversalMode(PlayableTraversalMode.Passthrough);
+        for(var _iterator = _create_for_of_iterator_helper_loose(this.tracks), _step; !(_step = _iterator()).done;){
+            var track = _step.value;
+            if (_instanceof1(track, exports.ObjectBindingTrack)) {
+                track.create(this);
+            }
+        }
         timelinePlayable.compileTracks(graph, this.tracks);
         return timelinePlayable;
     };
-    _proto.fromData = function fromData(data) {
-        this.tracks = data.tracks;
+    _proto.createTrack = function createTrack(classConstructor, parent, name) {
+        var newTrack = new classConstructor(this.engine);
+        newTrack.name = name ? name : classConstructor.name;
+        parent.addChild(newTrack);
+        return newTrack;
     };
+    _proto.fromData = function fromData(data) {};
     return TimelineAsset;
 }(PlayableAsset);
+__decorate([
+    serialize()
+], exports.TimelineAsset.prototype, "tracks", void 0);
 exports.TimelineAsset = __decorate([
     effectsClass("TimelineAsset")
 ], exports.TimelineAsset);
@@ -18999,7 +19000,6 @@ var TimelinePlayable = /*#__PURE__*/ function(Playable) {
         var _this;
         _this = Playable.apply(this, arguments) || this;
         _this.clips = [];
-        _this.masterTracks = [];
         return _this;
     }
     var _proto = TimelinePlayable.prototype;
@@ -19016,25 +19016,18 @@ var TimelinePlayable = /*#__PURE__*/ function(Playable) {
     };
     _proto.compileTracks = function compileTracks(graph, tracks) {
         this.sortTracks(tracks);
-        for(var _iterator = _create_for_of_iterator_helper_loose(tracks), _step; !(_step = _iterator()).done;){
-            var track = _step.value;
-            if (_instanceof1(track, exports.ObjectBindingTrack)) {
-                track.create();
-            }
-            this.masterTracks.push(track);
-        }
         var outputTrack = [];
-        for(var _iterator1 = _create_for_of_iterator_helper_loose(tracks), _step1; !(_step1 = _iterator1()).done;){
-            var masterTrack = _step1.value;
+        for(var _iterator = _create_for_of_iterator_helper_loose(tracks), _step; !(_step = _iterator()).done;){
+            var masterTrack = _step.value;
             outputTrack.push(masterTrack);
             this.addSubTracksRecursive(masterTrack, outputTrack);
         }
-        for(var _iterator2 = _create_for_of_iterator_helper_loose(outputTrack), _step2; !(_step2 = _iterator2()).done;){
-            var track1 = _step2.value;
-            var trackMixPlayable = track1.createPlayableGraph(graph, this.clips);
+        for(var _iterator1 = _create_for_of_iterator_helper_loose(outputTrack), _step1; !(_step1 = _iterator1()).done;){
+            var track = _step1.value;
+            var trackMixPlayable = track.createPlayableGraph(graph, this.clips);
             this.addInput(trackMixPlayable, 0);
-            var trackOutput = track1.createOutput();
-            trackOutput.setUserData(track1.binding);
+            var trackOutput = track.createOutput();
+            trackOutput.setUserData(track.binding);
             graph.addOutput(trackOutput);
             trackOutput.setSourcePlayeble(this, this.getInputCount() - 1);
         }
@@ -19078,9 +19071,14 @@ function isAncestor(ancestorCandidate, descendantCandidate) {
     return false;
 }
 function compareTracks(a, b) {
-    if (isAncestor(a.track.binding, b.track.binding)) {
+    var bindingA = a.track.binding;
+    var bindingB = b.track.binding;
+    if (!_instanceof1(bindingA, exports.VFXItem) || !_instanceof1(bindingB, exports.VFXItem)) {
+        return a.originalIndex - b.originalIndex;
+    }
+    if (isAncestor(bindingA, bindingB)) {
         return -1;
-    } else if (isAncestor(b.track.binding, a.track.binding)) {
+    } else if (isAncestor(bindingB, bindingA)) {
         return 1;
     } else {
         return a.originalIndex - b.originalIndex; // 非父子关系的元素保持原始顺序
@@ -22057,7 +22055,7 @@ function getStandardCameraContent(model) {
             content1.renderer.anchor = convertAnchor(renderer1.anchor, renderer1.particleOrigin);
         }
         // 修复相机K帧缺失 asMovement 参数
-        if (item.type === ItemType.camera) {
+        if (item.type === ItemType.camera && item.content.positionOverLifetime && Object.keys(item.content.positionOverLifetime).length !== 0) {
             item.content.positionOverLifetime.asMovement = true;
         }
         // 动画数据转化 TODO: 动画数据移到 TimelineComponentData
@@ -22222,8 +22220,32 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
         var itemDataPath = _step.value;
         var item = guidToItemMap[itemDataPath.id];
         var subTrackDatas = [];
+        var newActivationPlayableAsset = {
+            id: generateGUID(),
+            dataType: "ActivationPlayableAsset"
+        };
+        playableAssetDatas.push(newActivationPlayableAsset);
+        var newActivationTrackData = {
+            id: generateGUID(),
+            dataType: "ActivationTrack",
+            children: [],
+            clips: [
+                {
+                    start: item.delay,
+                    duration: item.duration,
+                    endBehaviour: item.endBehavior,
+                    asset: {
+                        id: newActivationPlayableAsset.id
+                    }
+                }
+            ]
+        };
+        subTrackDatas.push({
+            id: newActivationTrackData.id
+        });
+        trackDatas.push(newActivationTrackData);
         if (item.type !== ItemType.particle) {
-            var newPlayableAssetData = {
+            var newTransformPlayableAssetData = {
                 id: generateGUID(),
                 dataType: "TransformPlayableAsset",
                 //@ts-expect-error
@@ -22233,15 +22255,18 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                 //@ts-expect-error
                 positionOverLifetime: item.content.positionOverLifetime
             };
-            playableAssetDatas.push(newPlayableAssetData);
+            playableAssetDatas.push(newTransformPlayableAssetData);
             var newTrackData = {
                 id: generateGUID(),
                 dataType: "TransformTrack",
                 children: [],
                 clips: [
                     {
+                        start: item.delay,
+                        duration: item.duration,
+                        endBehaviour: item.endBehavior,
                         asset: {
-                            id: newPlayableAssetData.id
+                            id: newTransformPlayableAssetData.id
                         }
                     }
                 ]
@@ -22252,21 +22277,24 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
             trackDatas.push(newTrackData);
         }
         if (item.type === ItemType.sprite) {
-            var newPlayableAssetData1 = {
+            var newSpriteColorPlayableAssetData = {
                 id: generateGUID(),
                 dataType: "SpriteColorPlayableAsset",
                 colorOverLifetime: item.content.colorOverLifetime,
                 startColor: item.content.options.startColor
             };
-            playableAssetDatas.push(newPlayableAssetData1);
+            playableAssetDatas.push(newSpriteColorPlayableAssetData);
             var newTrackData1 = {
                 id: generateGUID(),
                 dataType: "SpriteColorTrack",
                 children: [],
                 clips: [
                     {
+                        start: item.delay,
+                        duration: item.duration,
+                        endBehaviour: item.endBehavior,
                         asset: {
-                            id: newPlayableAssetData1.id
+                            id: newSpriteColorPlayableAssetData.id
                         }
                     }
                 ]
@@ -23896,14 +23924,17 @@ var tmpScale = new Vector3(1, 1, 1);
         this.timelinePlayable.play();
         for(var _iterator1 = _create_for_of_iterator_helper_loose(this.timelineAsset.tracks), _step1; !(_step1 = _iterator1()).done;){
             var track = _step1.value;
-            // 重播不销毁元素
-            if (this.item.endBehavior !== ItemEndBehavior.destroy || this.reusable) {
-                if (_instanceof1(track, exports.ObjectBindingTrack)) {
-                    track.binding.reusable = true;
-                }
-                var subCompositionComponent = track.binding.getComponent(CompositionComponent);
-                if (subCompositionComponent) {
-                    subCompositionComponent.reusable = true;
+            var binding = track.binding;
+            if (_instanceof1(binding, exports.VFXItem)) {
+                // 重播不销毁元素
+                if (this.item.endBehavior !== ItemEndBehavior.destroy || this.reusable) {
+                    if (_instanceof1(track, exports.ObjectBindingTrack)) {
+                        binding.reusable = true;
+                    }
+                    var subCompositionComponent = binding.getComponent(CompositionComponent);
+                    if (subCompositionComponent) {
+                        subCompositionComponent.reusable = true;
+                    }
                 }
             }
             this.masterTracks.push(track);
@@ -30924,12 +30955,11 @@ Renderer.create = function(canvas, framework, renderOptions) {
 Engine.create = function(gl) {
     return new GLEngine(gl);
 };
-var version = "2.0.0-alpha.13";
+var version = "2.0.0-alpha.14";
 logger.info("player version: " + version);
 
 exports.AbstractPlugin = AbstractPlugin;
 exports.ActivationPlayable = ActivationPlayable;
-exports.ActivationPlayableAsset = ActivationPlayableAsset;
 exports.AnimationClipPlayable = AnimationClipPlayable;
 exports.AssetLoader = AssetLoader;
 exports.AssetManager = AssetManager;