pixelkiln 0.53.2 → 0.53.4

package/dist/cli.js

@@ -8267,7 +8267,14 @@ async function resolveSpecs(loaded, filter) {
         noBackground: style.noBackground,
         tileSize: generator === "tiles" ? tileSize : void 0,
         tileHeight: generator === "tiles" ? style.tileHeight : void 0,
-        tileType: generator === "tiles" ? style.tileType : void 0,
+        // `/create-tileset` places tiles on a rectangular vertex grid (its own
+        // docs: "a map of W×H cells has (W+1)×(H+1) vertices"), the same
+        // square Wang-tiling math as `square_topdown` tiles-pro, regardless of
+        // `terrainView`'s camera-angle setting. `tileType` otherwise defaults
+        // to undefined and falls through to the exporter's own "isometric"
+        // fallback, which is `tiles`' own real API default, not terrain's —
+        // this is set explicitly so that fallback is never reached for terrain.
+        tileType: generator === "tiles" ? style.tileType : generator === "terrain" ? "square_topdown" : void 0,
         tileView: generator === "tiles" ? style.tileView : void 0,
         tileViewAngle: generator === "tiles" ? style.tileViewAngle : void 0,
         tileDepthRatio: generator === "tiles" ? style.tileDepthRatio : void 0,
@@ -15672,6 +15679,11 @@ function exportTileset(entry, spec, options) {
       `${options.format} export cannot infer adjacency from outline/stamp-only rules; use --format generic`
     );
   }
+  if (options.format === "godot" && rules?.ruleType === "edge" && godotTileShape(spec.tileType ?? "isometric") !== 0) {
+    throw new Error(
+      "godot export does not yet map edge/side adjacency onto an isometric or oblique tile's diagonal peering bits safely; use --format generic or --format tiled"
+    );
+  }
   if (options.format === "tiled") {
     return {
       png: packed.png,
@@ -15760,6 +15772,7 @@ function tiledWangId(rules, mask) {
 }
 function buildGodot(generic, spec) {
   const rules = generic.rules;
+  const shape = godotTileShape(spec.tileType ?? "isometric");
   const lines = [
     `[gd_resource type="TileSet" load_steps=3 format=3]`,
     "",
@@ -15774,7 +15787,7 @@ function buildGodot(generic, spec) {
     const y = Math.floor(tile.id / generic.sheet.columns);
     lines.push(`${x}:${y}/0 = 0`);
     if (!rules || tile.bitmask === void 0 || rules.ruleType === "outline") continue;
-    const values = godotTerrainBits(rules, tile.bitmask);
+    const values = godotTerrainBits(rules, tile.bitmask, shape);
     lines.push(`${x}:${y}/0/terrain_set = 0`);
     lines.push(`${x}:${y}/0/terrain = ${dominantTerrain(values)}`);
     for (const [side, value] of Object.entries(values)) {
@@ -15783,7 +15796,6 @@ function buildGodot(generic, spec) {
   }
   lines.push("", "[resource]");
   lines.push(`tile_size = Vector2i(${generic.tile.width}, ${generic.tile.height})`);
-  const shape = godotTileShape(spec.tileType ?? "isometric");
   if (shape !== 0) lines.push(`tile_shape = ${shape}`);
   if (rules && rules.ruleType !== "outline") {
     lines.push(`terrain_set_0/mode = ${rules.ruleType === "corner" ? 1 : 2}`);
@@ -15797,9 +15809,17 @@ function buildGodot(generic, spec) {
   lines.push(`sources/0 = SubResource("TileSetAtlasSource_pixelkiln")`, "");
   return lines.join("\n");
 }
-function godotTerrainBits(rules, mask) {
+function godotTerrainBits(rules, mask, shape) {
   const terrain = (bit) => (mask & 1 << bit) !== 0 ? 0 : 1;
   if (rules.ruleType === "corner") {
+    if (shape === 1) {
+      return {
+        top_corner: terrain(3),
+        right_corner: terrain(2),
+        left_corner: terrain(1),
+        bottom_corner: terrain(0)
+      };
+    }
     return {
       top_left_corner: terrain(3),
       top_right_corner: terrain(2),