@dcl/ecs 7.13.1-19324737285.commit-cb42004 → 7.13.1-19516109426.commit-e1e79aa

package/dist-cjs/systems/tween.js

@@ -47,16 +47,16 @@ function createTweenSystem(engine) {
         const tweenState = TweenState.getOrNull(entity);
         const tween = Tween.getOrNull(entity);
         const tweenCache = cache.get(entity);
-        if (!tweenState || !tween || !tweenCache)
+        if (!tweenState || !tween)
             return false;
         /* istanbul ignore next */
         if (
         // Renderer notified that the tween is completed
-        // Only consider it completed if the tween hasn't changed this frame (to avoid false positives after YOYO/sequence processing)
-        ((tweenState.state === 1 /* TweenStateStatus.TS_COMPLETED */ && !tweenCache.changed) ||
-            (tweenChanged(entity) && !tweenCache.changed)) &&
+        (tweenChanged(entity) || tweenState.state === 1 /* TweenStateStatus.TS_COMPLETED */) &&
             // Avoid sending isCompleted multiple times
-            !tweenCache.completed) {
+            !tweenCache?.completed &&
+            // Amount of frames needed to consider a tween completed
+            (tweenCache?.frames ?? 0) > 2) {
             return true;
         }
         return false;
@@ -68,111 +68,86 @@ function createTweenSystem(engine) {
         if ((currentTween && !prevTween) || (!currentTween && prevTween)) {
             return true;
         }
-        if (!currentTween || !prevTween)
-            return false;
         const currentBuff = new ByteBuffer_1.ReadWriteByteBuffer();
         Tween.schema.serialize(currentTween, currentBuff);
-        const compareResult = (0, utils_1.dataCompare)(currentBuff.toBinary(), prevTween);
-        return compareResult !== 0;
+        const equal = (0, utils_1.dataCompare)(currentBuff.toBinary(), prevTween);
+        return equal;
     }
-    // System to manage cache (needed for tweenSystem.tweenCompleted() to work)
+    const restartTweens = [];
+    // Logic for sequence tweens
     engine.addSystem(() => {
+        for (const restart of restartTweens) {
+            restart();
+        }
+        restartTweens.length = 0;
         for (const [entity, tween] of engine.getEntitiesWith(Tween)) {
             if (tweenChanged(entity)) {
                 const buffer = new ByteBuffer_1.ReadWriteByteBuffer();
                 Tween.schema.serialize(tween, buffer);
                 cache.set(entity, {
                     tween: buffer.toBinary(),
+                    frames: 0,
                     completed: false,
                     changed: true
                 });
                 continue;
             }
             const tweenCache = cache.get(entity);
-            if (tweenCache) {
-                tweenCache.changed = false;
-                if (isCompleted(entity)) {
-                    // set the tween completed to avoid calling this again for the same tween
-                    tweenCache.completed = true;
+            tweenCache.frames += 1;
+            tweenCache.changed = false;
+            if (isCompleted(entity)) {
+                // Reset tween frames.
+                tweenCache.frames = 0;
+                // set the tween completed to avoid calling this again for the same tween
+                tweenCache.completed = true;
+                const tweenSequence = TweenSequence.getOrNull(entity);
+                if (!tweenSequence)
+                    continue;
+                const { sequence } = tweenSequence;
+                if (sequence && sequence.length) {
+                    const [nextTweenSequence, ...otherTweens] = sequence;
+                    Tween.createOrReplace(entity, nextTweenSequence);
+                    const mutableTweenHelper = TweenSequence.getMutable(entity);
+                    mutableTweenHelper.sequence = otherTweens;
+                    if (tweenSequence.loop === 0 /* TweenLoop.TL_RESTART */) {
+                        mutableTweenHelper.sequence.push(tween);
+                    }
+                }
+                else if (tweenSequence.loop === 1 /* TweenLoop.TL_YOYO */) {
+                    Tween.createOrReplace(entity, backwardsTween(tween));
+                }
+                else if (tweenSequence.loop === 0 /* TweenLoop.TL_RESTART */) {
+                    Tween.deleteFrom(entity);
+                    cache.delete(entity);
+                    restartTweens.push(() => {
+                        Tween.createOrReplace(entity, tween);
+                    });
                 }
             }
         }
     }, Number.NEGATIVE_INFINITY);
-    function initializeTweenSequenceSystem() {
-        const restartTweens = [];
-        function backwardsTween(tween) {
-            if (tween.mode?.$case === 'move' && tween.mode.move) {
-                return { ...tween, mode: { ...tween.mode, move: { start: tween.mode.move.end, end: tween.mode.move.start } } };
-            }
-            if (tween.mode?.$case === 'rotate' && tween.mode.rotate) {
-                return {
-                    ...tween,
-                    mode: { ...tween.mode, rotate: { start: tween.mode.rotate.end, end: tween.mode.rotate.start } }
-                };
-            }
-            if (tween.mode?.$case === 'scale' && tween.mode.scale) {
-                return { ...tween, mode: { ...tween.mode, scale: { start: tween.mode.scale.end, end: tween.mode.scale.start } } };
-            }
-            if (tween.mode?.$case === 'textureMove' && tween.mode.textureMove) {
-                return {
-                    ...tween,
-                    mode: { ...tween.mode, textureMove: { start: tween.mode.textureMove.end, end: tween.mode.textureMove.start } }
-                };
-            }
-            /* istanbul ignore next */
-            throw new Error('Invalid tween');
+    function backwardsTween(tween) {
+        if (tween.mode?.$case === 'move' && tween.mode.move) {
+            return { ...tween, mode: { ...tween.mode, move: { start: tween.mode.move.end, end: tween.mode.move.start } } };
         }
-        // Logic for sequence tweens
-        engine.addSystem(() => {
-            for (const restart of restartTweens) {
-                restart();
-            }
-            restartTweens.length = 0;
-            for (const [entity, tween] of engine.getEntitiesWith(Tween)) {
-                const tweenCache = cache.get(entity);
-                if (!tweenCache)
-                    continue;
-                // Only process tween sequences if the tween is completed
-                if (tweenCache.completed) {
-                    const tweenSequence = TweenSequence.getOrNull(entity);
-                    if (!tweenSequence)
-                        continue;
-                    const { sequence } = tweenSequence;
-                    if (sequence && sequence.length) {
-                        const [nextTweenSequence, ...otherTweens] = sequence;
-                        Tween.createOrReplace(entity, nextTweenSequence);
-                        const mutableTweenHelper = TweenSequence.getMutable(entity);
-                        mutableTweenHelper.sequence = otherTweens;
-                        if (tweenSequence.loop === 0 /* TweenLoop.TL_RESTART */) {
-                            mutableTweenHelper.sequence.push(tween);
-                        }
-                        // Reset completed flag for the next tween in sequence
-                        // Mark as changed so the cache system will detect the change and reset the cache properly
-                        tweenCache.completed = false;
-                        tweenCache.changed = true;
-                    }
-                    else if (tweenSequence.loop === 1 /* TweenLoop.TL_YOYO */) {
-                        Tween.createOrReplace(entity, backwardsTween(tween));
-                        // Reset completed flag for the backwards tween
-                        // Mark as changed so the cache system will detect the change and reset the cache properly
-                        tweenCache.completed = false;
-                        tweenCache.changed = true;
-                    }
-                    else if (tweenSequence.loop === 0 /* TweenLoop.TL_RESTART */) {
-                        Tween.deleteFrom(entity);
-                        cache.delete(entity);
-                        restartTweens.push(() => {
-                            Tween.createOrReplace(entity, tween);
-                        });
-                    }
-                }
-            }
-        }, Number.NEGATIVE_INFINITY);
+        if (tween.mode?.$case === 'rotate' && tween.mode.rotate) {
+            return {
+                ...tween,
+                mode: { ...tween.mode, rotate: { start: tween.mode.rotate.end, end: tween.mode.rotate.start } }
+            };
+        }
+        if (tween.mode?.$case === 'scale' && tween.mode.scale) {
+            return { ...tween, mode: { ...tween.mode, scale: { start: tween.mode.scale.end, end: tween.mode.scale.start } } };
+        }
+        if (tween.mode?.$case === 'textureMove' && tween.mode.textureMove) {
+            return {
+                ...tween,
+                mode: { ...tween.mode, textureMove: { start: tween.mode.textureMove.end, end: tween.mode.textureMove.start } }
+            };
+        }
+        /* istanbul ignore next */
+        throw new Error('Invalid tween');
     }
-    // Some Explorers may not inject the flag and TweenSequence logic must be enabled in that case
-    const enableTweenSequenceLogic = globalThis.ENABLE_SDK_TWEEN_SEQUENCE;
-    if (enableTweenSequenceLogic !== false)
-        initializeTweenSequenceSystem();
     const tweenSystem = {
         // This event is fired only once per tween
         tweenCompleted: isCompleted

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcl/ecs",
   "description": "Decentraland ECS",
-  "version": "7.13.1-19324737285.commit-cb42004",
+  "version": "7.13.1-19516109426.commit-e1e79aa",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/ecs/issues",
   "files": [
@@ -33,5 +33,5 @@
   },
   "types": "./dist/index.d.ts",
   "typings": "./dist/index.d.ts",
-  "commit": "cb42004e537ef6d09c8db67e350da80df94242ec"
+  "commit": "e1e79aa4c353b3698cf182659d0110ef3eb2e68f"
 }