squishjs 0.7.1 → 0.7.4

package/package.json

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

package/src/Game.js

@@ -1,18 +1,9 @@
 class Game {
     constructor() {
-        this.players = {};
-        this.spectators = {};
         this.listeners = new Set();
         this.intervals = [];
         this.timeouts = [];
-    }
-
-    _hgAddPlayer(player) {
-        this.players[player.id] = player;
-    }
-
-    _hgRemovePlayer(playerId) {
-        delete this.players[playerId];
+        this.playerInfoMap = {};
     }
 
     addStateListener(listener) {

package/src/Squisher.js

@@ -14,10 +14,12 @@ class Squisher {
         this.customBottomLayer = customBottomLayer;
         this.customTopLayer = customTopLayer;
 
+        this.playerFrames = {};
+
         this.listeners = new Set();
         this.scale = scale || {x: 1, y: 1};
         this.state = this.squish(this.game.getLayers());
-        this.spectatorState = this.game.getSpectatorLayers ? this.squish(this.game.getSpectatorLayers()) : [];
+        // this.spectatorState = this.game.getSpectatorLayers ? this.squish(this.game.getSpectatorLayers()) : [];
         this.assets = {};
         if (this.game.tick) {
             const tickRate = this.gameMetadata && this.gameMetadata.tickRate ? this.gameMetadata.tickRate : DEFAULT_TICK_RATE;
@@ -43,7 +45,7 @@ class Squisher {
     }
 
     squish(layers, scale = null) {
-
+        
         if (!layers) {
             return [];
         }
@@ -53,9 +55,6 @@ class Squisher {
         let toSquish = [];
 
         const playerMap = {};
-        Object.keys(this.game.players).forEach(playerId => {
-            playerMap[Number(playerId)] = [];
-        });
 
         if (this.customBottomLayer) {
             const squishedLayer = [];
@@ -77,19 +76,22 @@ class Squisher {
         }
 
 
-        if (this.customTopLayer) {
+        if (this.customTopLayer) {            
             const squishedLayer = [];
             this.squishHelper(this.customTopLayer.root, squishedLayer, this.customTopLayer.scale, playerMap);
             toSquish.push(squishedLayer);
         }
 
-        // todo: remove/move this side effect
-        this.playerStates = playerMap;
+        this.playerFrames = playerMap;
 
         return toSquish.flat();
     }
 
-    squishHelper(node, squishedNodes, scale = {x: 1, y: 1}, playerMap = {}) {
+    getPlayerFrame(playerId) {
+        return this.playerFrames[playerId];
+    }
+
+    squishHelper(node, squishedNodes, scale = {x: 1, y: 1}, playerMap = {}, playerIdFilter = new Set()) {
         if (!node.node.listeners.has(this)) {
             node.addListener(this);
         }
@@ -97,24 +99,32 @@ class Squisher {
         const squished = squish(node, scale);
         squishedNodes.push(squished);
 
-        if (playerMap) {
-            if (node.node.playerIds && node.node.playerIds.length) {
-                node.node.playerIds.forEach(playerId => {
-                    if (playerMap[playerId]) {
-                        playerMap[playerId].push(squished);
-                    } else {
-                        console.warn(`Node references unknown player ID: ${playerId}`);
-                    }
-                });
-            } else {
-                Object.keys(playerMap).forEach(playerId => {
-                    playerMap[playerId].push(squished);
-                })
+        if (node.node.playerIds && node.node.playerIds.length > 0) {
+            node.node.playerIds.forEach(pId => playerIdFilter.add(pId));
+        }
+
+        if (playerIdFilter.size > 0) {
+            for (let playerId of playerIdFilter) {
+                if (!playerMap[playerId]) {
+                    playerMap[Number(playerId)] = [];
+                } 
+
+                playerMap[playerId].push(squished);
             }
+        } else {
+            Object.keys(playerMap).forEach(playerId => {
+                if (!playerMap[playerId]) {
+                    playerMap[Number(playerId)] = [];
+                }
+                playerMap[playerId].push(squished);
+            })
         }
 
         for (let i = 0; i < node.node.children.length; i++) {
-            this.squishHelper(node.node.children[i], squishedNodes, scale, playerMap);
+            // 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);
         }
 
     }

package/src/squish.js

@@ -73,7 +73,13 @@ const unsquish = (squished) => {
     }
 
     const constructor = TYPE_TO_CONSTRUCTOR[squished[2]];
-    return new constructor({ node: constructedInternalNode });
+    if (constructor) {
+        return new constructor({ node: constructedInternalNode });
+    } 
+
+    return {
+        node: constructedInternalNode
+    }
 }
 
 // When squishing, we need to make sure that properties that other properties depend on are inserted first.

package/src/squishHelpers/asset.js

@@ -1,4 +1,4 @@
-const { getFractional } = require('../util')
+const { getFractional } = require('../util');
 
 const ASSET_SUBTYPE = 48;
 
@@ -6,7 +6,7 @@ const squishAsset = {
 	type: ASSET_SUBTYPE,
 	squish: (a, scale) => {
 		const assetKey = Object.keys(a)[0];
-		const squishedAssets = new Array(8 + assetKey.length);
+		const squishedAssets = new Array(10 + assetKey.length);
 
 		const asset = a[assetKey];
 
@@ -16,6 +16,8 @@ const squishAsset = {
 		const sizeX = scale ? scale.x * asset.size.x : asset.size.x;
 		const sizeY = scale ? scale.y * asset.size.y : asset.size.y;
 
+		const startTimeSecond = asset.startTime || 0;
+
 		squishedAssets[0] = Math.floor(posX);
 		squishedAssets[1] = getFractional(posX);
 
@@ -28,8 +30,11 @@ const squishAsset = {
 		squishedAssets[6] = Math.floor(sizeY);
 		squishedAssets[7] = getFractional(sizeY);
 
+		squishedAssets[8] = Math.floor(startTimeSecond);
+		squishedAssets[9] = getFractional(startTimeSecond);
+
 		for (let i = 0; i < assetKey.length; i++) {
-			squishedAssets[8 + i] = assetKey.codePointAt(i);
+			squishedAssets[10 + i] = assetKey.codePointAt(i);
 		}
 
 		return squishedAssets;
@@ -41,7 +46,10 @@ const squishAsset = {
 		const assetSizeX = squished[4] + squished[5] / 100;
 		const assetSizeY = squished[6] + squished[7] / 100;
 
-		const assetKey = String.fromCodePoint.apply(null, squished.slice(8));
+		const startTime = squished[8] + squished[9] / 100;
+
+		const assetKey = String.fromCodePoint.apply(null, squished.slice(10));
+
 		return {
 			[assetKey]: {
 				pos: {
@@ -51,7 +59,8 @@ const squishAsset = {
 				size: {
 					x: assetSizeX,
 					y: assetSizeY
-				}
+				},
+				startTime
 			}
 		}
 	}

package/src/squishHelpers/id.js

@@ -3,10 +3,43 @@ const ID_SUBTYPE = 43;
 const squishId = {
 	type: ID_SUBTYPE,
 	squish: (i) => {
-		return [i];
+		// max val: 10 000 000 000 000 000 (ten quadrillion)
+		const idStr = i.toString();
+		let strChunks = [];
+		if (idStr.length > 2) {
+			let j;
+			for (j = 0; j + 2 <= idStr.length; j += 2) {
+				strChunks.push(idStr.substring(j, j + 2));
+			}
+
+			if (j == idStr.length - 1) {
+				strChunks.push(idStr.substring(j, j + 2));
+			}
+		} else {
+			if (idStr.length === 1) {
+				strChunks.push('0' + idStr);
+			} else {
+				strChunks.push(idStr);
+			}
+		}
+
+		if (strChunks.length < 8) {
+			while (strChunks.length < 8) {
+				strChunks = ["00", ...strChunks];
+			}
+		}
+
+		return strChunks.map(c => new Number(c));
 	},
 	unsquish: (arr) => {
-		return arr[0];
+		// build up from right to left then parse
+		let str = '';
+		for (let i = arr.length - 1; i >= 0; i--) {
+			const val = arr[i];
+			str = val + str
+		}
+
+		return new Number(str);
 	}
 }