squishjs 0.7.67 → 1.0.1

package/package.json

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

package/src/Asset.js

@@ -1,3 +1,7 @@
+const path = require('path');
+
+const HG_ASSET_PATH = path.join(getAppDataPath(), 'asset-cache');
+
 class Asset {
     constructor(info, data = null) {
         this.info = info;
@@ -66,9 +70,6 @@ class Asset {
     };
 
     getFileLocation() {
-
-        const HG_ASSET_PATH = this.getConfigValue('HG_ASSET_PATH', `${process.cwd()}/.asset_cache`);
-        
         const fileHash = this.getHash(this.info.id);
         return `${HG_ASSET_PATH}/${fileHash}`;
     }
@@ -91,9 +92,6 @@ class Asset {
     }
 
     async downloadSync(force) {
-        
-        const HG_ASSET_PATH = this.getConfigValue('HG_ASSET_PATH', `${process.cwd()}/.asset_cache`);
-        
         if (!fs.existsSync(HG_ASSET_PATH)) {
             fs.mkdirSync(HG_ASSET_PATH);
         }
@@ -111,9 +109,6 @@ class Asset {
     }
     
     download(force) {
-
-        const HG_ASSET_PATH = this.getConfigValue('HG_ASSET_PATH', `${process.cwd()}/.asset_cache`);
-        
         if (!this.fs.existsSync(HG_ASSET_PATH)) {
             this.fs.mkdirSync(HG_ASSET_PATH);
         }

package/src/Squisher.js

@@ -10,6 +10,7 @@ class Squisher {
         this.ids = new Set();
 
         this.game = game;
+        this.gameMetadata = game.constructor.metadata && game.constructor.metadata();
         this.assets = {};
 
         this.customBottomLayer = customBottomLayer;
@@ -113,12 +114,21 @@ class Squisher {
         }
 
         if (playerIdFilter.size > 0) {
+
+            let playerIdsToRemove = new Set();
             for (let playerId of playerIdFilter) {
                 if (!playerMap[playerId]) {
                     playerMap[Number(playerId)] = [];
                 } 
 
-                playerMap[playerId].push(squished);
+                if (node.node.playerIds.length === 0 || node.node.playerIds.findIndex(i => Number(i) === Number(playerId)) >= 0) {
+                    playerMap[playerId].push(squished);
+                } else {
+                    playerIdsToRemove.add(playerId);
+                }
+            }
+            for (let id of playerIdsToRemove) {
+                playerIdFilter.delete(id);
             }
         } else {
             Object.keys(playerMap).forEach(playerId => {
@@ -130,12 +140,28 @@ 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 
             // modifying the same filter set
             const pathFilter = new Set(playerIdFilter);
             this.squishHelper(node.node.children[i], squishedNodes, scale, playerMap, pathFilter);
         }
 
+        // debug
+        for (let k in playerMap) {
+            for (let squished in playerMap[k]) {
+                const unsquished = unsquish(playerMap[k][squished]);
+                if (unsquished.node.playerIds.length > 0 && unsquished.node.playerIds.findIndex(i => Number(i) === Number(k)) < 0) {
+                    console.log(unsquished.node.playerIds);
+                    console.log(k);
+console.log(unsquished.node.playerIds.indexOf(k));
+                    if (k != 254) {
+                        throw new Error('fuk');
+                    }
+                }
+            }
+        }
+
     }
 
     getJson() {

package/test/Layers.test.js

@@ -43,6 +43,9 @@ test("test layer with child added", () => {
     ]);
 
     const squisher = new Squisher({ game });
+
+    // add listener so squisher cares about update
+    squisher.addListener(() => {});
     
     const initialState = Array.from(squisher.state);
     assert(initialState.length === 2);