squishjs 1.4.1 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squishjs",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "squish & unsquish stuff",
   "scripts": {
     "test": "node testRunner.js"

package/src/Squisher.js

@@ -67,30 +67,34 @@ class Squisher {
         let toSquish = [];
 
         const playerMap = {};
+        // Shared (visible-to-everyone) nodes in traversal order, kept so a
+        // player frame created mid-traversal can be seeded with everything
+        // shared that was squished before that player's first scoped node.
+        const sharedNodes = [];
 
         if (this.customBottomLayer) {
             const squishedLayer = [];
-            this.squishHelper(this.customBottomLayer.root, squishedLayer, this.customBottomLayer.scale, playerMap);
+            this.squishHelper(this.customBottomLayer.root, squishedLayer, this.customBottomLayer.scale, playerMap, new Set(), sharedNodes);
             toSquish.push(squishedLayer);
         }
-        
+
         for (const layerIndex in layers) {
             const squishedLayer = [];
             const layerInfo = layers[layerIndex];
-            
+
             const layerScale = layerInfo.scale ? {
                 x: this.scale.x * layerInfo.scale.x,
                 y: this.scale.y * layerInfo.scale.y
             } : this.scale;
 
-            this.squishHelper(layerInfo.root, squishedLayer, scale || layerScale, playerMap);
+            this.squishHelper(layerInfo.root, squishedLayer, scale || layerScale, playerMap, new Set(), sharedNodes);
             toSquish.push(squishedLayer);
         }
 
 
-        if (this.customTopLayer) {            
+        if (this.customTopLayer) {
             const squishedLayer = [];
-            this.squishHelper(this.customTopLayer.root, squishedLayer, this.customTopLayer.scale, playerMap);
+            this.squishHelper(this.customTopLayer.root, squishedLayer, this.customTopLayer.scale, playerMap, new Set(), sharedNodes);
             toSquish.push(squishedLayer);
         }
 
@@ -123,7 +127,7 @@ class Squisher {
         return !!(sound && sound.enabled === false);
     }
 
-    squishHelper(node, squishedNodes, scale = {x: 1, y: 1}, playerMap = {}, playerIdFilter = new Set()) {
+    squishHelper(node, squishedNodes, scale = {x: 1, y: 1}, playerMap = {}, playerIdFilter = new Set(), sharedNodes = []) {
         if (!node.node.listeners.has(this)) {
             node.addListener(this);
         }
@@ -139,7 +143,13 @@ class Squisher {
             let playerIdsToRemove = new Set();
             for (let playerId of playerIdFilter) {
                 if (!playerMap[playerId]) {
-                    playerMap[Number(playerId)] = [];
+                    // First scoped node seen for this player. Seed their frame
+                    // with every shared node squished so far — otherwise the
+                    // frame would be missing everything shared (root
+                    // background included) that preceded it in traversal.
+                    playerMap[Number(playerId)] = sharedNodes
+                        .filter(shared => !this._isAudioMutedFor(shared.node, playerId))
+                        .map(shared => shared.squished);
                 }
 
                 if (node.node.playerIds.length === 0 || node.node.playerIds.findIndex(i => Number(i) === Number(playerId)) >= 0) {
@@ -154,10 +164,8 @@ class Squisher {
                 playerIdFilter.delete(id);
             }
         } else {
+            sharedNodes.push({ node, squished });
             Object.keys(playerMap).forEach(playerId => {
-                if (!playerMap[playerId]) {
-                    playerMap[Number(playerId)] = [];
-                }
                 if (!this._isAudioMutedFor(node, playerId)) {
                     playerMap[playerId].push(squished);
                 }
@@ -166,10 +174,10 @@ class Squisher {
 
         for (let i = 0; i < node.node.children.length; i++) {
 //            if (node.node.children[i].node.playerIds
-            // make a new set so child calls within a single generation arent 
+            // make a new set so child calls within a single generation arent
             // modifying the same filter set
             const pathFilter = new Set(playerIdFilter);
-            this.squishHelper(node.node.children[i], squishedNodes, scale, playerMap, pathFilter);
+            this.squishHelper(node.node.children[i], squishedNodes, scale, playerMap, pathFilter, sharedNodes);
         }
 
     }

package/test/Squisher.test.js

@@ -82,6 +82,36 @@ test("squisher does not crash on an asset node with an unregistered key", () =>
     assert(frame && frame.length >= 1);
 });
 
+test("player frame includes shared nodes squished before the player's first scoped node", () => {
+    // The root background and an early shared sibling precede the scoped
+    // node in traversal order. The player's frame must still contain them
+    // (seeded on frame creation), in draw order.
+    const root = rectNode({ x: 0, y: 0, width: 100, height: 100, fill: COLORS.WHITE });
+    const earlyShared = rectNode({ x: 1, y: 1, width: 5, height: 5, fill: COLORS.GREEN });
+    const scoped = new GameNode.Shape({
+        shapeType: Shapes.POLYGON,
+        coordinates2d: ShapeUtils.rectangle(2, 2, 5, 5),
+        fill: COLORS.BLUE,
+        playerIds: [7]
+    });
+    const lateShared = rectNode({ x: 3, y: 3, width: 5, height: 5, fill: COLORS.RED });
+
+    root.addChild(earlyShared);
+    root.addChild(scoped);
+    root.addChild(lateShared);
+
+    const game = new FakeGame([{ root, scale: { x: 1, y: 1 } }]);
+    const squisher = new Squisher({ game });
+
+    const frame = squisher.getPlayerFrame(7);
+    assert(frame.length === 4);
+    const fills = frame.map(squished => unsquish(squished).node.fill);
+    verifyArrayEquality(fills[0], COLORS.WHITE);
+    verifyArrayEquality(fills[1], COLORS.GREEN);
+    verifyArrayEquality(fills[2], COLORS.BLUE);
+    verifyArrayEquality(fills[3], COLORS.RED);
+});
+
 test("squisher withholds muted audio from a player-scoped subtree", () => {
     const root = new GameNode.Shape({
         shapeType: Shapes.POLYGON,