Revert "Fix #1446 (#1447)"

This reverts commit 2d45fa8cd1.

gulp/atlas2json.js

@@ -4,33 +4,49 @@ const { readFileSync, readdirSync, writeFileSync } = require("fs");
 const suffixToScale = {
     lq: "0.25",
     mq: "0.5",
-    hq: "0.75",
+    hq: "0.75"
 };
 
 function convert(srcDir) {
-    const fullPath = resolve(srcDir);
+    const full = resolve(srcDir);
-    const srcFiles = readdirSync(fullPath)
+    const srcFiles = readdirSync(full)
         .filter(n => n.endsWith(".atlas"))
-        .map(n => join(fullPath, n));
+        .map(n => join(full, n));
 
     for (const atlas of srcFiles) {
         console.log(`Processing: ${atlas}`);
 
-        // Sections for different atlas images are broken up via an extra line break
+        // Read all text, split it into line array
-        const atlasSections = readFileSync(atlas, "utf-8")
+        // and filter all empty lines
-            .trim()
+        const lines = readFileSync(atlas, "utf-8")
-            .split("\n\n");
+            .split("\n")
+            .filter(n => n.trim());
 
-        console.log("Found " + atlasSections.length + " sections!");
+        // Get source image name
-        // Perform the conversion for each section
+        const image = lines.shift();
-        for (const section of atlasSections) {
+        const srcMeta = {};
-            preformConversion(fullPath, section);
+
-        }
+        // Read all metadata (supports only one page)
+        while (true) {
+            const kv = lines.shift().split(":");
+            if (kv.length != 2) {
+                lines.unshift(kv[0]);
+                break;
             }
+
+            srcMeta[kv[0]] = kv[1].trim();
         }
 
-function formatImageData(keywordArgs) {
+        const frames = {};
-    let { name, rotate, xy, size, orig, offset, index } = keywordArgs;
+        let current = null;
+
+        lines.push("Dummy line to make it convert last frame");
+
+        for (const line of lines) {
+            if (!line.startsWith("  ")) {
+                // New frame, convert previous if it exists
+                if (current != null) {
+                    let { name, rotate, xy, size, orig, offset, index } = current;
 
                     // Convert to arrays because Node.js doesn't
                     // support latest JS features
@@ -40,101 +56,50 @@ function formatImageData(keywordArgs) {
                     offset = offset.split(",").map(v => Number(v));
 
                     // GDX TexturePacker removes index suffixes
-    let imageName = index === -1 ? `${name}.png` : `${name}_${index}.png`;
+                    const indexSuff = index != -1 ? `_${index}` : "";
-
+                    const isTrimmed = size != orig;
 
-    const frameInfo = {
+                    frames[`${name}${indexSuff}.png`] = {
                         // Bounds on atlas
                         frame: {
                             x: xy[0],
                             y: xy[1],
                             w: size[0],
-            h: size[1],
+                            h: size[1]
                         },
 
                         // Whether image was rotated
-        rotated: rotate === "true",
+                        rotated: rotate == "true",
-
+                        trimmed: isTrimmed,
-        // If blank space was trimmed from the image
-        trimmed: size !== orig,
 
                         // How is the image trimmed
                         spriteSourceSize: {
                             x: offset[0],
                             y: (orig[1] - size[1]) - offset[1],
                             w: size[0],
-            h: size[1],
+                            h: size[1]
                         },
                         
-        // Original image size
                         sourceSize: {
                             w: orig[0],
-            h: orig[1],
+                            h: orig[1]
-        },
-    };
-
-    return [imageName, frameInfo];
                         }
-
-function preformConversion(pathPrefix, atlasData) {
-    // Read all text, split it into line array
-    // and filter all empty lines
-    const lines = atlasData
-        .split("\n")
-        .filter(n => n.trim());
-
-    // Get source image name
-    const image = lines.shift();
-    const srcMeta = {};
-
-    // Read all metadata
-    while (true) {
-        const nextLine = lines.shift();
-
-        // If a line does not contain a colon, we have gone too far
-        if (!nextLine.includes(":")) {
-            lines.unshift(nextLine);
-            break;
                     }
-
-        // Append the parsed key value pair to our metadata map
-        const [key, value] = nextLine.split(":");
-        srcMeta[key] = value.trim();
                 }
 
-    const frames = {};
+                // Simple object that will hold other metadata
-    let current = null;
+                current = {
-
+                    name: line
-    for (const line of lines) {
+                };
-        if (!line.startsWith("  ")) {
-            // New frame, convert previous if it exists
-            if (current !== null) {
-                // Add the previous image's frame info to the frame map
-                const [imageName, frameInfo] = formatImageData(current);
-                frames[imageName] = frameInfo;
-            }
-
-            // Reset the frame info with the new frame name.
-            current = { name: line };
             } else {
                 // Read and set current image metadata
-            const [key, value] = line.split(":").map(v => v.trim());
+                const kv = line.split(":").map(v => v.trim());
-
+                current[kv[0]] = isNaN(Number(kv[1])) ? kv[1] : Number(kv[1]);
-            // Check if the value should be a number
-            const valueAsNum = Number(value);
-            current[key] = isNaN(valueAsNum) ? value : valueAsNum;
             }
         }
 
-    // Assuming the image was not empty, there should be one last remaining entry that needs to be added.
-    if (current !== null) {
-        // Add the previous image's frame info to the frame map
-        const [imageName, frameInfo] = formatImageData(current);
-        frames[imageName] = frameInfo;
-    }
-
         const atlasSize = srcMeta.size.split(",").map(v => Number(v));
-    const atlasScale = suffixToScale[image.match(/_([a-z]+)\d*\.png$/)[1]];
+        const atlasScale = suffixToScale[atlas.match(/_(\w+)\.atlas$/)[1]];
 
         const result = JSON.stringify({
             frames,
@@ -143,16 +108,20 @@ function preformConversion(pathPrefix, atlasData) {
                 format: srcMeta.format,
                 size: {
                     w: atlasSize[0],
-                h: atlasSize[1],
+                    h: atlasSize[1]
-            },
-            scale: atlasScale.toString(),
                 },
+                scale: atlasScale.toString()
+            }
         });
 
-    const dstFile = join(pathPrefix, image.replace(".png", ".json"));
+        writeFileSync(atlas.replace(".atlas", ".json"), result, {
-    writeFileSync(dstFile, result, {
+            encoding: "utf-8"
-        encoding: "utf-8",
         });
     }
+}
+
+if (require.main == module) {
+    convert(process.argv[2]);
+}
 
 module.exports = { convert };