@galacean/effects-threejs 2.0.2 → 2.0.4

package/README.md

@@ -92,4 +92,4 @@ displayObject.addEventListener('end', () => {
 });
 ```
 
-## [API Documentation](https://galacean.antgroup.com/effects/#/api/modules_galacean_effects_threejs)
+## [API Documentation](https://galacean.antgroup.com/effects/api/effects-threejs)

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.0.2
+ * Version: v2.0.4
  */
 
 'use strict';
@@ -4591,7 +4591,6 @@ function getDirectStore(target) {
 
 /**
  * @since 2.0.0
- * @internal
  */ var EffectsObject = /*#__PURE__*/ function() {
     function EffectsObject(engine) {
         this.engine = engine;
@@ -4627,7 +4626,6 @@ function getDirectStore(target) {
 
 /**
  * @since 2.0.0
- * @internal
  */ var Component = /*#__PURE__*/ function(EffectsObject) {
     _inherits(Component, EffectsObject);
     function Component() {
@@ -4662,7 +4660,6 @@ function getDirectStore(target) {
 }(EffectsObject);
 /**
  * @since 2.0.0
- * @internal
  */ var Behaviour = /*#__PURE__*/ function(Component) {
     _inherits(Behaviour, Component);
     function Behaviour() {
@@ -8111,7 +8108,7 @@ function _loadVideo() {
                         }, true);
                     }
                     video.addEventListener("error", function(e) {
-                        reject(e);
+                        reject("Load video fail.");
                     });
                 })
             ];
@@ -13585,7 +13582,6 @@ function _assert_this_initialized(self) {
 /**
  * 动画图，负责更新所有的动画节点
  * @since 2.0.0
- * @internal
  */ var PlayableGraph = /*#__PURE__*/ function() {
     function PlayableGraph() {
         this.playableOutputs = [];
@@ -13645,7 +13641,6 @@ function _assert_this_initialized(self) {
 /**
  * 动画图可播放节点对象
  * @since 2.0.0
- * @internal
  */ var Playable = /*#__PURE__*/ function() {
     function Playable(graph, inputCount) {
         if (inputCount === void 0) inputCount = 0;
@@ -13843,7 +13838,6 @@ function _assert_this_initialized(self) {
 /**
  * 动画图输出节点对象，将动画数据采样到绑定的元素属性上
  * @since 2.0.0
- * @internal
  */ var PlayableOutput = /*#__PURE__*/ function() {
     function PlayableOutput() {
         this.sourceOutputPort = 0;
@@ -13926,13 +13920,17 @@ var SpriteColorPlayable = /*#__PURE__*/ function(Playable) {
         if (!_instanceof1(boundObject, exports.VFXItem)) {
             return;
         }
+        if (!this.spriteComponent) {
+            this.spriteComponent = boundObject.getComponent(exports.SpriteComponent);
+        }
         if (!this.spriteMaterial) {
-            this.spriteMaterial = boundObject.getComponent(exports.SpriteComponent).material;
+            this.spriteMaterial = this.spriteComponent.material;
             var startColor = this.spriteMaterial.getVector4("_Color");
             if (startColor) {
                 this.startColor = startColor.toArray();
             }
         }
+        this.spriteComponent.setAnimationTime(this.time);
         var colorInc = vecFill(tempColor, 1);
         var colorChanged;
         var life = this.time / boundObject.duration;
@@ -13992,7 +13990,6 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
         _this = RendererComponent.call(this, engine) || this;
         _this.cachePrefix = "-";
         _this.frameAnimationLoop = false;
-        _this.frameAnimationTime = 0;
         _this.color = [
             1,
             1,
@@ -14000,6 +13997,8 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
             1
         ];
         _this.visible = true;
+        _this.isManualTimeSet = false;
+        _this.frameAnimationTime = 0;
         _this.getHitTestParams = function(force) {
             var ui = _this.interaction;
             if (force || ui) {
@@ -14082,6 +14081,12 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
         this.renderer.texture = texture;
         this.material.setTexture("uSampler0", texture);
     };
+    /**
+   * @internal
+   */ _proto.setAnimationTime = function setAnimationTime(time) {
+        this.frameAnimationTime = time;
+        this.isManualTimeSet = true;
+    };
     _proto.render = function render(renderer) {
         if (!this.getVisible()) {
             return;
@@ -14096,12 +14101,12 @@ exports.SpriteComponent = /*#__PURE__*/ function(RendererComponent) {
     };
     _proto.start = function start() {
         this.item.getHitTestParams = this.getHitTestParams;
-        if (this.item.endBehavior === EndBehavior.restart) {
-            this.frameAnimationLoop = true;
-        }
     };
     _proto.update = function update(dt) {
-        this.frameAnimationTime += dt / 1000;
+        if (!this.isManualTimeSet) {
+            this.frameAnimationTime += dt / 1000;
+            this.isManualTimeSet = false;
+        }
         var time = this.frameAnimationTime;
         var duration = this.item.duration;
         if (time > duration && this.frameAnimationLoop) {
@@ -16496,7 +16501,6 @@ function getTrailMeshShader(trails, particleMaxCount, name, gpuCapability, env)
 
 /**
  * @since 2.0.0
- * @internal
  */ var ParticleSystemRenderer = /*#__PURE__*/ function(RendererComponent) {
     _inherits(ParticleSystemRenderer, RendererComponent);
     function ParticleSystemRenderer(engine, particleMeshProps, trailMeshProps) {
@@ -16644,6 +16648,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();
@@ -17562,7 +17569,6 @@ function randomArrItem(arr, keepArr) {
 
 /**
  * @since 2.0.0
- * @internal
  */ var ParticleBehaviourPlayable = /*#__PURE__*/ function(Playable) {
     _inherits(ParticleBehaviourPlayable, Playable);
     function ParticleBehaviourPlayable() {
@@ -17590,11 +17596,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) {
@@ -18622,7 +18625,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() {
@@ -18784,7 +18786,6 @@ exports.TransformPlayableAsset = __decorate([
 ], exports.TransformPlayableAsset);
 /**
  * @since 2.0.0
- * @internal
  */ var ActivationPlayable = /*#__PURE__*/ function(Playable) {
     _inherits(ActivationPlayable, Playable);
     function ActivationPlayable() {
@@ -18935,7 +18936,6 @@ var AnimationClipPlayable = /*#__PURE__*/ function(Playable) {
 
 /**
  * @since 2.0.0
- * @internal
  */ var TimelineClip = /*#__PURE__*/ function() {
     function TimelineClip() {
         this.start = 0;
@@ -19360,7 +19360,6 @@ function compareTracks(a, b) {
 
 /**
  * @since 2.0.0
- * @internal
  */ var CompositionComponent = /*#__PURE__*/ function(Behaviour) {
     _inherits(CompositionComponent, Behaviour);
     function CompositionComponent() {
@@ -19471,6 +19470,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) {
@@ -19581,6 +19592,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() {
@@ -19593,6 +19632,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([
@@ -21649,7 +21691,6 @@ var SerializationHelper = /*#__PURE__*/ function() {
 
 /**
  * @since 2.0.0
- * @internal
  */ var AssetLoader = /*#__PURE__*/ function() {
     function AssetLoader(engine) {
         this.engine = engine;
@@ -23630,22 +23671,6 @@ var seed$1 = 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 上下文的参数
@@ -23772,7 +23797,6 @@ var seed$1 = 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 [
@@ -23829,7 +23853,6 @@ var seed$1 = 1;
                                 ];
                             case 10:
                                 loadedTextures = _state.sent();
-                                _this.updateSceneData(jsonScene.items);
                                 scene = {
                                     timeInfos: timeInfos,
                                     url: url,
@@ -24121,7 +24144,7 @@ var seed$1 = 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,
@@ -25047,6 +25070,7 @@ var listOrder = 0;
    * 跳到指定时间点（不做任何播放行为）
    * @param time - 相对 startTime 的时间
    */ _proto.setTime = function setTime(time) {
+        var speed = this.speed;
         var pause = this.paused;
         if (pause) {
             this.resume();
@@ -25055,7 +25079,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();
         }
@@ -25067,7 +25093,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;
@@ -25117,7 +25142,6 @@ var listOrder = 0;
     /**
    * 合成更新，针对所有 item 的更新
    * @param deltaTime - 更新的时间步长
-   * @param skipRender - 是否需要渲染
    */ _proto.update = function update(deltaTime) {
         if (!this.assigned || this.paused) {
             return;
@@ -27135,7 +27159,6 @@ var FBGeometryDataT = /*#__PURE__*/ function() {
 
 /**
  * @since 2.0.0
- * @internal
  */ var EffectsPackage = /*#__PURE__*/ function() {
     function EffectsPackage() {
         this.exportObjectDatas = [];
@@ -27544,11 +27567,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
@@ -27683,7 +27707,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$1 = "2.0.2";
+var version$1 = "2.0.4";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -29364,7 +29388,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.0.2";
+var version = "2.0.4";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;
@@ -29392,6 +29416,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;