Add missing getTilesetColumns method

mapeditor · Mar 16, 2020 · d966024 · d966024
1 parent 6c261c9
commit d966024
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/export_to_godot_tilemap.js b/export_to_godot_tilemap.js
@@ -181,7 +181,7 @@ class GodotTilemapExporter {
     /**
      * Tileset should expose columns ... but didn't at the moment so we
      * calculate them base on the image width and tileWidth
-     * return {String}
+     * return {number}
      **/
     getTilesetColumns(tileset) {
         // noinspection JSUnresolvedVariable

diff --git a/export_to_godot_tileset.js b/export_to_godot_tileset.js
@@ -42,6 +42,12 @@ class GodotTilesetExporter {
 
             let tile = tiles[index];
 
+            const tilesetColumns = this.getTilesetColumns();
+            if ((autotileCoordinates.x + 1) > tilesetColumns) {
+                autotileCoordinates.x = 0;
+                autotileCoordinates.y += 1;
+            }
+
             // noinspection JSUnresolvedVariable
             if (tile.objectGroup !== null) {
 
@@ -64,9 +70,6 @@ class GodotTilesetExporter {
             }
 
             autotileCoordinates.x += 1;
-            if ((index) < this.tileset.columns) {
-                autotileCoordinates.y += 1;
-            }
 
         }
 
@@ -96,6 +99,16 @@ class GodotTilesetExporter {
         );
     }
 
+    /**
+     * Tileset should expose columns ... but didn't at the moment so we
+     * calculate them base on the image width and tileWidth
+     * return {number}
+     **/
+    getTilesetColumns() {
+        // noinspection JSUnresolvedVariable
+        return Math.floor(this.tileset.imageWidth / this.tileset.tileWidth);
+    }
+
     getTilesetTemplate() {
         // noinspection JSUnresolvedVariable
         return `[gd_resource type="TileSet" load_steps=3 format=2]