@galacean/effects 1.1.4 → 1.1.6

package/dist/weapp.mjs

@@ -14939,7 +14939,6 @@ var VFXItem = /** @class */ (function () {
                         shouldUpdate = true;
                         if (this.endBehavior === END_BEHAVIOR_RESTART$1) {
                             this.ended = true;
-                            lifetime = lifetime % 1;
                         }
                     }
                 }
@@ -14947,7 +14946,7 @@ var VFXItem = /** @class */ (function () {
                     this.setVisible(true);
                     this.callEnd = false;
                 }
-                this.lifetime = lifetime;
+                this.lifetime = lifetime % 1;
                 shouldUpdate && this.onItemUpdate(dt, lifetime);
             }
         }
@@ -19270,19 +19269,28 @@ var SpriteMesh = /** @class */ (function () {
         var aPointLen = 0;
         var indexLen = 0;
         var pointCount = 0;
+        var renderInfo;
         if (!items.length) {
             this.mesh.setVisible(false);
             return true;
         }
+        for (var i = 0; i < items.length; i++) {
+            if (items[i].renderInfo) {
+                renderInfo = items[i].renderInfo;
+                break;
+            }
+        }
+        if (!renderInfo) {
+            return true;
+        }
         this.items = items.slice();
         if (items.length > 2) {
             itemSlot = maxSpriteMeshItemCount;
         }
-        var renderInfo = items[0].renderInfo;
         if (this.mtlSlotCount !== itemSlot) {
             this.mesh.setMaterial(this.createMaterial(renderInfo, itemSlot), { textures: DestroyOptions.keep });
         }
-        var attachmentLength = (_d = (_c = (_b = (_a = renderInfo === null || renderInfo === void 0 ? void 0 : renderInfo.filter) === null || _a === void 0 ? void 0 : _a.passSplitOptions) === null || _b === void 0 ? void 0 : _b.attachments) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0;
+        var attachmentLength = (_d = (_c = (_b = (_a = renderInfo.filter) === null || _a === void 0 ? void 0 : _a.passSplitOptions) === null || _b === void 0 ? void 0 : _b.attachments) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0;
         this.splitLayer = attachmentLength > 0;
         for (var i = 0; i < items.length; i++) {
             var item = items[i];
@@ -23881,9 +23889,7 @@ var ParticleSystem = /** @class */ (function () {
                         if (options.removeParticle) {
                             mesh.removePoint(pointIndex);
                             this.clearPointTrail(pointIndex);
-                            link.removeNode(node);
-                            node.content = [0];
-                            // link.shiftNode(node.content); // 删了又加回去 没明白什么意思
+                            node.content[0] = 0;
                         }
                         hitPositions.push(pos);
                         if (!options.multiple) {
@@ -24137,7 +24143,9 @@ function randomArrItem(arr, keepArr) {
 var ParticleVFXItem = /** @class */ (function (_super) {
     __extends(ParticleVFXItem, _super);
     function ParticleVFXItem() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.destroyed = false;
+        return _this;
     }
     Object.defineProperty(ParticleVFXItem.prototype, "type", {
         get: function () {
@@ -30460,7 +30468,7 @@ var Composition = /** @class */ (function () {
     });
     Object.defineProperty(Composition.prototype, "startTime", {
         /**
-         * 获取合成开始时间
+         * 获取合成开始渲染的时间
          */
         get: function () {
             var _a;
@@ -30540,7 +30548,12 @@ var Composition = /** @class */ (function () {
         if (this.content.ended && this.reusable) {
             this.restart();
         }
-        this.gotoAndPlay(this.time);
+        if (this.content.started) {
+            this.gotoAndPlay(this.time - this.startTime);
+        }
+        else {
+            this.gotoAndPlay(0);
+        }
     };
     /**
      * 暂停合成的播放
@@ -30554,14 +30567,21 @@ var Composition = /** @class */ (function () {
     Composition.prototype.resume = function () {
         this.paused = false;
     };
+    /**
+     * 跳转合成到指定时间播放
+     * @param time - 相对 startTime 的时间
+     */
     Composition.prototype.gotoAndPlay = function (time) {
         this.resume();
         if (!this.content.started) {
             this.content.start();
-            this.forwardTime(this.startTime);
         }
-        this.forwardTime(time);
+        this.forwardTime(time + this.startTime);
     };
+    /**
+     * 跳转合成到指定时间并暂停
+     * @param time - 相对 startTime 的时间
+     */
     Composition.prototype.gotoAndStop = function (time) {
         this.gotoAndPlay(time);
         this.pause();
@@ -30581,21 +30601,29 @@ var Composition = /** @class */ (function () {
     };
     /**
      * 跳到指定时间点（不做任何播放行为）
-     * @param time - 指定的时间
+     * @param time - 相对 startTime 的时间
      */
     Composition.prototype.setTime = function (time) {
         var pause = this.paused;
         if (pause) {
             this.resume();
         }
-        this.forwardTime(time, true);
+        if (!this.content.started) {
+            this.content.start();
+        }
+        this.forwardTime(time + this.startTime, true);
         if (pause) {
             this.pause();
         }
     };
+    /**
+     * 前进合成到指定时间
+     * @param time - 相对0时刻的时间
+     * @param skipRender - 是否跳过渲染
+     */
     Composition.prototype.forwardTime = function (time, skipRender) {
         if (skipRender === void 0) { skipRender = false; }
-        var deltaTime = (this.startTime + Math.max(0, time)) * 1000 - this.content.timeInms;
+        var deltaTime = time * 1000 - this.content.timeInms;
         var reverse = deltaTime < 0;
         var step = 15;
         var t = Math.abs(deltaTime);
@@ -32995,6 +33023,13 @@ var GLMaterial = /** @class */ (function (_super) {
         try {
             for (var _b = __values$1(Object.values(this.textures)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var texture = _c.value;
+                if (!isFunction(texture.initialize)) {
+                    console.error({
+                        content: "".concat(JSON.stringify(texture), " is not valid Texture to initialize"),
+                        type: LOG_TYPE,
+                    });
+                    return;
+                }
                 texture.initialize();
             }
         }
@@ -35890,7 +35925,7 @@ var Player = /** @class */ (function () {
         }
     };
     /**
-     * 跳转全部合成带指定时间并停留
+     * 跳转全部合成到指定时间并停留
      * @param time - 指定时间, 单位秒
      */
     Player.prototype.gotoAndStop = function (time) {
@@ -36369,9 +36404,9 @@ Renderer.create = function (canvas, framework, renderOptions) {
 Engine.create = function (gl) {
     return new GLEngine(gl);
 };
-var version = "1.1.4";
+var version = "1.1.6";
 console.info({
-    content: '[Galacean Effects Player] version: ' + "1.1.4",
+    content: '[Galacean Effects Player] version: ' + "1.1.6",
     type: LOG_TYPE,
 });