protosprite-geom 0.2.5 → 0.3.0

package/dist/src/trace/trace.js

@@ -1,43 +1,43 @@
-import { isoContours } from 'marchingsquares';
+import { contours } from 'd3-contour';
 import { Vec2Data } from '../core/data.js';
 
 function traceContours(imageData, alphaThreshold = 1) {
     const { width, height, data } = imageData;
-    // Build a 2D grid of alpha values with 1px of zero-padding on all sides.
+    // Build a 1D flat array of alpha values with 1px of zero-padding on all sides.
     // This ensures marching squares can properly close contours when opaque
-    // pixels touch the image edge, without producing a spurious outer loop
-    // (which the library's built-in frame does).
+    // pixels touch the image edge, without producing a spurious outer loop.
     const paddedW = width + 2;
-    const grid = [];
-    // Top padding row.
-    grid.push(new Array(paddedW).fill(0));
+    const paddedH = height + 2;
+    const grid = new Array(paddedW * paddedH).fill(0);
     for (let y = 0; y < height; y++) {
-        const row = [0]; // left padding
         for (let x = 0; x < width; x++) {
-            const idx = (y * width + x) * 4;
-            row.push(data[idx + 3]); // alpha channel
+            const srcIdx = (y * width + x) * 4;
+            // d3-contour indexes as values[i + j * width] where i=col, j=row
+            const dstIdx = (x + 1) + (y + 1) * paddedW;
+            grid[dstIdx] = data[srcIdx + 3]; // alpha channel
         }
-        row.push(0); // right padding
-        grid.push(row);
     }
-    // Bottom padding row.
-    grid.push(new Array(paddedW).fill(0));
-    // Run marching squares on the padded grid.
-    // noFrame: true since we added our own padding.
-    const contours = isoContours(grid, alphaThreshold, { noFrame: true });
-    // Convert to Vec2Data arrays, subtracting the 1px padding offset.
+    // Run marching squares via d3-contour on the padded grid.
+    // smooth(false) produces staircase edges matching the original behavior.
+    const generator = contours()
+        .size([paddedW, paddedH])
+        .smooth(false);
+    const multiPolygon = generator.contour(grid, alphaThreshold);
+    // Extract rings from the GeoJSON MultiPolygon, subtracting the 1px padding offset.
     const result = [];
-    for (const contour of contours) {
-        if (contour.length < 3)
-            continue;
-        const polygon = [];
-        for (const point of contour) {
-            const v = new Vec2Data();
-            v.x = point[0] - 1;
-            v.y = point[1] - 1;
-            polygon.push(v);
+    for (const polygon of multiPolygon.coordinates) {
+        for (const ring of polygon) {
+            if (ring.length < 3)
+                continue;
+            const polyVerts = [];
+            for (const [px, py] of ring) {
+                const v = new Vec2Data();
+                v.x = px - 1;
+                v.y = py - 1;
+                polyVerts.push(v);
+            }
+            result.push(polyVerts);
         }
-        result.push(polygon);
     }
     return result;
 }

package/dist/src/trace/trace.js.map

@@ -1 +1 @@
-{"version":3,"file":"trace.js","sources":["../../../src/trace/trace.ts"],"sourcesContent":[null],"names":[],"mappings":";;;SAUgB,aAAa,CAC3B,SAAwB,EACxB,iBAAyB,CAAC,EAAA;IAE1B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,SAAS;;;;;AAMzC,IAAA,MAAM,OAAO,GAAG,KAAK,GAAG,CAAC;IAEzB,MAAM,IAAI,GAAe,EAAE;;AAG3B,IAAA,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAErC,IAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;AAC/B,QAAA,MAAM,GAAG,GAAa,CAAC,CAAC,CAAC,CAAC;AAC1B,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;YAC9B,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC;AAC/B,YAAA,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAC1B;AACA,QAAA,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACZ,QAAA,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAChB;;AAGA,IAAA,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;;;AAIrC,IAAA,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;IAGrE,MAAM,MAAM,GAAiB,EAAE;AAC/B,IAAA,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;AAC9B,QAAA,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE;QACxB,MAAM,OAAO,GAAe,EAAE;AAC9B,QAAA,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;AAC3B,YAAA,MAAM,CAAC,GAAG,IAAI,QAAQ,EAAE;YACxB,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;YAClB,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;AAClB,YAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACjB;AACA,QAAA,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;IACtB;AAEA,IAAA,OAAO,MAAM;AACf;;;;"}
+{"version":3,"file":"trace.js","sources":["../../../src/trace/trace.ts"],"sourcesContent":[null],"names":[],"mappings":";;;SAUgB,aAAa,CAC3B,SAAwB,EACxB,iBAAyB,CAAC,EAAA;IAE1B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,SAAS;;;;AAKzC,IAAA,MAAM,OAAO,GAAG,KAAK,GAAG,CAAC;AACzB,IAAA,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC;AAC1B,IAAA,MAAM,IAAI,GAAG,IAAI,KAAK,CAAS,OAAO,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAEzD,IAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;AAC/B,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;YAC9B,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC;;AAElC,YAAA,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,OAAO;AAC1C,YAAA,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAClC;IACF;;;IAIA,MAAM,SAAS,GAAG,QAAQ;AACvB,SAAA,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC;SACvB,MAAM,CAAC,KAAK,CAAC;IAEhB,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC;;IAG5D,MAAM,MAAM,GAAiB,EAAE;AAC/B,IAAA,KAAK,MAAM,OAAO,IAAI,YAAY,CAAC,WAAW,EAAE;AAC9C,QAAA,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;AAC1B,YAAA,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;gBAAE;YACrB,MAAM,SAAS,GAAe,EAAE;YAChC,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE;AAC3B,gBAAA,MAAM,CAAC,GAAG,IAAI,QAAQ,EAAE;AACxB,gBAAA,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC;AACZ,gBAAA,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC;AACZ,gBAAA,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACnB;AACA,YAAA,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;QACxB;IACF;AAEA,IAAA,OAAO,MAAM;AACf;;;;"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "protosprite-geom",
   "type": "module",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "Polygon geometry tracing and encoding for protosprite",
   "main": "dist/core.js",
   "types": "dist/src/core/index.d.ts",
@@ -45,16 +45,17 @@
     "@bufbuild/buf": "^1.56.0",
     "@bufbuild/protobuf": "^2.7.0",
     "@bufbuild/protoc-gen-es": "^2.7.0",
+    "d3-contour": "^4.0.2",
     "jimp": "^1.6.0",
-    "marchingsquares": "^1.3.3",
     "poly-decomp": "^0.3.0",
-    "protosprite-core": "^0.2.4",
+    "protosprite-core": "^0.3.0",
     "simplify-js": "^1.2.4",
     "tslib": "^2.8.1",
     "typescript": "^5.9.2"
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "^12.1.4",
+    "@types/d3-contour": "^3.0.6",
     "rollup": "^4.48.1"
   },
   "gitHead": "842676edbb77aff985b2d3acd67324be4cecd753"

package/src/trace/trace.ts

@@ -1,4 +1,4 @@
-import { isoContours } from "marchingsquares";
+import { contours } from "d3-contour";
 
 import { Vec2Data } from "../core/data.js";
 
@@ -14,46 +14,44 @@ export function traceContours(
 ): Vec2Data[][] {
   const { width, height, data } = imageData;
 
-  // Build a 2D grid of alpha values with 1px of zero-padding on all sides.
+  // Build a 1D flat array of alpha values with 1px of zero-padding on all sides.
   // This ensures marching squares can properly close contours when opaque
-  // pixels touch the image edge, without producing a spurious outer loop
-  // (which the library's built-in frame does).
+  // pixels touch the image edge, without producing a spurious outer loop.
   const paddedW = width + 2;
   const paddedH = height + 2;
-  const grid: number[][] = [];
-
-  // Top padding row.
-  grid.push(new Array(paddedW).fill(0));
+  const grid = new Array<number>(paddedW * paddedH).fill(0);
 
   for (let y = 0; y < height; y++) {
-    const row: number[] = [0]; // left padding
     for (let x = 0; x < width; x++) {
-      const idx = (y * width + x) * 4;
-      row.push(data[idx + 3]); // alpha channel
+      const srcIdx = (y * width + x) * 4;
+      // d3-contour indexes as values[i + j * width] where i=col, j=row
+      const dstIdx = (x + 1) + (y + 1) * paddedW;
+      grid[dstIdx] = data[srcIdx + 3]; // alpha channel
     }
-    row.push(0); // right padding
-    grid.push(row);
   }
 
-  // Bottom padding row.
-  grid.push(new Array(paddedW).fill(0));
+  // Run marching squares via d3-contour on the padded grid.
+  // smooth(false) produces staircase edges matching the original behavior.
+  const generator = contours()
+    .size([paddedW, paddedH])
+    .smooth(false);
 
-  // Run marching squares on the padded grid.
-  // noFrame: true since we added our own padding.
-  const contours = isoContours(grid, alphaThreshold, { noFrame: true });
+  const multiPolygon = generator.contour(grid, alphaThreshold);
 
-  // Convert to Vec2Data arrays, subtracting the 1px padding offset.
+  // Extract rings from the GeoJSON MultiPolygon, subtracting the 1px padding offset.
   const result: Vec2Data[][] = [];
-  for (const contour of contours) {
-    if (contour.length < 3) continue;
-    const polygon: Vec2Data[] = [];
-    for (const point of contour) {
-      const v = new Vec2Data();
-      v.x = point[0] - 1;
-      v.y = point[1] - 1;
-      polygon.push(v);
+  for (const polygon of multiPolygon.coordinates) {
+    for (const ring of polygon) {
+      if (ring.length < 3) continue;
+      const polyVerts: Vec2Data[] = [];
+      for (const [px, py] of ring) {
+        const v = new Vec2Data();
+        v.x = px - 1;
+        v.y = py - 1;
+        polyVerts.push(v);
+      }
+      result.push(polyVerts);
     }
-    result.push(polygon);
   }
 
   return result;

package/src/types/marchingsquares.d.ts

@@ -1,22 +0,0 @@
-declare module "marchingsquares" {
-  export function isoContours(
-    data: number[][],
-    threshold: number,
-    options?: {
-      linearRing?: boolean;
-      noQuadTree?: boolean;
-      noFrame?: boolean;
-    }
-  ): number[][][];
-
-  export function isoBands(
-    data: number[][],
-    minV: number,
-    bandWidth: number,
-    options?: {
-      linearRing?: boolean;
-      noQuadTree?: boolean;
-      noFrame?: boolean;
-    }
-  ): number[][][];
-}