diff --git a/README.md b/README.md index 51fb2d6..7c50d55 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,12 @@ -# Game template +# Gaem + +* Run & gun +* Nuclear throne -esque +* Single gun type +* Single map +* Single enemy type +* Collect letters to win, up to 7 letters we have 8 character sprites +* The word is WINNER ## Run @@ -16,15 +24,3 @@ Cross-compile for Windows from Linux: ```sh zig build -Dtarget=x86_64-windows ``` - -## TODO - -* Use [Skribidi](https://github.com/memononen/Skribidi) instead of fontstash for text rendering -* Support for audio formats (Might not need all of them, haven't decided): - * QOA, maybe [qoa.h](https://github.com/phoboslab/qoa/blob/master/qoa.h)? - * Flac, maybe [dr_flac.h](https://github.com/mackron/dr_libs/blob/master/dr_flac.h)? - * Wav, maybe [dr_wav.h](https://github.com/mackron/dr_libs/blob/master/dr_wav.h)? - * Mp3, maybe [dr_mp3.h](https://github.com/mackron/dr_libs/blob/master/dr_mp3.h)? -* Gamepad support. - * WASM Support. Currently a build config isn't provided for this target. - * Update build config for other platforms to reduce binary size. All of the video and audio drivers aren't needed, only gamepads diff --git a/build.zig b/build.zig index db5ef6e..d013157 100644 --- a/build.zig +++ b/build.zig @@ -2,6 +2,8 @@ const std = @import("std"); const sokol = @import("sokol"); const builtin = @import("builtin"); +const project_name = "game-2026-01-18"; + pub fn build(b: *std.Build) !void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); @@ -105,12 +107,12 @@ pub fn build(b: *std.Build) !void { // from here on different handling for native vs wasm builds if (target.result.cpu.arch.isWasm()) { try buildWasm(b, .{ - .name = "sokol_template", + .name = project_name, .mod_main = mod_main, .dep_sokol = dep_sokol, }); } else { - try buildNative(b, "sokol_template", mod_main, has_console); + try buildNative(b, project_name, mod_main, has_console); } } diff --git a/libs/tiled/src/layer.zig b/libs/tiled/src/layer.zig index 18901d8..970550e 100644 --- a/libs/tiled/src/layer.zig +++ b/libs/tiled/src/layer.zig @@ -94,7 +94,7 @@ pub const TileVariant = struct { try temp_tiles.appendSlice(scratch.allocator(), tiles.items); } else if (node.isTag("chunk")) { - const chunk = try initChunkDataFromXml(scratch.allocator(), scratch, lexer, encoding); + const chunk = try initChunkDataFromXml(arena, scratch, lexer, encoding); try temp_chunks.append(scratch.allocator(), chunk); continue; @@ -105,9 +105,16 @@ pub const TileVariant = struct { try iter.finish("data"); - return .{ - .fixed = try arena.dupe(u32, temp_tiles.items) - }; + if (temp_chunks.items.len > 0) { + return .{ + .chunks = try arena.dupe(Chunk, temp_chunks.items) + }; + } else { + return .{ + .fixed = try arena.dupe(u32, temp_tiles.items) + }; + } + } fn parseEncoding( @@ -136,13 +143,76 @@ pub const TileVariant = struct { return result; } - pub fn getBounds(self: TileVariant) void { - _ = self; // autofix + const Bounds = struct { + left: i32, + right: i32, + top: i32, + bottom: i32, + + pub fn width(self: Bounds) u32 { + return @intCast(self.right - self.left); + } + + pub fn height(self: Bounds) u32 { + return @intCast(self.bottom - self.top); + } + }; + + pub fn getBounds(self: TileVariant) Bounds { + if (self.data == .fixed) { + return Bounds{ + .left = 0, + .right = @intCast(self.width), + .top = 0, + .bottom = @intCast(self.height), + }; + } else if (self.data == .chunks) { + const chunks = self.data.chunks; + + var result = Bounds{ + .left = 0, + .right = 0, + .top = 0, + .bottom = 0 + }; + if (chunks.len > 0) { + result.left = chunks[0].x; + result.right = chunks[0].x + @as(i32, @intCast(chunks[0].width)); + result.top = chunks[0].y; + result.bottom = chunks[0].y + @as(i32, @intCast(chunks[0].height)); + for (chunks[1..]) |chunk| { + result.left = @min(result.left, chunk.x); + result.right = @max(result.right, chunk.x + @as(i32, @intCast(chunk.width))); + result.top = @min(result.top, chunk.y); + result.bottom = @max(result.bottom, chunk.y + @as(i32, @intCast(chunk.height))); + } + } + + return result; + } else { + unreachable; + } } - pub fn get(self: TileVariant, x: usize, y: usize) ?u32 { - if ((0 <= x and x < self.width) and (0 <= y and y < self.height)) { - return self.data[y * self.width + x]; + pub fn get(self: TileVariant, x: i32, y: i32) ?u32 { + if (self.data == .fixed) { + if ((0 <= x and x < self.width) and (0 <= y and y < self.height)) { + const x_u32: u32 = @intCast(x); + const y_u32: u32 = @intCast(y); + return self.data.fixed[y_u32 * self.width + x_u32]; + } + } else if (self.data == .chunks) { + for (self.data.chunks) |chunk| { + const ox = x - chunk.x; + const oy = y - chunk.y; + if ((0 <= ox and ox < chunk.width) and (0 <= oy and oy < chunk.height)) { + const ox_u32: u32 = @intCast(ox); + const oy_u32: u32 = @intCast(oy); + return chunk.data[oy_u32 * chunk.width + ox_u32]; + } + } + } else { + unreachable; } return null; } diff --git a/libs/tiled/src/tilemap.zig b/libs/tiled/src/tilemap.zig index c6cde2e..14d6bc4 100644 --- a/libs/tiled/src/tilemap.zig +++ b/libs/tiled/src/tilemap.zig @@ -215,7 +215,18 @@ fn getTilesetByGid(self: *const Tilemap, gid: u32) ?TilesetReference { return result; } -pub fn getTile(self: *const Tilemap, layer: *const Layer, tilesets: Tileset.List, x: usize, y: usize) ?Tile { +pub fn getTile(self: *const Tilemap, tilesets: Tileset.List, gid: u32) ?Tile { + const tileset_ref = self.getTilesetByGid(gid & GlobalTileId.Flag.clear) orelse return null; + const tileset = tilesets.get(tileset_ref.source) orelse return null; + const id = gid - tileset_ref.first_gid; + + return Tile{ + .tileset = tileset, + .id = id + }; +} + +pub fn getTileByPosition(self: *const Tilemap, layer: *const Layer, tilesets: Tileset.List, x: usize, y: usize) ?Tile { assert(layer.variant == .tile); const tile_variant = layer.variant.tile; diff --git a/src/assets.zig b/src/assets.zig index 4e93fec..9986b19 100644 --- a/src/assets.zig +++ b/src/assets.zig @@ -4,6 +4,7 @@ const tiled = @import("tiled"); const Math = @import("./engine/math.zig"); const Engine = @import("./engine/root.zig"); +const STBImage = @import("stb_image"); const Gfx = Engine.Graphics; const Audio = Engine.Audio; @@ -21,6 +22,8 @@ font_id: FontName.EnumArray, wood01: Audio.Data.Id, map: tiled.Tilemap, tilesets: tiled.Tileset.List, +tileset_texture: Gfx.TextureId, +tile_size: Engine.Vec2, pub fn init(gpa: std.mem.Allocator) !Assets { const font_id_array: FontName.EnumArray = .init(.{ @@ -57,11 +60,24 @@ pub fn init(gpa: std.mem.Allocator) !Assets { var tilesets: tiled.Tileset.List = .empty; try tilesets.add(gpa, "tileset.tsx", tileset); + + const tileset_image = try STBImage.load(@embedFile("assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/tilemap_packed.png")); + defer tileset_image.deinit(); + const tileset_texture = try Gfx.addTexture(&.{ + .{ + .width = tileset_image.width, + .height = tileset_image.height, + .rgba = tileset_image.rgba8_pixels + } + }); + return Assets{ .font_id = font_id_array, .wood01 = wood01, .map = map, - .tilesets = tilesets + .tilesets = tilesets, + .tileset_texture = tileset_texture, + .tile_size = .init(16, 16) }; } diff --git a/src/assets/game-2026-01-18.tiled-session b/src/assets/game-2026-01-18.tiled-session index fed28a2..6b9e78a 100644 --- a/src/assets/game-2026-01-18.tiled-session +++ b/src/assets/game-2026-01-18.tiled-session @@ -26,7 +26,7 @@ "scaleInEditor": 1 } }, - "last.imagePath": "/home/rokas/code/games/game-2026-01-18/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tilemap", + "last.imagePath": "/home/rokas/code/games/game-2026-01-18/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles", "map.fixedSize": false, "map.lastUsedFormat": "tmx", "map.tileHeight": 16, diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tilemap/tilemap.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tilemap/tilemap.png deleted file mode 100644 index d14ffbc..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tilemap/tilemap.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tilemap/tilemap_packed.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tilemap/tilemap_packed.png deleted file mode 100644 index 7740ae5..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tilemap/tilemap_packed.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0000.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0000.png deleted file mode 100644 index c70060d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0000.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0001.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0001.png deleted file mode 100644 index 8b23f3b..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0001.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0002.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0002.png deleted file mode 100644 index 9ca917d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0002.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0003.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0003.png deleted file mode 100644 index 2452e84..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0003.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0004.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0004.png deleted file mode 100644 index c560b77..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0004.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0005.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0005.png deleted file mode 100644 index 08118c7..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0005.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0006.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0006.png deleted file mode 100644 index 244bb4a..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0006.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0007.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0007.png deleted file mode 100644 index 0d05005..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0007.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0008.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0008.png deleted file mode 100644 index 1886dc1..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0008.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0009.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0009.png deleted file mode 100644 index cac425d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0009.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0010.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0010.png deleted file mode 100644 index 7c93da4..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0010.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0011.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0011.png deleted file mode 100644 index bb6a894..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0011.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0012.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0012.png deleted file mode 100644 index 77b8ad3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0012.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0013.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0013.png deleted file mode 100644 index b32f15e..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0013.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0014.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0014.png deleted file mode 100644 index 8e86c60..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0014.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0015.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0015.png deleted file mode 100644 index 6848c9a..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0015.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0016.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0016.png deleted file mode 100644 index 4aa2234..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0016.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0017.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0017.png deleted file mode 100644 index 6d8c8f8..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0017.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0018.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0018.png deleted file mode 100644 index aa98bef..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0018.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0019.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0019.png deleted file mode 100644 index 6b8a554..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0019.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0020.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0020.png deleted file mode 100644 index fa3a419..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0020.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0021.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0021.png deleted file mode 100644 index 4d46da4..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0021.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0022.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0022.png deleted file mode 100644 index c71083d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0022.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0023.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0023.png deleted file mode 100644 index 14a6a7b..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0023.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0024.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0024.png deleted file mode 100644 index a1b9f84..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0024.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0025.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0025.png deleted file mode 100644 index 047c45d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0025.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0026.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0026.png deleted file mode 100644 index 1ad5306..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0026.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0027.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0027.png deleted file mode 100644 index a22cf54..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0027.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0028.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0028.png deleted file mode 100644 index 56a8d9d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0028.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0029.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0029.png deleted file mode 100644 index 9355b43..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0029.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0030.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0030.png deleted file mode 100644 index b3fc305..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0030.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0031.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0031.png deleted file mode 100644 index ae49f40..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0031.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0032.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0032.png deleted file mode 100644 index 56556e1..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0032.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0033.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0033.png deleted file mode 100644 index 56a8d9d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0033.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0034.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0034.png deleted file mode 100644 index 9355b43..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0034.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0035.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0035.png deleted file mode 100644 index b3fc305..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0035.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0036.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0036.png deleted file mode 100644 index 75d41aa..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0036.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0037.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0037.png deleted file mode 100644 index b328794..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0037.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0038.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0038.png deleted file mode 100644 index f70af53..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0038.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0039.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0039.png deleted file mode 100644 index 9a77af3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0039.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0040.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0040.png deleted file mode 100644 index 1de9c08..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0040.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0041.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0041.png deleted file mode 100644 index b720ac9..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0041.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0042.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0042.png deleted file mode 100644 index 1255eea..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0042.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0043.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0043.png deleted file mode 100644 index b96d366..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0043.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0044.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0044.png deleted file mode 100644 index b03539e..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0044.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0045.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0045.png deleted file mode 100644 index 584f1cd..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0045.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0046.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0046.png deleted file mode 100644 index 8ad0b6f..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0046.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0047.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0047.png deleted file mode 100644 index 98608af..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0047.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0048.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0048.png deleted file mode 100644 index faa3550..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0048.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0049.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0049.png deleted file mode 100644 index 0344112..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0049.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0050.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0050.png deleted file mode 100644 index 47b0ba3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0050.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0051.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0051.png deleted file mode 100644 index 57e6fb9..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0051.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0052.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0052.png deleted file mode 100644 index a142c65..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0052.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0053.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0053.png deleted file mode 100644 index 25e1994..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0053.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0054.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0054.png deleted file mode 100644 index 7760da9..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0054.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0055.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0055.png deleted file mode 100644 index dd4e95b..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0055.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0056.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0056.png deleted file mode 100644 index 62256e8..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0056.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0057.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0057.png deleted file mode 100644 index 9ec6067..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0057.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0058.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0058.png deleted file mode 100644 index 618fdfa..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0058.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0059.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0059.png deleted file mode 100644 index 7258e24..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0059.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0060.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0060.png deleted file mode 100644 index e98bc7f..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0060.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0061.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0061.png deleted file mode 100644 index 4918b91..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0061.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0062.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0062.png deleted file mode 100644 index 321bfd1..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0062.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0063.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0063.png deleted file mode 100644 index 1ad34f0..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0063.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0064.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0064.png deleted file mode 100644 index faee865..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0064.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0065.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0065.png deleted file mode 100644 index b4160ea..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0065.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0066.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0066.png deleted file mode 100644 index 7aded89..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0066.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0067.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0067.png deleted file mode 100644 index af9a5dc..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0067.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0068.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0068.png deleted file mode 100644 index 0e9e91c..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0068.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0069.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0069.png deleted file mode 100644 index fc4baca..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0069.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0070.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0070.png deleted file mode 100644 index c0bd596..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0070.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0071.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0071.png deleted file mode 100644 index 5f9489f..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0071.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0072.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0072.png deleted file mode 100644 index f1ac8ed..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0072.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0073.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0073.png deleted file mode 100644 index a90a68b..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0073.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0074.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0074.png deleted file mode 100644 index cf9fe0a..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0074.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0075.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0075.png deleted file mode 100644 index fc71803..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0075.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0076.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0076.png deleted file mode 100644 index 09bbe03..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0076.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0077.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0077.png deleted file mode 100644 index fa87971..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0077.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0078.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0078.png deleted file mode 100644 index bc6aff6..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0078.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0079.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0079.png deleted file mode 100644 index ea77f2f..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0079.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0080.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0080.png deleted file mode 100644 index 7d7d9b3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0080.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0081.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0081.png deleted file mode 100644 index b542293..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0081.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0082.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0082.png deleted file mode 100644 index 83d22af..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0082.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0083.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0083.png deleted file mode 100644 index ccef1a5..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0083.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0084.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0084.png deleted file mode 100644 index d618958..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0084.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0085.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0085.png deleted file mode 100644 index fc657a4..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0085.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0086.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0086.png deleted file mode 100644 index ce21d90..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0086.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0087.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0087.png deleted file mode 100644 index 9d50a7a..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0087.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0088.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0088.png deleted file mode 100644 index 00e7a44..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0088.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0089.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0089.png deleted file mode 100644 index 7b64a4f..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0089.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0090.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0090.png deleted file mode 100644 index 2b9fa2d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0090.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0091.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0091.png deleted file mode 100644 index 3f9f843..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0091.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0092.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0092.png deleted file mode 100644 index b016776..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0092.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0093.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0093.png deleted file mode 100644 index dd1dd94..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0093.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0094.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0094.png deleted file mode 100644 index 0be28e3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0094.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0095.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0095.png deleted file mode 100644 index e27ae99..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0095.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0096.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0096.png deleted file mode 100644 index 94181c2..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0096.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0097.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0097.png deleted file mode 100644 index 4cb9a88..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0097.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0098.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0098.png deleted file mode 100644 index 5af45ff..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0098.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0099.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0099.png deleted file mode 100644 index 0789292..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0099.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0100.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0100.png deleted file mode 100644 index 78fcfa5..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0100.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0101.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0101.png deleted file mode 100644 index 940db3f..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0101.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0102.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0102.png deleted file mode 100644 index 6296418..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0102.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0103.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0103.png deleted file mode 100644 index a29e8db..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0103.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0104.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0104.png deleted file mode 100644 index ae830a5..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0104.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0105.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0105.png deleted file mode 100644 index 72981a3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0105.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0106.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0106.png deleted file mode 100644 index 092a63c..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0106.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0107.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0107.png deleted file mode 100644 index 60a8e2e..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0107.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0108.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0108.png deleted file mode 100644 index 163ccf9..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0108.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0109.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0109.png deleted file mode 100644 index 2851d30..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0109.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0110.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0110.png deleted file mode 100644 index c95ffb6..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0110.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0111.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0111.png deleted file mode 100644 index f001860..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0111.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0112.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0112.png deleted file mode 100644 index 785b0a0..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0112.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0113.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0113.png deleted file mode 100644 index efcadab..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0113.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0114.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0114.png deleted file mode 100644 index ee789dd..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0114.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0115.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0115.png deleted file mode 100644 index 8cf4167..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0115.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0116.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0116.png deleted file mode 100644 index 618ea75..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0116.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0117.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0117.png deleted file mode 100644 index 1c6135c..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0117.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0118.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0118.png deleted file mode 100644 index ded08d3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0118.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0119.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0119.png deleted file mode 100644 index 9355b43..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0119.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0120.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0120.png deleted file mode 100644 index e7bfe20..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0120.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0121.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0121.png deleted file mode 100644 index 7e3187d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0121.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0122.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0122.png deleted file mode 100644 index 16df4ea..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0122.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0123.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0123.png deleted file mode 100644 index 00791db..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0123.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0124.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0124.png deleted file mode 100644 index 1f266bd..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0124.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0125.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0125.png deleted file mode 100644 index 00791db..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0125.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0126.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0126.png deleted file mode 100644 index a8c079a..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0126.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0127.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0127.png deleted file mode 100644 index 48df7c3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0127.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0128.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0128.png deleted file mode 100644 index 7f584da..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0128.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0129.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0129.png deleted file mode 100644 index 81651ed..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0129.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0130.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0130.png deleted file mode 100644 index c6334c3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0130.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0131.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0131.png deleted file mode 100644 index 7b390f5..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0131.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0132.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0132.png deleted file mode 100644 index 634ffc0..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0132.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0133.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0133.png deleted file mode 100644 index f9a7007..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0133.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0134.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0134.png deleted file mode 100644 index 4eda5b0..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0134.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0135.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0135.png deleted file mode 100644 index edbcf90..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0135.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0136.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0136.png deleted file mode 100644 index 6a20b0c..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0136.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0137.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0137.png deleted file mode 100644 index 3dbe4b6..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0137.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0138.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0138.png deleted file mode 100644 index f7c5434..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0138.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0139.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0139.png deleted file mode 100644 index 3dbceb9..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0139.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0140.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0140.png deleted file mode 100644 index b7b968b..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0140.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0141.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0141.png deleted file mode 100644 index 26355ab..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0141.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0142.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0142.png deleted file mode 100644 index 9025fba..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0142.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0143.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0143.png deleted file mode 100644 index 0e37bb0..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0143.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0144.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0144.png deleted file mode 100644 index 26f1650..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0144.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0145.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0145.png deleted file mode 100644 index 5ffc5c5..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0145.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0146.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0146.png deleted file mode 100644 index 1991161..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0146.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0147.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0147.png deleted file mode 100644 index 34b460d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0147.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0148.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0148.png deleted file mode 100644 index 76011bb..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0148.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0149.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0149.png deleted file mode 100644 index ecdba4c..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0149.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0150.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0150.png deleted file mode 100644 index 59892ea..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0150.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0151.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0151.png deleted file mode 100644 index b07ae71..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0151.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0152.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0152.png deleted file mode 100644 index 9c00970..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0152.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0153.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0153.png deleted file mode 100644 index 2a0a036..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0153.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0154.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0154.png deleted file mode 100644 index 7b00732..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0154.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0155.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0155.png deleted file mode 100644 index 9b6800b..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0155.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0156.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0156.png deleted file mode 100644 index 3a0f0ec..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0156.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0157.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0157.png deleted file mode 100644 index 68082ea..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0157.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0158.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0158.png deleted file mode 100644 index 7b69954..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0158.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0159.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0159.png deleted file mode 100644 index fda0083..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0159.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0160.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0160.png deleted file mode 100644 index b298f5b..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0160.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0161.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0161.png deleted file mode 100644 index 4088d0a..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0161.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0162.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0162.png deleted file mode 100644 index 43fffec..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0162.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0163.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0163.png deleted file mode 100644 index 6b48d1b..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0163.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0164.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0164.png deleted file mode 100644 index 417faf6..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0164.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0165.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0165.png deleted file mode 100644 index 5e1e9ef..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0165.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0166.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0166.png deleted file mode 100644 index 5c62c1c..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0166.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0167.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0167.png deleted file mode 100644 index 3e0e929..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0167.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0168.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0168.png deleted file mode 100644 index 99600e1..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0168.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0169.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0169.png deleted file mode 100644 index 16be070..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0169.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0170.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0170.png deleted file mode 100644 index b58e606..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0170.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0171.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0171.png deleted file mode 100644 index 06cc019..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0171.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0172.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0172.png deleted file mode 100644 index aabbaf0..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0172.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0173.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0173.png deleted file mode 100644 index a3b5ae0..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0173.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0174.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0174.png deleted file mode 100644 index fd8bc97..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0174.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0175.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0175.png deleted file mode 100644 index 707bca1..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0175.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0176.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0176.png deleted file mode 100644 index 062d274..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0176.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0177.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0177.png deleted file mode 100644 index 3c4a741..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0177.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0178.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0178.png deleted file mode 100644 index 2540e2d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0178.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0179.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0179.png deleted file mode 100644 index 4fd5985..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0179.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0180.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0180.png deleted file mode 100644 index e38e171..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0180.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0181.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0181.png deleted file mode 100644 index 79eb5de..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0181.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0182.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0182.png deleted file mode 100644 index 4deacd4..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0182.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0183.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0183.png deleted file mode 100644 index e38e171..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0183.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0184.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0184.png deleted file mode 100644 index e47f830..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0184.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0185.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0185.png deleted file mode 100644 index cb33de0..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0185.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0186.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0186.png deleted file mode 100644 index 7add676..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0186.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0187.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0187.png deleted file mode 100644 index 2d01e4b..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0187.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0188.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0188.png deleted file mode 100644 index e254daf..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0188.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0189.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0189.png deleted file mode 100644 index c85423f..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0189.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0190.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0190.png deleted file mode 100644 index 4347e34..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0190.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0191.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0191.png deleted file mode 100644 index a6a2b9e..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0191.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0192.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0192.png deleted file mode 100644 index 7987777..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0192.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0193.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0193.png deleted file mode 100644 index d200c15..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0193.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0194.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0194.png deleted file mode 100644 index c4a5e89..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0194.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0195.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0195.png deleted file mode 100644 index aa30517..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0195.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0196.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0196.png deleted file mode 100644 index a5c9d03..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0196.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0197.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0197.png deleted file mode 100644 index aa30517..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0197.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0198.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0198.png deleted file mode 100644 index 5711ed3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0198.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0199.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0199.png deleted file mode 100644 index ba89196..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0199.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0200.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0200.png deleted file mode 100644 index 422535e..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0200.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0201.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0201.png deleted file mode 100644 index 97986df..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0201.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0202.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0202.png deleted file mode 100644 index dfd9a41..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0202.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0203.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0203.png deleted file mode 100644 index d68aac2..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0203.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0204.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0204.png deleted file mode 100644 index 7204f72..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0204.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0205.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0205.png deleted file mode 100644 index 91267e6..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0205.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0206.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0206.png deleted file mode 100644 index 28795ce..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0206.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0207.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0207.png deleted file mode 100644 index f50a516..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0207.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0208.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0208.png deleted file mode 100644 index 807080b..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0208.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0209.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0209.png deleted file mode 100644 index 7004eac..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0209.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0210.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0210.png deleted file mode 100644 index 54a32ad..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0210.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0211.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0211.png deleted file mode 100644 index ac5a67d..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0211.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0212.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0212.png deleted file mode 100644 index 9b93ff3..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0212.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0213.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0213.png deleted file mode 100644 index c23c2d5..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0213.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0214.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0214.png deleted file mode 100644 index 2abdcbf..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0214.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0215.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0215.png deleted file mode 100644 index 9816274..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0215.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0216.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0216.png deleted file mode 100644 index ecd5a35..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0216.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0217.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0217.png deleted file mode 100644 index 2b90ad4..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0217.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0218.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0218.png deleted file mode 100644 index f2c4a56..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0218.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0219.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0219.png deleted file mode 100644 index 40fe5b2..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0219.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0220.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0220.png deleted file mode 100644 index 2b8d733..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0220.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0221.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0221.png deleted file mode 100644 index 990d1db..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0221.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0222.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0222.png deleted file mode 100644 index ff9a612..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0222.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0223.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0223.png deleted file mode 100644 index da4e019..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0223.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0224.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0224.png deleted file mode 100644 index 67e0cab..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0224.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0225.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0225.png deleted file mode 100644 index 6d4976e..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0225.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0226.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0226.png deleted file mode 100644 index c8da18a..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0226.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0227.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0227.png deleted file mode 100644 index 3582434..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0227.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0228.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0228.png deleted file mode 100644 index e011485..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0228.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0229.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0229.png deleted file mode 100644 index 663bef2..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0229.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0230.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0230.png deleted file mode 100644 index b5763c1..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0230.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0231.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0231.png deleted file mode 100644 index 4c55985..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0231.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0232.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0232.png deleted file mode 100644 index 3905d29..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0232.png and /dev/null differ diff --git a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0233.png b/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0233.png deleted file mode 100644 index f4f98f7..0000000 Binary files a/src/assets/kenney_desert-shooter-pack_1.0/PNG/Tiles/Tiles/tile_0233.png and /dev/null differ diff --git a/src/assets/map.tmx b/src/assets/map.tmx index ef74196..e03bc97 100644 --- a/src/assets/map.tmx +++ b/src/assets/map.tmx @@ -1,23 +1,78 @@ - + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,325, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,343, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,343 + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +326,326,326,326,326,326,326,327,0,0,0,0,0,0,0,0, +344,254,344,344,344,344,344,345,0,0,0,0,0,0,0,0, +344,344,344,344,254,344,344,345,0,0,0,0,0,0,0,0 + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,343, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,343, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,361, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,20,20,0,0,0, -0,0,0,0,0,0,0,0,0,0,20,20,20,20,0,0, -0,0,0,0,20,20,110,110,0,0,20,0,20,20,0,0, -0,0,0,110,20,0,110,110,110,0,0,20,20,0,0,0, -0,0,0,110,20,110,110,110,110,0,0,20,0,0,0,0, -0,0,0,0,20,20,110,110,110,0,0,20,0,0,0,0, -0,0,0,0,0,20,0,0,0,0,20,20,0,0,0,0, -0,0,0,0,0,20,0,0,0,0,20,0,0,0,0,0, -0,0,0,0,0,20,0,0,0,20,20,0,0,0,0,0, -0,0,0,0,20,20,0,0,20,20,0,0,0,0,0,0, -0,0,0,0,0,20,20,20,20,0,0,0,0,0,0,0, +344,344,254,344,344,344,344,345,0,0,0,0,0,0,0,0, +344,254,344,344,344,344,254,345,0,0,0,0,0,0,0,0, +362,362,362,362,362,362,362,363,0,0,0,0,299,299,0,0, +0,0,0,299,299,299,299,299,0,299,299,299,429,299,0,0, +0,0,0,299,299,299,299,299,299,299,299,299,299,299,0,0, +0,0,299,299,299,299,299,299,299,299,299,299,300,299,0,0, +0,0,299,299,299,299,300,299,299,300,299,299,299,0,0,0, +0,0,0,299,299,299,299,299,299,299,300,299,299,0,0,0, +0,0,0,299,299,429,299,299,299,299,299,299,299,299,0,299, +0,0,0,299,299,299,299,300,299,299,299,299,299,299,299,299, +0,0,0,299,299,299,299,299,299,300,299,299,429,299,299,299, +0,0,0,299,299,299,299,299,299,299,299,299,299,299,300,299, +0,299,299,299,299,299,300,299,299,299,299,299,299,299,299,299, +0,0,299,299,299,299,299,299,299,299,299,299,299,299,299,299, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 @@ -28,17 +83,22 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,20,20,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,20,20,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,299,299,299,0,0,0,0,0,0,0,0,0,0, +299,299,299,299,299,299,0,0,0,0,0,0,0,0,0,0, +0,0,299,299,299,299,299,0,0,0,0,0,0,0,0,0, +299,299,299,299,299,299,299,0,0,0,0,0,0,0,0,0, +299,299,299,299,299,299,0,0,0,0,0,0,0,0,0,0, +299,299,299,299,299,0,0,0,0,0,0,0,0,0,0,0, +299,299,299,0,0,0,0,0,0,0,0,0,0,0,0,0, +299,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + + diff --git a/src/assets/tilemap.tsx b/src/assets/tilemap.tsx index b66a44d..9c9efde 100644 --- a/src/assets/tilemap.tsx +++ b/src/assets/tilemap.tsx @@ -1,4 +1,4 @@ - + diff --git a/src/engine/frame.zig b/src/engine/frame.zig index 22f5a28..0d879ef 100644 --- a/src/engine/frame.zig +++ b/src/engine/frame.zig @@ -11,6 +11,7 @@ const AudioData = AudioSystem.Data; const AudioCommand = AudioSystem.Command; const GraphicsSystem = @import("./graphics.zig"); +const TextureId = GraphicsSystem.TextureId; const GraphicsCommand = GraphicsSystem.Command; const Font = GraphicsSystem.Font; @@ -174,7 +175,7 @@ fn pushAudioCommand(self: *Frame, command: AudioCommand) void { }; } -fn pushGraphicsCommand(self: *Frame, command: GraphicsCommand) void { +pub fn pushGraphicsCommand(self: *Frame, command: GraphicsCommand) void { const arena = self.arena.allocator(); self.graphics.commands.append(arena, command) catch |e|{ @@ -182,6 +183,14 @@ fn pushGraphicsCommand(self: *Frame, command: GraphicsCommand) void { }; } +pub fn prependGraphicsCommand(self: *Frame, command: GraphicsCommand) void { + const arena = self.arena.allocator(); + + self.graphics.commands.insert(arena, 0, command) catch |e|{ + log.warn("Failed to push graphics command: {}", .{e}); + }; +} + pub fn playAudio(self: *Frame, options: PlayAudioOptions) !void { self.pushAudioCommand(.{ .play = .{ @@ -211,14 +220,17 @@ pub fn popScissor(self: *Frame) void { }); } -pub fn drawRectangle(self: *Frame, pos: Vec2, size: Vec2, color: Vec4) void { - self.pushGraphicsCommand(.{ - .draw_rectangle = .{ - .pos = pos, - .size = size, - .color = color - } - }); +const DrawRectangleOptions = struct { + rect: Rect, + color: Vec4, + texture: ?struct { + id: TextureId, + uv: Rect, + } = null +}; + +pub fn drawRectangle(self: *Frame, opts: GraphicsCommand.DrawRectangle) void { + self.pushGraphicsCommand(.{ .draw_rectangle = opts }); } pub fn drawLine(self: *Frame, pos1: Vec2, pos2: Vec2, color: Vec4, width: f32) void { diff --git a/src/engine/graphics.zig b/src/engine/graphics.zig index 4b56b13..ff070bc 100644 --- a/src/engine/graphics.zig +++ b/src/engine/graphics.zig @@ -42,12 +42,17 @@ const Options = struct { }; pub const Command = union(enum) { + pub const DrawRectangle = struct { + rect: Rect, + color: Vec4, + texture: ?struct { + id: TextureId, + uv: Rect, + } = null + }; + set_scissor: Rect, - draw_rectangle: struct { - pos: Vec2, - size: Vec2, - color: Vec4 - }, + draw_rectangle: DrawRectangle, draw_line: struct { pos1: Vec2, pos2: Vec2, @@ -68,15 +73,40 @@ pub const Command = union(enum) { pop_transformation: void }; +const Texture = struct { + image: sg.Image, + view: sg.View, + info: Info, + + const Info = struct { + width: u32, + height: u32, + }; + + const Id = enum(u32) { _ }; + const Data = struct { + width: u32, + height: u32, + rgba: [*]u8 + }; +}; +pub const TextureId = Texture.Id; +pub const TextureInfo = Texture.Info; + +var gpa: std.mem.Allocator = undefined; + var main_pipeline: sgl.Pipeline = .{}; var linear_sampler: sg.Sampler = .{}; var nearest_sampler: sg.Sampler = .{}; var font_context: fontstash.Context = undefined; +var textures: std.ArrayList(Texture) = .empty; var scale_stack_buffer: [32]Vec2 = undefined; var scale_stack: std.ArrayList(Vec2) = .empty; pub fn init(options: Options) !void { + gpa = options.allocator; + sg.setup(.{ .logger = options.logger, .environment = sglue.environment(), @@ -148,6 +178,7 @@ pub fn init(options: Options) !void { } pub fn deinit() void { + textures.deinit(gpa); imgui.shutdown(); font_context.deinit(); sgl.shutdown(); @@ -164,7 +195,7 @@ pub fn drawCommand(command: Command) void { popTransform(); }, .draw_rectangle => |opts| { - drawRectangle(opts.pos, opts.size, opts.color); + drawRectangle(opts); }, .set_scissor => |opts| { sgl.scissorRectf( @@ -270,7 +301,7 @@ pub fn endFrame(clear_color: Vec4) void { sg.commit(); } -pub fn pushTransform(translation: Vec2, scale: Vec2) void { +fn pushTransform(translation: Vec2, scale: Vec2) void { sgl.pushMatrix(); sgl.translate(translation.x, translation.y, 0); sgl.scale(scale.x, scale.y, 1); @@ -278,35 +309,84 @@ pub fn pushTransform(translation: Vec2, scale: Vec2) void { scale_stack.appendAssumeCapacity(scale_stack.getLast().multiply(scale)); } -pub fn popTransform() void { +fn popTransform() void { sgl.popMatrix(); _ = scale_stack.pop().?; } -fn drawQuad(quad: [4]Vec2, color: Vec4) void { +const Vertex = struct { + pos: Vec2, + uv: Vec2 +}; + +fn drawQuad(quad: [4]Vertex, color: Vec4, texture_id: TextureId) void { + sgl.enableTexture(); + defer sgl.disableTexture(); + + const view = textures.items[@intFromEnum(texture_id)].view; + // TODO: Make sampler configurable + sgl.texture(view, nearest_sampler); + sgl.beginQuads(); defer sgl.end(); sgl.c4f(color.x, color.y, color.z, color.w); - for (quad) |position| { - sgl.v2f(position.x, position.y); + for (quad) |vertex| { + const pos = vertex.pos; + const uv = vertex.uv; + sgl.v2fT2f(pos.x, pos.y, uv.x, uv.y); } } -pub fn drawRectangle(pos: Vec2, size: Vec2, color: Vec4) void { - drawQuad( - .{ - // Top left - pos, - // Top right - pos.add(.{ .x = size.x, .y = 0 }), - // Bottom right - pos.add(size), - // Bottom left - pos.add(.{ .x = 0, .y = size.y }), - }, - color - ); +fn drawQuadNoUVs(quad: [4]Vec2, color: Vec4) void { + sgl.beginQuads(); + defer sgl.end(); + + sgl.c4f(color.x, color.y, color.z, color.w); + for (quad) |pos| { + sgl.v2f(pos.x, pos.y); + } +} + +fn drawRectangle(opts: Command.DrawRectangle) void { + const pos = opts.rect.pos; + const size = opts.rect.size; + + const top_left = pos; + const top_right = pos.add(.{ .x = size.x, .y = 0 }); + const bottom_right = pos.add(size); + const bottom_left = pos.add(.{ .x = 0, .y = size.y }); + + if (opts.texture) |texture| { + const uv = texture.uv; + const quad = [4]Vertex{ + .{ + .pos = top_left, + .uv = .init(uv.left(), uv.top()) + }, + .{ + .pos = top_right, + .uv = .init(uv.right(), uv.top()) + }, + .{ + .pos = bottom_right, + .uv = .init(uv.right(), uv.bottom()) + }, + .{ + .pos = bottom_left, + .uv = .init(uv.left(), uv.bottom()) + } + }; + drawQuad(quad, opts.color, texture.id); + } else { + const quad = .{ + top_left, + top_right, + bottom_right, + bottom_left + }; + drawQuadNoUVs(quad, opts.color); + } } fn drawLine(from: Vec2, to: Vec2, color: Vec4, width: f32) void { @@ -317,7 +397,7 @@ fn drawLine(from: Vec2, to: Vec2, color: Vec4, width: f32) void { const top_right = to.add(step.rotateLeft90()); const bottom_right = to.add(step.rotateRight90()); - drawQuad( + drawQuadNoUVs( .{ top_right, top_left, bottom_left, bottom_right }, color ); @@ -326,3 +406,71 @@ fn drawLine(from: Vec2, to: Vec2, color: Vec4, width: f32) void { pub fn addFont(name: [*c]const u8, data: []const u8) !Font.Id { return try font_context.addFont(name, data); } + +fn makeView(image: sg.Image) !sg.View { + const image_view = sg.makeView(.{ + .texture = .{ .image = image } + }); + if (image_view.id == sg.invalid_id) { + return error.InvalidView; + } + return image_view; +} + +fn makeImageWithMipMaps(mipmaps: []const Texture.Data) !sg.Image { + if (mipmaps.len == 0) { + return error.NoMipMaps; + } + + var data: sg.ImageData = .{}; + var mip_levels: std.ArrayListUnmanaged(sg.Range) = .initBuffer(&data.mip_levels); + + for (mipmaps) |mipmap| { + try mip_levels.appendBounded(.{ + .ptr = mipmap.rgba, + .size = mipmap.width * mipmap.height * 4 + }); + } + + const image = sg.makeImage(.{ + .width = @intCast(mipmaps[0].width), + .height = @intCast(mipmaps[0].height), + .pixel_format = .RGBA8, + .usage = .{ + .immutable = true + }, + .num_mipmaps = @intCast(mip_levels.items.len), + .data = data + }); + if (image.id == sg.invalid_id) { + return error.InvalidImage; + } + + return image; +} + +pub fn addTexture(mipmaps: []const Texture.Data) !TextureId { + const image = try makeImageWithMipMaps(mipmaps); + errdefer sg.deallocImage(image); + + const view = try makeView(image); + errdefer sg.deallocView(view); + + assert(mipmaps.len > 0); + const index = textures.items.len; + try textures.append(gpa, .{ + .image = image, + .view = view, + .info = .{ + .width = mipmaps[0].width, + .height = mipmaps[0].height, + } + }); + + return @enumFromInt(index); +} + +pub fn getTextureInfo(id: TextureId) TextureInfo { + const texture = textures.items[@intFromEnum(id)]; + return texture.info; +} diff --git a/src/engine/math.zig b/src/engine/math.zig index f620d92..e38d759 100644 --- a/src/engine/math.zig +++ b/src/engine/math.zig @@ -22,6 +22,10 @@ pub const Vec2 = extern struct { }; } + pub fn initFromInt(T: type, x: T, y: T) Vec2 { + return .init(@floatFromInt(x), @floatFromInt(y)); + } + pub fn initAngle(angle: f32) Vec2 { return Vec2{ .x = @cos(angle), diff --git a/src/engine/root.zig b/src/engine/root.zig index bc7b691..faacfcc 100644 --- a/src/engine/root.zig +++ b/src/engine/root.zig @@ -7,6 +7,7 @@ const sapp = sokol.app; pub const Math = @import("./math.zig"); pub const Vec2 = Math.Vec2; +const rgb = Math.rgb; pub const Input = @import("./input.zig"); @@ -156,19 +157,22 @@ fn sokolFrame(self: *Engine) !void { const frame = &self.frame; + const screen_size = Vec2.init(sapp.widthf(), sapp.heightf()); + { _ = frame.arena.reset(.retain_capacity); + const arena = frame.arena.allocator(); const audio_commands_capacity = frame.audio.commands.capacity; frame.audio = .empty; - try frame.audio.commands.ensureTotalCapacity(frame.arena.allocator(), audio_commands_capacity); + try frame.audio.commands.ensureTotalCapacity(arena, audio_commands_capacity); const graphics_commands_capacity = frame.graphics.commands.capacity; const scissor_stack_capacity = frame.graphics.scissor_stack.capacity; frame.graphics = .empty; - frame.graphics.screen_size = .init(sapp.widthf(), sapp.heightf()); - try frame.graphics.commands.ensureTotalCapacity(frame.arena.allocator(), graphics_commands_capacity); - try frame.graphics.scissor_stack.ensureTotalCapacity(frame.arena.allocator(), scissor_stack_capacity); + frame.graphics.screen_size = screen_size; + try frame.graphics.commands.ensureTotalCapacity(arena, graphics_commands_capacity); + try frame.graphics.scissor_stack.ensureTotalCapacity(arena, scissor_stack_capacity); frame.pushScissor(.init(0, 0, sapp.widthf(), sapp.heightf())); frame.time_ns = time_passed; @@ -180,24 +184,24 @@ fn sokolFrame(self: *Engine) !void { frame.input.released_keys = .initEmpty(); } + if (self.frame.graphics.canvas_size) |canvas_size| { + _ = ScreenScalar.apply( + &self.frame, + screen_size, + canvas_size, + rgb(0, 0, 0), + ); + } + { Gfx.beginFrame(); defer Gfx.endFrame(frame.graphics.clear_color); - { - var screen_scaler: ?ScreenScalar = null; - if (self.frame.graphics.canvas_size) |canvas_size| { - screen_scaler = ScreenScalar.push(self.frame.graphics.screen_size, canvas_size); - } - - Gfx.drawCommands(frame.graphics.commands.items); - - if (screen_scaler) |ctx| ctx.pop(); - } + Gfx.drawCommands(frame.graphics.commands.items); if (frame.show_debug) { try self.game.debug(); - try showDebugWindow(); + try showDebugWindow(&self.frame); } } @@ -206,7 +210,7 @@ fn sokolFrame(self: *Engine) !void { } } -fn showDebugWindow() !void { +fn showDebugWindow(frame: *Frame) !void { if (!imgui.beginWindow(.{ .name = "Engine", .pos = Vec2.init(240, 20), @@ -216,6 +220,9 @@ fn showDebugWindow() !void { } defer imgui.endWindow(); + imgui.textFmt("Draw commands: {}\n", .{ + frame.graphics.commands.items.len, + }); imgui.textFmt("Audio instances: {}/{}\n", .{ Audio.mixer.instances.items.len, Audio.mixer.instances.capacity diff --git a/src/engine/screen_scaler.zig b/src/engine/screen_scaler.zig index e795f93..405b990 100644 --- a/src/engine/screen_scaler.zig +++ b/src/engine/screen_scaler.zig @@ -2,19 +2,26 @@ const Gfx = @import("./graphics.zig"); const Math = @import("./math.zig"); const Vec2 = Math.Vec2; +const Vec4 = Math.Vec4; const rgb = Math.rgb; +const Frame = @import("./frame.zig"); + const ScreenScalar = @This(); // TODO: Implement a fractional pixel perfect scalar // Based on this video: https://www.youtube.com/watch?v=d6tp43wZqps // And this blog: https://colececil.dev/blog/2017/scaling-pixel-art-without-destroying-it/ -window_size: Vec2, translation: Vec2, scale: f32, -pub fn push(window_size: Vec2, canvas_size: Vec2) ScreenScalar { +pub fn apply( + frame: *Frame, + window_size: Vec2, + canvas_size: Vec2, + color: Vec4 +) ScreenScalar { // TODO: Render to a lower resolution instead of scaling. // To avoid pixel bleeding in spritesheet artifacts const scale = @floor(@min( @@ -26,42 +33,48 @@ pub fn push(window_size: Vec2, canvas_size: Vec2) ScreenScalar { translation.x = @round(translation.x); translation.y = @round(translation.y); - Gfx.pushTransform(translation, .init(scale, scale)); + frame.prependGraphicsCommand(.{ + .push_transformation = .{ + .translation = translation, + .scale = .init(scale, scale) + } + }); + frame.popTransform(); + + frame.drawRectangle(.{ + .rect = .{ + .pos = .init(0, 0), + .size = .init(window_size.x, translation.y), + }, + .color = color + }); + + frame.drawRectangle(.{ + .rect = .{ + .pos = .init(0, window_size.y - translation.y), + .size = .init(window_size.x, translation.y), + }, + .color = color + }); + + frame.drawRectangle(.{ + .rect = .{ + .pos = .init(0, 0), + .size = .init(translation.x, window_size.y), + }, + .color = color + }); + + frame.drawRectangle(.{ + .rect = .{ + .pos = .init(window_size.x - translation.x, 0), + .size = .init(translation.x, window_size.y), + }, + .color = color + }); return ScreenScalar{ - .window_size = window_size, .translation = translation, .scale = scale }; } - -pub fn pop(self: ScreenScalar) void { - Gfx.popTransform(); - - const bg_color = rgb(0, 0, 0); - const filler_size = self.translation; - - Gfx.drawRectangle( - .init(0, 0), - .init(self.window_size.x, filler_size.y), - bg_color - ); - - Gfx.drawRectangle( - .init(0, self.window_size.y - filler_size.y), - .init(self.window_size.x, filler_size.y), - bg_color - ); - - Gfx.drawRectangle( - .init(0, 0), - .init(filler_size.x, self.window_size.y), - bg_color - ); - - Gfx.drawRectangle( - .init(self.window_size.x - filler_size.x, 0), - .init(filler_size.x, self.window_size.y), - bg_color - ); -} diff --git a/src/game.zig b/src/game.zig index e54c647..8977237 100644 --- a/src/game.zig +++ b/src/game.zig @@ -7,6 +7,7 @@ const Assets = @import("./assets.zig"); const Engine = @import("./engine/root.zig"); const imgui = Engine.imgui; const Vec2 = Engine.Vec2; +const Rect = Engine.Math.Rect; const rgb = Engine.Math.rgb; const Game = @This(); @@ -20,7 +21,7 @@ pub fn init(gpa: Allocator, assets: *Assets) !Game { return Game{ .gpa = gpa, .assets = assets, - .player = .init(50, 50) + .player = findSpawnpoint(assets) orelse .init(0, 0) }; } @@ -28,16 +29,100 @@ pub fn deinit(self: *Game) void { _ = self; // autofix } + +fn findSpawnpoint(assets: *Assets) ?Vec2 { + const map = assets.map; + for (map.layers) |layer| { + if (layer.variant != .object) { + continue; + } + const object_layer = layer.variant.object; + for (object_layer.items) |object| { + if (object.shape != .point) { + continue; + } + const point = object.shape.point; + if (std.mem.eql(u8, object.name, "spawnpoint")) { + const tile_height: f32 = @floatFromInt(map.tile_height); + const tile_width: f32 = @floatFromInt(map.tile_width); + return .init(point.x / tile_width, point.y / tile_height); + } + } + } + return null; +} + +fn drawTilemap(self: *Game, frame: *Engine.Frame) void { + const texture = self.assets.tileset_texture; + const texture_info = Engine.Graphics.getTextureInfo(texture); + + const map = self.assets.map; + + const tile_size = Vec2.init(1, 1); + for (map.layers) |layer| { + if (layer.variant != .tile) { + continue; + } + + const tile_layer = layer.variant.tile; + const layer_bounds = tile_layer.getBounds(); + for (0..layer_bounds.height()) |oy| { + const y = layer_bounds.top + @as(i32, @intCast(oy)); + + for (0..layer_bounds.width()) |ox| { + const x = layer_bounds.left + @as(i32, @intCast(ox)); + const tile_gid = tile_layer.get(x, y) orelse continue; + const tile = map.getTile(self.assets.tilesets, tile_gid) orelse continue; + + const tilemap_width_in_tiles = @divExact(texture_info.width, tile.tileset.tile_width); + var uv: Rect = .{ + .pos = Vec2.initFromInt( + u32, + @rem(tile.id, tilemap_width_in_tiles), + @divFloor(tile.id, tilemap_width_in_tiles), + ).multiply( + .initFromInt(u32, tile.tileset.tile_width, tile.tileset.tile_height) + ), + .size = self.assets.tile_size, + }; + uv = uv.divide(.init(@floatFromInt(texture_info.width), @floatFromInt(texture_info.height))); + + var rect = Rect{ + .pos = .init(@floatFromInt(x), @floatFromInt(y)), + .size = .init(1, 1) + }; + rect = rect.multiply(tile_size); + + frame.drawRectangle(.{ + .rect = rect, + .color = rgb(255, 255, 255), + .texture = .{ + .id = self.assets.tileset_texture, + .uv = uv + } + }); + } + } + // map.getTile(layer, tilesets) + } +} + pub fn tick(self: *Game, frame: *Engine.Frame) !void { const dt = frame.deltaTime(); - const canvas_size = Vec2.init(100, 100); + const canvas_size = Vec2.init(20, 15); frame.graphics.canvas_size = canvas_size; if (frame.isKeyPressed(.F3)) { frame.show_debug = !frame.show_debug; } + frame.pushTransform( + canvas_size.divideScalar(2).sub(self.player), + .init(1, 1) + ); + defer frame.popTransform(); + var dir = Vec2.init(0, 0); if (frame.isKeyDown(.W)) { dir.y -= 1; @@ -53,44 +138,41 @@ pub fn tick(self: *Game, frame: *Engine.Frame) !void { } dir = dir.normalized(); - if (dir.x != 0 or dir.y != 0) { - try frame.playAudio(.{ - .id = self.assets.wood01 - }); - } + // if (dir.x != 0 or dir.y != 0) { + // try frame.playAudio(.{ + // .id = self.assets.wood01 + // }); + // } - self.player = self.player.add(dir.multiplyScalar(50 * dt)); + self.player = self.player.add(dir.multiplyScalar(5 * dt)); const regular_font = self.assets.font_id.get(.regular); - frame.drawRectangle(.init(0, 0), canvas_size, rgb(20, 20, 20)); - const size = Vec2.init(20, 20); - frame.drawRectangle(self.player.sub(size.divideScalar(2)), size, rgb(200, 20, 20)); + self.drawTilemap(frame); + + frame.drawRectangle(.{ + .rect = .init(0, 0, canvas_size.x, canvas_size.y), + .color = rgb(20, 20, 20) + }); + const size = Vec2.init(1, 1); + frame.drawRectangle(.{ + .rect = .{ + .pos = self.player.sub(size.divideScalar(2)), + .size = size, + }, + .color = rgb(200, 20, 20) + }); if (dir.x != 0 or dir.y != 0) { - frame.drawRectanglOutline(self.player.sub(size.divideScalar(2)), size, rgb(20, 200, 20), 3); + frame.drawRectanglOutline(self.player.sub(size.divideScalar(2)), size, rgb(20, 200, 20), 0.1); } frame.drawText(self.player, "Player", .{ .font = regular_font, - .size = 10 + .size = 1 }); - - const map = self.assets.map; - const tilesets = self.assets.tilesets; - _ = tilesets; // autofix - - for (map.layers) |layer| { - if (layer.variant != .tile) { - continue; - } - const tile_layer = layer.variant.tile; - _ = tile_layer; // autofix - // map.getTile(layer, tilesets) - } } pub fn debug(self: *Game) !void { - _ = self; // autofix if (!imgui.beginWindow(.{ .name = "Game", .pos = Vec2.init(20, 20), @@ -100,5 +182,5 @@ pub fn debug(self: *Game) !void { } defer imgui.endWindow(); - imgui.text("Hello World!\n"); + imgui.textFmt("Position: {}, {}", .{ self.player.x, self.player.y }); }