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

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime core for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.0.0-alpha.13
+ * Version: v2.0.0-alpha.14
  */
 
 'use strict';
@@ -17452,6 +17452,9 @@ class ActivationPlayableAsset extends PlayableAsset {
         return new ActivationPlayable(graph);
     }
 }
+ActivationPlayableAsset = __decorate([
+    effectsClass('ActivationPlayableAsset')
+], ActivationPlayableAsset);
 class AnimationClip extends EffectsObject {
     sampleAnimation(vfxItem, time) {
         const duration = vfxItem.duration;
@@ -17599,6 +17602,9 @@ class TrackAsset extends PlayableAsset {
     getChildTracks() {
         return this.children;
     }
+    addChild(child) {
+        this.children.push(child);
+    }
     createClip(classConstructor, name) {
         const newClip = new TimelineClip();
         newClip.asset = new classConstructor(this.engine);
@@ -17680,9 +17686,10 @@ class RuntimeClip {
         let weight = 1.0;
         let ended = false;
         let started = false;
+        const boundItem = this.track.binding;
         if (localTime > clip.start + clip.duration + 0.001 && clip.endBehaviour === ItemEndBehavior.destroy) {
-            var _this_track_binding_getComponent;
-            if (VFXItem.isParticle(this.track.binding) && !((_this_track_binding_getComponent = this.track.binding.getComponent(ParticleSystem)) == null ? void 0 : _this_track_binding_getComponent.destroyed)) {
+            var _boundItem_getComponent;
+            if (VFXItem.isParticle(boundItem) && !((_boundItem_getComponent = boundItem.getComponent(ParticleSystem)) == null ? void 0 : _boundItem_getComponent.destroyed)) {
                 weight = 1.0;
             } else {
                 weight = 0.0;
@@ -17698,7 +17705,6 @@ class RuntimeClip {
             this.playable.play();
         }
         this.parentMixer.setInputWeight(this.playable, weight);
-        const boundItem = this.track.binding;
         // 判断动画是否结束
         if (ended && !boundItem.ended) {
             boundItem.ended = true;
@@ -17727,6 +17733,53 @@ class RuntimeClip {
     }
 }
 
+class ObjectBindingTrack extends TrackAsset {
+    create(timelineAsset) {
+        const 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(ParticleSystem)) {
+            const particleTrack = timelineAsset.createTrack(TrackAsset, this, 'ParticleTrack');
+            particleTrack.binding = this.binding;
+            const particleClip = particleTrack.createClip(ParticleBehaviourPlayableAsset);
+            particleClip.start = boundItem.start;
+            particleClip.duration = boundItem.duration;
+            particleClip.endBehaviour = boundItem.endBehavior;
+        }
+    }
+    toLocalTime(time) {
+        let localTime = time - this.options.start;
+        const 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;
+    }
+    fromData(data) {
+        super.fromData(data);
+        this.data = data;
+    }
+}
+ObjectBindingTrack = __decorate([
+    effectsClass('ObjectBindingTrack')
+], ObjectBindingTrack);
+
+class TransformTrack extends TrackAsset {
+}
+TransformTrack = __decorate([
+    effectsClass('TransformTrack')
+], TransformTrack);
+
 class ActivationMixerPlayable extends Playable {
     processFrame(context) {
         if (!this.bindingItem) {
@@ -17768,6 +17821,9 @@ class ActivationMixerPlayable extends Playable {
 }
 
 class ActivationTrack extends TrackAsset {
+    initializeBinding(parentBinding) {
+        this.binding = parentBinding;
+    }
     createTrackMixer(graph) {
         return new ActivationMixerPlayable(graph);
     }
@@ -17776,73 +17832,6 @@ ActivationTrack = __decorate([
     effectsClass('ActivationTrack')
 ], ActivationTrack);
 
-class ObjectBindingTrack extends TrackAsset {
-    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;
-        const activationTrack = this.createTrack(ActivationTrack, 'ActivationTrack');
-        activationTrack.binding = this.binding;
-        activationTrack.createClip(ActivationPlayableAsset, 'ActivationTimelineClip');
-        // 添加粒子动画 clip
-        if (this.binding.getComponent(ParticleSystem)) {
-            const particleTrack = this.createTrack(TrackAsset, 'ParticleTrack');
-            particleTrack.binding = this.binding;
-            particleTrack.createClip(ParticleBehaviourPlayableAsset);
-        }
-        // TODO TimelineClip 需要传入 start 和 duration 数据
-        for (const track of this.children){
-            for (const clip of track.getClips()){
-                clip.start = this.binding.start;
-                clip.duration = this.binding.duration;
-                clip.endBehaviour = this.binding.endBehavior;
-            }
-        }
-    }
-    toLocalTime(time) {
-        let localTime = time - this.options.start;
-        const 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;
-    }
-    createTrack(classConstructor, name) {
-        const 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;
-    }
-    fromData(data) {
-        super.fromData(data);
-        this.data = data;
-    }
-    constructor(...args){
-        super(...args);
-        this.trackSeed = 0;
-    }
-}
-ObjectBindingTrack = __decorate([
-    effectsClass('ObjectBindingTrack')
-], ObjectBindingTrack);
-
-class TransformTrack extends TrackAsset {
-}
-TransformTrack = __decorate([
-    effectsClass('TransformTrack')
-], TransformTrack);
-
 class SpriteColorTrack extends TrackAsset {
 }
 SpriteColorTrack = __decorate([
@@ -17854,17 +17843,29 @@ class TimelineAsset extends PlayableAsset {
         this.graph = graph;
         const timelinePlayable = new TimelinePlayable(graph);
         timelinePlayable.setTraversalMode(PlayableTraversalMode.Passthrough);
+        for (const track of this.tracks){
+            if (track instanceof ObjectBindingTrack) {
+                track.create(this);
+            }
+        }
         timelinePlayable.compileTracks(graph, this.tracks);
         return timelinePlayable;
     }
-    fromData(data) {
-        this.tracks = data.tracks;
+    createTrack(classConstructor, parent, name) {
+        const newTrack = new classConstructor(this.engine);
+        newTrack.name = name ? name : classConstructor.name;
+        parent.addChild(newTrack);
+        return newTrack;
     }
+    fromData(data) {}
     constructor(...args){
         super(...args);
         this.tracks = [];
     }
 }
+__decorate([
+    serialize()
+], TimelineAsset.prototype, "tracks", void 0);
 TimelineAsset = __decorate([
     effectsClass('TimelineAsset')
 ], TimelineAsset);
@@ -17881,12 +17882,6 @@ class TimelinePlayable extends Playable {
     }
     compileTracks(graph, tracks) {
         this.sortTracks(tracks);
-        for (const track of tracks){
-            if (track instanceof ObjectBindingTrack) {
-                track.create();
-            }
-            this.masterTracks.push(track);
-        }
         const outputTrack = [];
         for (const masterTrack of tracks){
             outputTrack.push(masterTrack);
@@ -17923,7 +17918,6 @@ class TimelinePlayable extends Playable {
     constructor(...args){
         super(...args);
         this.clips = [];
-        this.masterTracks = [];
     }
 }
 class TrackSortWrapper {
@@ -17943,9 +17937,14 @@ function isAncestor(ancestorCandidate, descendantCandidate) {
     return false;
 }
 function compareTracks(a, b) {
-    if (isAncestor(a.track.binding, b.track.binding)) {
+    const bindingA = a.track.binding;
+    const bindingB = b.track.binding;
+    if (!(bindingA instanceof VFXItem) || !(bindingB instanceof 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; // 非父子关系的元素保持原始顺序
@@ -20655,7 +20654,7 @@ function getStandardCameraContent(model) {
             content.renderer.anchor = convertAnchor(renderer.anchor, renderer.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
@@ -20817,8 +20816,32 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
     for (const itemDataPath of composition.items){
         const item = guidToItemMap[itemDataPath.id];
         const subTrackDatas = [];
+        const newActivationPlayableAsset = {
+            id: generateGUID(),
+            dataType: 'ActivationPlayableAsset'
+        };
+        playableAssetDatas.push(newActivationPlayableAsset);
+        const 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) {
-            const newPlayableAssetData = {
+            const newTransformPlayableAssetData = {
                 id: generateGUID(),
                 dataType: 'TransformPlayableAsset',
                 //@ts-expect-error
@@ -20828,15 +20851,18 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
                 //@ts-expect-error
                 positionOverLifetime: item.content.positionOverLifetime
             };
-            playableAssetDatas.push(newPlayableAssetData);
+            playableAssetDatas.push(newTransformPlayableAssetData);
             const newTrackData = {
                 id: generateGUID(),
                 dataType: 'TransformTrack',
                 children: [],
                 clips: [
                     {
+                        start: item.delay,
+                        duration: item.duration,
+                        endBehaviour: item.endBehavior,
                         asset: {
-                            id: newPlayableAssetData.id
+                            id: newTransformPlayableAssetData.id
                         }
                     }
                 ]
@@ -20847,21 +20873,24 @@ function convertTimelineAsset(composition, guidToItemMap, jsonScene) {
             trackDatas.push(newTrackData);
         }
         if (item.type === ItemType.sprite) {
-            const newPlayableAssetData = {
+            const newSpriteColorPlayableAssetData = {
                 id: generateGUID(),
                 dataType: 'SpriteColorPlayableAsset',
                 colorOverLifetime: item.content.colorOverLifetime,
                 startColor: item.content.options.startColor
             };
-            playableAssetDatas.push(newPlayableAssetData);
+            playableAssetDatas.push(newSpriteColorPlayableAssetData);
             const newTrackData = {
                 id: generateGUID(),
                 dataType: 'SpriteColorTrack',
                 children: [],
                 clips: [
                     {
+                        start: item.delay,
+                        duration: item.duration,
+                        endBehaviour: item.endBehavior,
                         asset: {
-                            id: newPlayableAssetData.id
+                            id: newSpriteColorPlayableAssetData.id
                         }
                     }
                 ]
@@ -22071,14 +22100,17 @@ const tmpScale = new Vector3(1, 1, 1);
         this.timelinePlayable = this.timelineAsset.createPlayable(this.graph);
         this.timelinePlayable.play();
         for (const track of this.timelineAsset.tracks){
-            // 重播不销毁元素
-            if (this.item.endBehavior !== ItemEndBehavior.destroy || this.reusable) {
-                if (track instanceof ObjectBindingTrack) {
-                    track.binding.reusable = true;
-                }
-                const subCompositionComponent = track.binding.getComponent(CompositionComponent);
-                if (subCompositionComponent) {
-                    subCompositionComponent.reusable = true;
+            const binding = track.binding;
+            if (binding instanceof VFXItem) {
+                // 重播不销毁元素
+                if (this.item.endBehavior !== ItemEndBehavior.destroy || this.reusable) {
+                    if (track instanceof ObjectBindingTrack) {
+                        binding.reusable = true;
+                    }
+                    const subCompositionComponent = binding.getComponent(CompositionComponent);
+                    if (subCompositionComponent) {
+                        subCompositionComponent.reusable = true;
+                    }
                 }
             }
             this.masterTracks.push(track);