Added covering line logic to tileExt

Author: johnjuuljensen

main.ts

@@ -1,4 +1,4 @@
-tiles.setCurrentTilemap(maze.generateTilemap(MazeAlgorithm.Ellers, 8, 8, sprites.dungeon.floorDark0, sprites.castle.tileGrass2, 2))
+tiles.setCurrentTilemap(maze.generateTilemap(MazeAlgorithm.Ellers, 8, 8, sprites.dungeon.floorDark0, sprites.castle.tileGrass2, 2, 0))
 let mySprite = sprites.create(img`
     ........................
     .....ffff...............
@@ -25,9 +25,10 @@ let mySprite = sprites.create(img`
     ........................
     ........................
     `, SpriteKind.Player)
-tiles.placeOnTile(mySprite, tiles.getTileLocation(2, 2))
-controller.moveSprite(mySprite)
+    tiles.placeOnTile(mySprite, tiles.getTileLocation(2, 2))controller.moveSprite(mySprite)
 scene.cameraFollowSprite(mySprite)
 for (let value of tilesExt.getRandomTilesByType(sprites.castle.tileGrass2, 10)) {
     tiles.setTileAt(value, sprites.dungeon.chestClosed)
 }
+//tilesExt.setTileBetweenLocations(new tiles.Location(0,0,undefined), new tiles.Location(5,6,undefined), sprites.builtin.brick);
+game.debug = true;

pxt.json

@@ -6,6 +6,8 @@
         "device": "*"
     },
     "files": [
+        "tilemap.g.jres",
+        "tilemap.g.ts",
         "README.md",
         "maze.ts",
         "tilemapExt.ts"
@@ -27,4 +29,4 @@
         "arcade"
     ],
     "preferredEditor": "blocksprj"
-}
+}

tilemap.g.jres

@@ -9,7 +9,7 @@
     },
     "level5": {
         "id": "level5",
-        "data": "MTAxMDAwMTAwMDAxMDMwMjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAyMDAwMDAwMDAwMDAwMDIyMjIwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMA==",
+        "data": "MTAxMDAwMTAwMDAxMDMwMjA0MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDIyMjIwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMA==",
         "dataEncoding": "base64",
         "namespace": "myTiles.",
         "mimeType": "application/mkcd-tilemap",
@@ -18,7 +18,8 @@
             "myTiles.transparency16",
             "sprites.castle.tileGrass2",
             "sprites.dungeon.chestClosed",
-            "sprites.dungeon.floorDark0"
+            "sprites.dungeon.floorDark0",
+            "sprites.builtin.brick"
         ]
     }
 }

tilemap.g.ts

@@ -50,8 +50,8 @@ namespace myTiles {
     helpers._registerFactory("tilemap", function(name: string) {
         switch(helpers.stringTrim(name)) {
             case "testTileset":
-            case "level5":return tiles.createTilemap(hex`1000100001030200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000`, img`
-. . . 2 . . . . . . . . . . . . 
+            case "level5":return tiles.createTilemap(hex`1000100001030204000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000`, img`
+. . . . . . . . . . . . . . . . 
 2 2 2 2 . . . . . . . . . . . . 
 . . . . . . . . . . . . . . . . 
 . . . . . . . . . . . . . . . . 
@@ -67,7 +67,7 @@ namespace myTiles {
 . . . . . . . . . . . . . . . . 
 . . . . . . . . . . . . . . . . 
 . . . . . . . . . . . . . . . . 
-`, [myTiles.transparency16,sprites.castle.tileGrass2,sprites.dungeon.chestClosed,sprites.dungeon.floorDark0], TileScale.Sixteen);
+`, [myTiles.transparency16,sprites.castle.tileGrass2,sprites.dungeon.chestClosed,sprites.dungeon.floorDark0,sprites.builtin.brick], TileScale.Sixteen);
         }
         return null;
     })

tilemapExt.ts

@@ -1,5 +1,63 @@
+enum LineType {
+    Diagonal = 0,
+    Covering = 1
+}
+
 //% blockNamespace=scene
 namespace tilesExt {
+
+    //% l1.shadow=mapgettile
+    //% l2.shadow=mapgettile
+    export function coveringLineBetweenTiles<T>(l1: tiles.Location, l2: tiles.Location, exclusive: boolean, handler: (col: number, row: number) => T): T {
+        // https://www.redblobgames.com/grids/line-drawing/#stepping
+        const dx = l2.col-l1.col, dy = l2.row-l1.row;
+        const absx = Math.abs(dx), absy = Math.abs(dy);
+        const stepx = Math.sign(dx), stepy = Math.sign(dy);
+    
+        let x = l1.col, y = l1.row;
+        let ix = 0, iy = 0;
+        if (exclusive) {
+            if ((1+ix<<1)*absy < (1+iy<<1)*absx) {
+                x += stepx;
+                ix++;
+            } else {
+                y += stepy;
+                iy++;
+            }
+        }
+
+        for (; ix < absx || iy < absy;) {
+            const res = handler(x,y);
+            if (res) return res;
+            if ((1+ix<<1)*absy < (1+iy<<1)*absx) {
+                x += stepx;
+                ix++;
+            } else {
+                y += stepy;
+                iy++;
+            }
+        }
+        if (!exclusive) {
+            const res = handler(x,y);
+            if (res) return res;
+        }
+
+        return undefined;
+    }
+
+    export function isWallBetweenLocations(l1: tiles.Location, l2: tiles.Location, tileMap?: tiles.TileMap): tiles.Location | undefined {
+        tileMap = tileMap || game.currentScene().tileMap;
+        return coveringLineBetweenTiles(l1, l2, true, (x,y) => tileMap.isObstacle(x,y) ? new tiles.Location(x,y,l1.tileMap) : undefined);
+    }
+
+
+    export function setTileBetweenLocations(l1: tiles.Location, l2: tiles.Location, im: Image, tileMap?: tiles.TileMap): void {
+        tileMap = tileMap || game.currentScene().tileMap;
+        const index = tileMap.getImageType(im);
+        coveringLineBetweenTiles(l1, l2, false, (x,y) => tileMap.setTileAt(x,y,index));
+    }
+
+
     /**
      * Get a random tile of the given type
      * @param tile the type of tile to get a random selection of