@galacean/effects-core 2.0.3 → 2.0.5

package/dist/asset-manager.d.ts

@@ -38,10 +38,6 @@ export declare class AssetManager implements Disposable {
      */
     constructor(options?: SceneLoadOptions, downloader?: Downloader);
     updateOptions(options?: SceneLoadOptions): void;
-    /**
-     * 根据用户传入的参数修改场景数据
-     */
-    private updateSceneData;
     /**
      * 场景创建，通过 json 创建出场景对象，并进行提前编译等工作
      * @param url - json 的 URL 链接或者 json 对象

package/dist/comp-vfx-item.d.ts

@@ -32,6 +32,8 @@ export declare class CompositionComponent extends Behaviour {
     getReusable(): boolean;
     update(dt: number): void;
     createContent(): void;
+    showItems(): void;
+    hideItems(): void;
     onDestroy(): void;
     hitTest(ray: Ray, x: number, y: number, regions: Region[], force?: boolean, options?: CompositionHitTestOptions): Region[];
     fromData(data: unknown): void;

package/dist/composition.d.ts

@@ -278,7 +278,6 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
     /**
      * 前进合成到指定时间
      * @param time - 相对0时刻的时间
-     * @param skipRender - 是否跳过渲染
      */
     private forwardTime;
     /**
@@ -290,7 +289,6 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
     /**
      * 合成更新，针对所有 item 的更新
      * @param deltaTime - 更新的时间步长
-     * @param skipRender - 是否需要渲染
      */
     update(deltaTime: number): void;
     private toLocalTime;

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.3
+ * Version: v2.0.5
  */
 
 'use strict';
@@ -8086,7 +8086,7 @@ function _loadVideo() {
                         }, true);
                     }
                     video.addEventListener("error", function(e) {
-                        reject(e);
+                        reject("Load video fail.");
                     });
                 })
             ];
