@galacean/effects-core 2.0.0-alpha.32 → 2.0.0-alpha.33

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

@@ -23,10 +23,6 @@ export declare class CompositionComponent extends ItemBehaviour {
     refId: string;
     items: VFXItem[];
     data: ContentOptions;
-    /**
-     * 合成是否冻结标志位
-     */
-    fezzed: boolean;
     private reusable;
     private sceneBindings;
     private timelineAsset;

package/dist/composition.d.ts

@@ -287,16 +287,6 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
     protected reset(): void;
     prepareRender(): void;
     protected gatherRendererComponent(vfxItem: VFXItem, renderFrame: RenderFrame): void;
-    /**
-     * 是否合成需要重新播放
-     * @returns 重新播放合成标志位
-     */
-    private shouldRestart;
-    /**
-     * 是否合成需要销毁
-     * @returns 销毁合成标志位
-     */
-    private shouldDispose;
     /**
      * 合成更新，针对所有 item 的更新
      * @param deltaTime - 更新的时间步长
@@ -304,6 +294,7 @@ export declare class Composition extends EventEmitter<CompositionEvent<Compositi
      */
     update(deltaTime: number): void;
     private toLocalTime;
+    private shouldDispose;
     private getUpdateTime;
     private callStart;
     private callUpdate;

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.32
+ * Version: v2.0.0-alpha.33
  */
 
 'use strict';
@@ -16007,6 +16007,17 @@ var Link = /*#__PURE__*/ function() {
             }while (node = node.pre);
         }
     };
+    _proto.getNodeByIndex = function getNodeByIndex(index) {
+        var i = 0, res = this.first;
+        if (!res || index >= this.length || index < 0) {
+            return null;
+        }
+        while(i < index){
+            res = res.next;
+            i++;
+        }
+        return res;
+    };
     return Link;
 }();
 
@@ -16843,10 +16854,8 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
                         content[3].delay -= duration;
                     });
                     this.renderer.minusTimeForLoop(duration);
-                    this.onIterate(this);
                 } else {
                     this.ended = true;
-                    this.onEnd(this);
                     var endBehavior = this.item.endBehavior;
                     if (endBehavior === EndBehavior.freeze) {
                         this.frozen = true;
@@ -16994,7 +17003,21 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
             time: startTime
         });
     };
