squishjs 0.7.51 → 0.7.54

package/package.json

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

package/src/squish.js

@@ -1,5 +1,3 @@
-const assert = require('assert');
-
 const InternalGameNode = require("./InternalGameNode");
 const { CONSTRUCTOR_TO_TYPE, TYPE_TO_CONSTRUCTOR } = require('./node-types');
 const SUBTYPE_MAPPINGS = require('./subtype-mappings');
@@ -43,19 +41,23 @@ for (const key in squishSpec) {
 }
 
 const unsquish = (squished) => {
-    assert(squished[0] == 3);
+    if (squished[0] != 3) {
+        throw new Error('Squished[0] isnt 3.');
+    }
 
-    assert(squished.length === squished[1]);
+    if (squished.length !== squished[1] + squished[2] + squished[3]) {
+        throw new Error('Bad length value');
+    }
 
-    let squishedIndex = 3;
+    let squishedIndex = 5;
 
     let constructedInternalNode = new InternalGameNode();
 
     while(squishedIndex < squished.length) {
 
         const subFrameType = squished[squishedIndex];
-        const subFrameLength = squished[squishedIndex + 1];
-        const subFrame = squished.slice(squishedIndex + 2, squishedIndex + subFrameLength);
+        const subFrameLength = squished[squishedIndex + 1] + squished[squishedIndex + 2];
+        const subFrame = squished.slice(squishedIndex + 3, squishedIndex + subFrameLength);
 
         if (!typeToSquishMap[subFrameType]) {
             console.warn("Unknown sub frame type " + subFrameType);
@@ -72,7 +74,8 @@ const unsquish = (squished) => {
         squishedIndex += subFrameLength;
     }
 
-    const constructor = TYPE_TO_CONSTRUCTOR[squished[2]];
+    const constructor = TYPE_TO_CONSTRUCTOR[squished[4]];
+
     if (constructor) {
         return new constructor({ node: constructedInternalNode });
     } 
@@ -112,7 +115,11 @@ const squish = (entity, scale = null) => {
             const attr = internalNode[key];
             if (attr !== undefined && attr !== null) {
                 const squished = squishSpec[key].squish(attr, scale, internalNode);
-                squishedPieces.push([squishSpec[key]['type'], squished.length + 2, ...squished]);
+                const totalLength = squished.length + 3;
+                const rightMost = Math.min(255, totalLength);
+                const leftMost = Math.min(255, Math.max(0, totalLength - 255));
+
+                squishedPieces.push([squishSpec[key]['type'], leftMost, rightMost, ...squished]);
             }
         }
     }
@@ -125,7 +132,14 @@ const squish = (entity, scale = null) => {
     }
 
     const squished = squishedPieces.flat();
-    return [3, squished.length + 3, nodeClassCode, ...squished];
+
+    // length + 5 bytes for what we're inserting here - 3 for length, one for type (3), one for class code
+    const totalLength = squished.length + 5;
+    const rightMost = Math.min(255, totalLength);
+    const middle = Math.min(255, Math.max(0, totalLength - 255));
+    const leftMost = Math.min(255, Math.max(0, totalLength - 510));
+
+    return [3, leftMost, middle, rightMost, nodeClassCode, ...squished];
 
 }
 

package/src/squishHelpers/text.js

@@ -151,4 +151,4 @@ const squishText = {
 module.exports = {
     TEXT_SUBTYPE,
     squishText
-};
+};

package/test/main.test.js

@@ -309,5 +309,29 @@ test("scaled asset node", () => {
     assert(asset.size.y === .85 * 20);
 });
 
+test("big big text", () => {
+    const gameNode = new GameNode.Text({
+        textInfo: {
+            text: 'I am going to write a whoooooole lot of text like more than 64 characters which is quite a bit. Not like a tweet long but still long, you know?',
+            x: 4,
+            y: 20,
+            size: 5,
+            align: 'center',
+            color: COLORS.RED
+        }
+    });
+
+    const xScale = .6;
+    const yScale = .5;
+
+    const scaledTextSize = 5 * hypLength(xScale, yScale);
+
+    const squishedScaledNode = squish(gameNode, {x: xScale, y: yScale});
+    const unsquishedNode = unsquish(squishedScaledNode).node;
 
+    assert(unsquishedNode.text.x.toFixed(2) === (4 * xScale + Math.round((1 - xScale) * 100) / 2).toFixed(2));
+    assert(unsquishedNode.text.y.toFixed(2) === (20 * yScale + Math.round((1 - yScale) * 100) / 2).toFixed(2));
+
+    assert(unsquishedNode.text.size.toFixed(2) === scaledTextSize.toFixed(2));
+});