@@ -13560,7 +13560,6 @@ function _assert_this_initialized(self) {
 /**
  * 动画图，负责更新所有的动画节点
  * @since 2.0.0
- * @internal
  */ var PlayableGraph = /*#__PURE__*/ function() {
     function PlayableGraph() {
         this.playableOutputs = [];
@@ -13568,25 +13567,25 @@ function _assert_this_initialized(self) {
     }
     var _proto = PlayableGraph.prototype;
     _proto.evaluate = function evaluate(dt) {
-        // 初始化节点状态
-        for(var _iterator = _create_for_of_iterator_helper_loose(this.playables), _step; !(_step = _iterator()).done;){
-            var playable = _step.value;
-            this.updatePlayableTime(playable, dt);
-        }
         // 初始化输出节点状态
-        for(var _iterator1 = _create_for_of_iterator_helper_loose(this.playableOutputs), _step1; !(_step1 = _iterator1()).done;){
-            var playableOutput = _step1.value;
+        for(var _iterator = _create_for_of_iterator_helper_loose(this.playableOutputs), _step; !(_step = _iterator()).done;){
+            var playableOutput = _step.value;
             playableOutput.context.deltaTime = dt;
         }
         // 执行生命周期函数
-        for(var _iterator2 = _create_for_of_iterator_helper_loose(this.playableOutputs), _step2; !(_step2 = _iterator2()).done;){
-            var playableOutput1 = _step2.value;
+        for(var _iterator1 = _create_for_of_iterator_helper_loose(this.playableOutputs), _step1; !(_step1 = _iterator1()).done;){
+            var playableOutput1 = _step1.value;
             this.prepareFrameWithRoot(playableOutput1);
         }
-        for(var _iterator3 = _create_for_of_iterator_helper_loose(this.playableOutputs), _step3; !(_step3 = _iterator3()).done;){
-            var playableOutput2 = _step3.value;
+        for(var _iterator2 = _create_for_of_iterator_helper_loose(this.playableOutputs), _step2; !(_step2 = _iterator2()).done;){
+            var playableOutput2 = _step2.value;
             this.processFrameWithRoot(playableOutput2);
         }
+        // 更新节点时间
+        for(var _iterator3 = _create_for_of_iterator_helper_loose(this.playables), _step3; !(_step3 = _iterator3()).done;){
+            var playable = _step3.value;
+            this.updatePlayableTime(playable, dt);
+        }
     };
     _proto.connect = function connect(source, sourceOutputPort, destination, destinationInputPort) {
         destination.connectInput(destinationInputPort, source, sourceOutputPort);
@@ -13609,24 +13608,18 @@ function _assert_this_initialized(self) {
         if (playable.getPlayState() !== 0) {
             return;
         }
-        if (playable.overrideTimeNextEvaluation) {
-            playable.overrideTimeNextEvaluation = false;
-        } else {
-            playable.setTime(playable.getTime() + deltaTime);
-        }
+        playable.setTime(playable.getTime() + deltaTime);
     };
     return PlayableGraph;
 }();
 /**
  * 动画图可播放节点对象
  * @since 2.0.0
- * @internal
  */ var Playable = /*#__PURE__*/ function() {
     function Playable(graph, inputCount) {
         if (inputCount === void 0) inputCount = 0;
         this.onPlayablePlayFlag = true;
         this.onPlayablePauseFlag = false;
-        this.overrideTimeNextEvaluation = false;
         this.destroyed = false;
         this.inputs = [];
         this.inputOuputPorts = [];
@@ -13712,7 +13705,6 @@ function _assert_this_initialized(self) {
     };
     _proto.setTime = function setTime(time) {
         this.time = time;
-        this.overrideTimeNextEvaluation = true;
     };
     _proto.getTime = function getTime() {
         return this.time;
@@ -13818,7 +13810,6 @@ function _assert_this_initialized(self) {
 /**
  * 动画图输出节点对象，将动画数据采样到绑定的元素属性上
  * @since 2.0.0
- * @internal
  */ var PlayableOutput = /*#__PURE__*/ function() {
     function PlayableOutput() {
         this.sourceOutputPort = 0;
@@ -16629,6 +16620,9 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
     _proto.isFrozen = function isFrozen() {
         return this.frozen;
     };
+    _proto.isEnded = function isEnded() {
+        return this.ended;
+    };
     _proto.initEmitterTransform = function initEmitterTransform() {
         var position = this.item.transform.position.clone();
         var rotation = this.item.transform.rotation.clone();
@@ -16821,7 +16815,7 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
                             break;
                         }
                         var burst = bursts[j];
-                        var opts = burst.getGeneratorOptions(timePassed, lifetime);
+                        var opts = !burst.disabled && burst.getGeneratorOptions(timePassed, lifetime);
                         if (opts) {
                             var originVec = [
                                 0,
@@ -16830,6 +16824,9 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
                             ];
                             var offsets = emission.burstOffsets[j];
                             var burstOffset = offsets && offsets[opts.cycleIndex] || originVec;
+                            if (burst.once) {
+                                this.removeBurst(j);
+                            }
                             for(var i1 = 0; i1 < opts.count && cursor < maxCount; i1++){
                                 var _p_transform;
                                 if (shouldSkipGenerate()) {
@@ -17547,7 +17544,6 @@ function randomArrItem(arr, keepArr) {
 
 /**
  * @since 2.0.0
- * @internal
  */ var ParticleBehaviourPlayable = /*#__PURE__*/ function(Playable) {
     _inherits(ParticleBehaviourPlayable, Playable);
     function ParticleBehaviourPlayable() {
@@ -17575,11 +17571,8 @@ function randomArrItem(arr, keepArr) {
         }
         var particleSystem = this.particleSystem;
         if (particleSystem) {
-            // TODO: [1.31] @十弦 验证 https://github.com/galacean/effects-runtime/commit/3e7d73d37b7d98c2a25e4544e80e928b17801ccd#diff-fae062f28caf3771cfedd3a20dc22f9749bd054c7541bf2fd50a9a5e413153d4
-            // particleSystem.setParentTransform(parentItem.transform);
-            particleSystem.setVisible(true);
             var deltaTime = context.deltaTime;
-            if (this.time < particleSystem.item.duration && particleSystem.isFrozen()) {
+            if (this.time >= 0 && this.time < particleSystem.item.duration && particleSystem.isEnded()) {
                 particleSystem.reset();
             }
             if (Math.abs(this.time - this.lastTime) < 0.001) {
@@ -18607,7 +18600,6 @@ var tempSize = new Vector3(1, 1, 1);
 var tempPos = new Vector3();
 /**
  * @since 2.0.0
- * @internal
  */ var TransformAnimationPlayable = /*#__PURE__*/ function(AnimationPlayable) {
     _inherits(TransformAnimationPlayable, AnimationPlayable);
     function TransformAnimationPlayable() {
@@ -18769,7 +18761,6 @@ exports.TransformPlayableAsset = __decorate([
 ], exports.TransformPlayableAsset);
 /**
  * @since 2.0.0
- * @internal
  */ var ActivationPlayable = /*#__PURE__*/ function(Playable) {
     _inherits(ActivationPlayable, Playable);
     function ActivationPlayable() {
@@ -18920,7 +18911,6 @@ var AnimationClipPlayable = /*#__PURE__*/ function(Playable) {
 
 /**
  * @since 2.0.0
- * @internal
  */ var TimelineClip = /*#__PURE__*/ function() {
     function TimelineClip() {
         this.start = 0;
@@ -18930,7 +18920,7 @@ var AnimationClipPlayable = /*#__PURE__*/ function(Playable) {
     _proto.toLocalTime = function toLocalTime(time) {
         var localTime = time - this.start;
         var duration = this.duration;
-        if (localTime - duration > 0.001) {
+        if (localTime - duration > 0) {
             if (this.endBehavior === EndBehavior.restart) {
                 localTime = localTime % duration;
             } else if (this.endBehavior === EndBehavior.freeze) {
@@ -19059,7 +19049,7 @@ var RuntimeClip = /*#__PURE__*/ function() {
         var ended = false;
         var started = false;
         var boundObject = this.track.binding;
-        if (localTime > clip.start + clip.duration + 0.001 && clip.endBehavior === EndBehavior.destroy) {
+        if (localTime >= clip.start + clip.duration && clip.endBehavior === EndBehavior.destroy) {
             if (_instanceof1(boundObject, exports.VFXItem) && exports.VFXItem.isParticle(boundObject) && this.particleSystem && !this.particleSystem.destroyed) {
                 weight = 1.0;
             } else {
@@ -19455,6 +19445,18 @@ function compareTracks(a, b) {
             }
         }
     };
+    _proto.showItems = function showItems() {
+        for(var _iterator = _create_for_of_iterator_helper_loose(this.items), _step; !(_step = _iterator()).done;){
+            var item = _step.value;
+            item.setVisible(true);
+        }
+    };
+    _proto.hideItems = function hideItems() {
+        for(var _iterator = _create_for_of_iterator_helper_loose(this.items), _step; !(_step = _iterator()).done;){
+            var item = _step.value;
+            item.setVisible(false);
+        }
+    };
     _proto.onDestroy = function onDestroy() {
         if (this.item.composition) {
             if (this.items) {
@@ -19565,6 +19567,34 @@ function compareTracks(a, b) {
     return CompositionComponent;
 }(Behaviour);
 
+var SubCompositionMixerPlayable = /*#__PURE__*/ function(Playable) {
+    _inherits(SubCompositionMixerPlayable, Playable);
+    function SubCompositionMixerPlayable() {
+        return Playable.apply(this, arguments);
+    }
+    var _proto = SubCompositionMixerPlayable.prototype;
+    _proto.processFrame = function processFrame(context) {
+        var boundObject = context.output.getUserData();
+        if (!_instanceof1(boundObject, CompositionComponent)) {
+            return;
+        }
+        var compositionComponent = boundObject;
+        var hasInput = false;
+        for(var i = 0; i < this.getInputCount(); i++){
+            if (this.getInputWeight(i) > 0) {
+                hasInput = true;
+                break;
+            }
+        }
+        if (hasInput) {
+            compositionComponent.showItems();
+        } else {
+            compositionComponent.hideItems();
+        }
+    };
+    return SubCompositionMixerPlayable;
+}(Playable);
+
 exports.SubCompositionTrack = /*#__PURE__*/ function(TrackAsset) {
     _inherits(SubCompositionTrack, TrackAsset);
     function SubCompositionTrack() {
@@ -19577,6 +19607,9 @@ exports.SubCompositionTrack = /*#__PURE__*/ function(TrackAsset) {
         }
         return parentBinding.getComponent(CompositionComponent);
     };
+    _proto.createTrackMixer = function createTrackMixer(graph) {
+        return new SubCompositionMixerPlayable(graph);
+    };
     return SubCompositionTrack;
 }(exports.TrackAsset);
 exports.SubCompositionTrack = __decorate([
@@ -23613,22 +23646,6 @@ var seed = 1;
         this.timeout = timeout;
     };
     /**
-   * 根据用户传入的参数修改场景数据
-   */ _proto.updateSceneData = function updateSceneData(items) {
-        var variables = this.options.variables;
-        if (!variables || Object.keys(variables).length === 0) {
-            return;
-        }
-        items.forEach(function(item) {
-            if (item.type === ItemType.text) {
-                var textVariable = variables[item.name];
-                if (textVariable) {
-                    item.content.options.text = textVariable;
-                }
-            }
-        });
-    };
-    /**
    * 场景创建，通过 json 创建出场景对象，并进行提前编译等工作
    * @param url - json 的 URL 链接或者 json 对象
    * @param renderer - renderer 对象，用于获取管理、编译 shader 及 GPU 上下文的参数
@@ -23755,7 +23772,6 @@ var seed = 1;
                                 for(i1 = 0; i1 < scene.images.length; i1++){
                                     scene.textureOptions[i1].image = scene.images[i1];
                                 }
-                                _this.updateSceneData(scene.jsonScene.items);
                                 _state.label = 5;
                             case 5:
                                 return [
@@ -23812,7 +23828,6 @@ var seed = 1;
                                 ];
                             case 10:
                                 loadedTextures = _state.sent();
-                                _this.updateSceneData(jsonScene.items);
                                 scene = {
                                     timeInfos: timeInfos,
                                     url: url,
@@ -24104,7 +24119,7 @@ var seed = 1;
                                 ];
                             case 6:
                                 e = _state.sent();
-                                throw new Error("Failed to load. Check the template or if the URL is " + (isVideo ? "video" : "image") + " type, URL: " + url + ", Error: " + e.message + ".");
+                                throw new Error("Failed to load. Check the template or if the URL is " + (isVideo ? "video" : "image") + " type, URL: " + url + ", Error: " + (e.message || e) + ".");
                             case 7:
                                 return [
                                     3,
@@ -25030,6 +25045,7 @@ var listOrder = 0;
    * 跳到指定时间点（不做任何播放行为）
    * @param time - 相对 startTime 的时间
    */ _proto.setTime = function setTime(time) {
+        var speed = this.speed;
         var pause = this.paused;
         if (pause) {
             this.resume();
@@ -25038,7 +25054,9 @@ var listOrder = 0;
             this.rootComposition.start();
             this.rootComposition.isStartCalled = true;
         }
+        this.setSpeed(1);
         this.forwardTime(time + this.startTime);
+        this.setSpeed(speed);
         if (pause) {
             this.pause();
         }
@@ -25050,7 +25068,6 @@ var listOrder = 0;
     /**
    * 前进合成到指定时间
    * @param time - 相对0时刻的时间
-   * @param skipRender - 是否跳过渲染
    */ _proto.forwardTime = function forwardTime(time) {
         var deltaTime = time * 1000 - this.rootComposition.time * 1000;
         var reverse = deltaTime < 0;
@@ -25100,7 +25117,6 @@ var listOrder = 0;
     /**
    * 合成更新，针对所有 item 的更新
    * @param deltaTime - 更新的时间步长
-   * @param skipRender - 是否需要渲染
    */ _proto.update = function update(deltaTime) {
         if (!this.assigned || this.paused) {
             return;
@@ -27526,11 +27542,12 @@ var FBGeometryDataT = /*#__PURE__*/ function() {
     return Engine;
 }();
 
+var DEFAULT_FPS = 60;
 /**
  * 定时器类
  */ var Ticker = /*#__PURE__*/ function() {
     function Ticker(fps) {
-        if (fps === void 0) fps = 60;
+        if (fps === void 0) fps = DEFAULT_FPS;
         this.paused = true;
         this.lastTime = 0;
         // deltaTime
@@ -27665,7 +27682,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem, true);
 registerPlugin("particle", ParticleLoader, exports.VFXItem, true);
 registerPlugin("cal", CalculateLoader, exports.VFXItem, true);
 registerPlugin("interact", InteractLoader, exports.VFXItem, true);
-var version = "2.0.3";
+var version = "2.0.5";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;
@@ -27689,6 +27706,7 @@ exports.Composition = Composition;
 exports.CompositionComponent = CompositionComponent;
 exports.CompositionSourceManager = CompositionSourceManager;
 exports.DEFAULT_FONTS = DEFAULT_FONTS;
+exports.DEFAULT_FPS = DEFAULT_FPS;
 exports.Database = Database;
 exports.Downloader = Downloader;
 exports.EFFECTS_COPY_MESH_NAME = EFFECTS_COPY_MESH_NAME;