-    _proto.getPointPosition = function getPointPosition(point) {
+    /**
+   * 通过索引获取指定index粒子当前时刻的位置
+   * @params index - 粒子索引
+   */ _proto.getPointPositionByIndex = function getPointPositionByIndex(index) {
+        var point = this.particleLink.getNodeByIndex(index);
+        if (!point) {
+            console.error("Get point error.");
+            return null;
+        } else {
+            return this.getPointPosition(point.content[3]);
+        }
+    };
+    /**
+   * 通过粒子参数获取当前时刻粒子的位置
+   */ _proto.getPointPosition = function getPointPosition(point) {
         var transform = point.transform, vel = point.vel, lifetime = point.lifetime, delay = point.delay, _point_gravity = point.gravity, gravity = _point_gravity === void 0 ? [] : _point_gravity;
         var forceTarget = this.options.forceTarget;
         var time = this.lastUpdate - delay;
@@ -17016,8 +17039,6 @@ exports.ParticleSystem = /*#__PURE__*/ function(Component) {
         }
         return ret;
     };
-    _proto.onEnd = function onEnd(particle) {};
-    _proto.onIterate = function onIterate(particle) {};
     _proto.initPoint = function initPoint(data) {
         var options = this.options;
         var lifetime = this.lifetime;
@@ -17976,31 +17997,6 @@ var ParticleMesh = /*#__PURE__*/ function() {
             data[i + 3]
         ];
     };
-    /**
-   * 待废弃
-   * @deprecated - 使用 `particle-system.getPointPosition` 替代
-   */ _proto.getPointPosition = function getPointPosition(index) {
-        var geo = this.geometry;
-        var posIndex = index * 48;
-        var posData = geo.getAttributeData("aPos");
-        var offsetData = geo.getAttributeData("aOffset");
-        var time = this.time - offsetData[index * 16 + 2];
-        var pointDur = offsetData[index * 16 + 3];
-        var mtl = this.mesh.material;
-        var acc = mtl.getVector4("uAcceleration").toVector3();
-        var pos = Vector3.fromArray(posData, posIndex);
-        var vel = Vector3.fromArray(posData, posIndex + 3);
-        var ret = calculateTranslation(new Vector3(), this, acc, time, pointDur, pos, vel);
-        if (this.forceTarget) {
-            var target = mtl.getVector3("uFinalTarget");
-            var life = this.forceTarget.curve.getValue(time / pointDur);
-            var dl = 1 - life;
-            ret.x = ret.x * dl + target.x * life;
-            ret.y = ret.y * dl + target.y * life;
-            ret.z = ret.z * dl + target.z * life;
-        }
-        return ret;
-    };
     _proto.clearPoints = function clearPoints() {
         this.resetGeometryData(this.geometry);
         this.particleCount = 0;
@@ -19355,9 +19351,6 @@ function compareTracks(a, b) {
         _this.startTime = 0;
         _this.items = [] // 场景的所有元素
         ;
-        /**
-   * 合成是否冻结标志位
-   */ _this.fezzed = false;
         _this.reusable = false;
         _this.sceneBindings = [];
         _this.graph = new PlayableGraph();
@@ -25025,28 +25018,6 @@ var listOrder = 0;
         }
     };
     /**
-   * 是否合成需要重新播放
-   * @returns 重新播放合成标志位
-   */ _proto.shouldRestart = function shouldRestart() {
-        var _this_rootItem = this.rootItem, duration = _this_rootItem.duration, endBehavior = _this_rootItem.endBehavior;
-        var time = this.rootComposition.time;
-        return endBehavior === EndBehavior.restart && duration - time < 0.02;
-    };
-    /**
-   * 是否合成需要销毁
-   * @returns 销毁合成标志位
-   */ _proto.shouldDispose = function shouldDispose() {
-        if (this.reusable) {
-            return false;
-        }
-        var endBehavior = this.rootItem.endBehavior;
-        if (this.rootItem.isEnded(this.time)) {
-            this.rootItem.ended = true;
-        }
-        // TODO: 合成结束行为
-        return this.rootItem.ended && endBehavior === EndBehavior.destroy;
-    };
-    /**
    * 合成更新，针对所有 item 的更新
    * @param deltaTime - 更新的时间步长
    * @param skipRender - 是否需要渲染
@@ -25057,49 +25028,56 @@ var listOrder = 0;
         var time = this.getUpdateTime(deltaTime * this.speed);
         this.globalTime += time;
         this.updateRootComposition();
-        if (this.shouldRestart()) {
-            this.emit("end", {
-                composition: this
-            });
-            this.restart();
-        // restart then tick to avoid flicker
-        }
         this.updateVideo();
         // 更新 model-tree-plugin
         this.updatePluginLoaders(deltaTime);
+        // scene VFXItem components lifetime function.
         this.callStart(this.rootItem);
         this.callUpdate(this.rootItem, time);
         this.callLateUpdate(this.rootItem, time);
         this.updateCamera();
+        this.prepareRender();
         if (this.shouldDispose()) {
-            this.emit("end", {
-                composition: this
-            });
             this.dispose();
-        } else {
-            this.prepareRender();
         }
     };
     _proto.toLocalTime = function toLocalTime(time) {
         var localTime = time - this.rootItem.start;
         var duration = this.rootItem.duration;
         if (localTime - duration > 0.001) {
-            if (this.rootItem.endBehavior === EndBehavior.restart) {
-                localTime = localTime % duration;
-            } else if (this.rootItem.endBehavior === EndBehavior.freeze) {
-                localTime = Math.min(duration, localTime);
-                if (localTime === duration) {
-                    if (!this.rootComposition.fezzed) {
-                        this.rootComposition.fezzed = true;
-                        this.emit("end", {
-                            composition: this
-                        });
+            if (!this.rootItem.ended) {
+                this.rootItem.ended = true;
+                this.emit("end", {
+                    composition: this
+                });
+            }
+            switch(this.rootItem.endBehavior){
+                case EndBehavior.restart:
+                    {
+                        localTime = localTime % duration;
+                        this.restart();
+                        break;
+                    }
+                case EndBehavior.freeze:
+                    {
+                        localTime = Math.min(duration, localTime);
+                        break;
+                    }
+                case EndBehavior.forward:
+                    {
+                        break;
+                    }
+                case EndBehavior.destroy:
+                    {
+                        break;
                     }
-                }
             }
         }
         return localTime;
     };
+    _proto.shouldDispose = function shouldDispose() {
+        return this.rootItem.ended && this.rootItem.endBehavior === EndBehavior.destroy && !this.reusable;
+    };
     _proto.getUpdateTime = function getUpdateTime(t) {
         var startTimeInMs = this.startTime * 1000;
         var now = this.rootComposition.time * 1000;
@@ -25430,7 +25408,9 @@ var listOrder = 0;
         (_this_rendererOptions = this.rendererOptions) == null ? void 0 : _this_rendererOptions.emptyTexture.dispose();
         (_this_pluginSystem = this.pluginSystem) == null ? void 0 : _this_pluginSystem.destroyComposition(this);
         this.update = function() {
-            logger.error("Update disposed composition: " + _this.name + ".");
+            {
+                logger.error("Update disposed composition: " + _this.name + ".");
+            }
         };
         this.dispose = noop;
         if (textures && this.keepResource) {
@@ -27593,7 +27573,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.0-alpha.32";
+var version = "2.0.0-alpha.33";
 logger.info("Core version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;