diff --git a/assets/tiles/dirt_dirt_grass_water.png b/assets/tiles/dirt_dirt_grass_water.png new file mode 100644 index 0000000..bf30ba1 Binary files /dev/null and b/assets/tiles/dirt_dirt_grass_water.png differ diff --git a/assets/tiles/dirt_dirt_water_grass.png b/assets/tiles/dirt_dirt_water_grass.png new file mode 100644 index 0000000..5ca7d7f Binary files /dev/null and b/assets/tiles/dirt_dirt_water_grass.png differ diff --git a/assets/tiles/dirt_water.png b/assets/tiles/dirt_water.png new file mode 100644 index 0000000..cf47798 Binary files /dev/null and b/assets/tiles/dirt_water.png differ diff --git a/assets/tiles/dirt_water_dirt_dirt.png b/assets/tiles/dirt_water_dirt_dirt.png new file mode 100644 index 0000000..aeb85e3 Binary files /dev/null and b/assets/tiles/dirt_water_dirt_dirt.png differ diff --git a/assets/tiles/dirt_water_dirt_water.png b/assets/tiles/dirt_water_dirt_water.png new file mode 100644 index 0000000..02f4fd3 Binary files /dev/null and b/assets/tiles/dirt_water_dirt_water.png differ diff --git a/assets/tiles/dirt_water_grass_dirt.png b/assets/tiles/dirt_water_grass_dirt.png new file mode 100644 index 0000000..40f8b5a Binary files /dev/null and b/assets/tiles/dirt_water_grass_dirt.png differ diff --git a/assets/tiles/dirt_water_water_grass.png b/assets/tiles/dirt_water_water_grass.png new file mode 100644 index 0000000..0a76c02 Binary files /dev/null and b/assets/tiles/dirt_water_water_grass.png differ diff --git a/assets/tiles/grass_grass_dirt_water.png b/assets/tiles/grass_grass_dirt_water.png new file mode 100644 index 0000000..8c2a7b7 Binary files /dev/null and b/assets/tiles/grass_grass_dirt_water.png differ diff --git a/assets/tiles/grass_grass_water_dirt.png b/assets/tiles/grass_grass_water_dirt.png new file mode 100644 index 0000000..a0d2ac7 Binary files /dev/null and b/assets/tiles/grass_grass_water_dirt.png differ diff --git a/assets/tiles/grass_water_dirt_grass.png b/assets/tiles/grass_water_dirt_grass.png new file mode 100644 index 0000000..f49d274 Binary files /dev/null and b/assets/tiles/grass_water_dirt_grass.png differ diff --git a/assets/tiles/grass_water_grass_grass.png b/assets/tiles/grass_water_grass_grass.png new file mode 100644 index 0000000..12ac60b Binary files /dev/null and b/assets/tiles/grass_water_grass_grass.png differ diff --git a/assets/tiles/grass_water_grass_water.png b/assets/tiles/grass_water_grass_water.png new file mode 100644 index 0000000..e11ae09 Binary files /dev/null and b/assets/tiles/grass_water_grass_water.png differ diff --git a/assets/tiles/water_grass.png b/assets/tiles/water_grass.png new file mode 100644 index 0000000..d7d62fd Binary files /dev/null and b/assets/tiles/water_grass.png differ diff --git a/assets/tiles/water_water_dirt_grass.png b/assets/tiles/water_water_dirt_grass.png new file mode 100644 index 0000000..8e355fa Binary files /dev/null and b/assets/tiles/water_water_dirt_grass.png differ diff --git a/assets/tiles/water_water_grass_dirt.png b/assets/tiles/water_water_grass_dirt.png new file mode 100644 index 0000000..2d4dc5b Binary files /dev/null and b/assets/tiles/water_water_grass_dirt.png differ diff --git a/assets/tiles/water_water_water_grass.png b/assets/tiles/water_water_water_grass.png new file mode 100644 index 0000000..ad4fec3 Binary files /dev/null and b/assets/tiles/water_water_water_grass.png differ diff --git a/src/main.cpp b/src/main.cpp index 89462f0..a6ec217 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -323,88 +323,88 @@ static TileInfo tile_infos[] = { { 44, "tiles/grass_dirt_two_corner.png", TILE_CORNER_INFO(1, GRASS, DIRT, GRASS, DIRT ) }, // GRASS / WATER - { 47, "tiles/PH_water_water_grass_grass.png", TILE_CORNER_INFO(0, WATER, WATER, GRASS, GRASS) }, - { 48, "tiles/PH_water_water_grass_grass.png", TILE_CORNER_INFO(1, WATER, WATER, GRASS, GRASS) }, - { 49, "tiles/PH_water_water_grass_grass.png", TILE_CORNER_INFO(2, WATER, WATER, GRASS, GRASS) }, - { 50, "tiles/PH_water_water_grass_grass.png", TILE_CORNER_INFO(3, WATER, WATER, GRASS, GRASS) }, + { 47, "tiles/water_grass.png", TILE_CORNER_INFO(0, WATER, WATER, GRASS, GRASS) }, + { 48, "tiles/water_grass.png", TILE_CORNER_INFO(1, WATER, WATER, GRASS, GRASS) }, + { 49, "tiles/water_grass.png", TILE_CORNER_INFO(2, WATER, WATER, GRASS, GRASS) }, + { 50, "tiles/water_grass.png", TILE_CORNER_INFO(3, WATER, WATER, GRASS, GRASS) }, - { 51, "tiles/PH_water_water_grass_water.png", TILE_CORNER_INFO(0, WATER, WATER, GRASS, WATER) }, - { 52, "tiles/PH_water_water_grass_water.png", TILE_CORNER_INFO(1, WATER, WATER, GRASS, WATER) }, - { 53, "tiles/PH_water_water_grass_water.png", TILE_CORNER_INFO(2, WATER, WATER, GRASS, WATER) }, - { 54, "tiles/PH_water_water_grass_water.png", TILE_CORNER_INFO(3, WATER, WATER, GRASS, WATER) }, + { 51, "tiles/water_water_water_grass.png", TILE_CORNER_INFO(0, WATER, WATER, WATER, GRASS) }, + { 52, "tiles/water_water_water_grass.png", TILE_CORNER_INFO(1, WATER, WATER, WATER, GRASS) }, + { 53, "tiles/water_water_water_grass.png", TILE_CORNER_INFO(2, WATER, WATER, WATER, GRASS) }, + { 54, "tiles/water_water_water_grass.png", TILE_CORNER_INFO(3, WATER, WATER, WATER, GRASS) }, - { 55, "tiles/PH_grass_water_grass_grass.png", TILE_CORNER_INFO(0, GRASS, WATER, GRASS, GRASS) }, - { 56, "tiles/PH_grass_water_grass_grass.png", TILE_CORNER_INFO(1, GRASS, WATER, GRASS, GRASS) }, - { 57, "tiles/PH_grass_water_grass_grass.png", TILE_CORNER_INFO(2, GRASS, WATER, GRASS, GRASS) }, - { 58, "tiles/PH_grass_water_grass_grass.png", TILE_CORNER_INFO(3, GRASS, WATER, GRASS, GRASS) }, + { 55, "tiles/grass_water_grass_grass.png", TILE_CORNER_INFO(0, GRASS, WATER, GRASS, GRASS) }, + { 56, "tiles/grass_water_grass_grass.png", TILE_CORNER_INFO(1, GRASS, WATER, GRASS, GRASS) }, + { 57, "tiles/grass_water_grass_grass.png", TILE_CORNER_INFO(2, GRASS, WATER, GRASS, GRASS) }, + { 58, "tiles/grass_water_grass_grass.png", TILE_CORNER_INFO(3, GRASS, WATER, GRASS, GRASS) }, - { 59, "tiles/PH_grass_water_grass_water.png", TILE_CORNER_INFO(0, GRASS, WATER, GRASS, WATER) }, - { 60, "tiles/PH_grass_water_grass_water.png", TILE_CORNER_INFO(1, GRASS, WATER, GRASS, WATER) }, + { 59, "tiles/grass_water_grass_water.png", TILE_CORNER_INFO(0, GRASS, WATER, GRASS, WATER) }, + { 60, "tiles/grass_water_grass_water.png", TILE_CORNER_INFO(1, GRASS, WATER, GRASS, WATER) }, // DIRT / WATER - { 61, "tiles/PH_dirt_dirt_water_water.png", TILE_CORNER_INFO(0, DIRT, DIRT, WATER, WATER) }, - { 62, "tiles/PH_dirt_dirt_water_water.png", TILE_CORNER_INFO(1, DIRT, DIRT, WATER, WATER) }, - { 63, "tiles/PH_dirt_dirt_water_water.png", TILE_CORNER_INFO(2, DIRT, DIRT, WATER, WATER) }, - { 64, "tiles/PH_dirt_dirt_water_water.png", TILE_CORNER_INFO(3, DIRT, DIRT, WATER, WATER) }, + { 61, "tiles/dirt_water.png", TILE_CORNER_INFO(0, DIRT, DIRT, WATER, WATER) }, + { 62, "tiles/dirt_water.png", TILE_CORNER_INFO(1, DIRT, DIRT, WATER, WATER) }, + { 63, "tiles/dirt_water.png", TILE_CORNER_INFO(2, DIRT, DIRT, WATER, WATER) }, + { 64, "tiles/dirt_water.png", TILE_CORNER_INFO(3, DIRT, DIRT, WATER, WATER) }, { 65, "tiles/PH_water_water_dirt_water.png", TILE_CORNER_INFO(0, WATER, WATER, DIRT, WATER) }, { 66, "tiles/PH_water_water_dirt_water.png", TILE_CORNER_INFO(1, WATER, WATER, DIRT, WATER) }, { 67, "tiles/PH_water_water_dirt_water.png", TILE_CORNER_INFO(2, WATER, WATER, DIRT, WATER) }, { 68, "tiles/PH_water_water_dirt_water.png", TILE_CORNER_INFO(3, WATER, WATER, DIRT, WATER) }, - { 69, "tiles/PH_dirt_water_dirt_dirt.png", TILE_CORNER_INFO(0, DIRT, WATER, DIRT, DIRT) }, - { 70, "tiles/PH_dirt_water_dirt_dirt.png", TILE_CORNER_INFO(1, DIRT, WATER, DIRT, DIRT) }, - { 71, "tiles/PH_dirt_water_dirt_dirt.png", TILE_CORNER_INFO(2, DIRT, WATER, DIRT, DIRT) }, - { 72, "tiles/PH_dirt_water_dirt_dirt.png", TILE_CORNER_INFO(3, DIRT, WATER, DIRT, DIRT) }, + { 69, "tiles/dirt_water_dirt_dirt.png", TILE_CORNER_INFO(0, DIRT, WATER, DIRT, DIRT) }, + { 70, "tiles/dirt_water_dirt_dirt.png", TILE_CORNER_INFO(1, DIRT, WATER, DIRT, DIRT) }, + { 71, "tiles/dirt_water_dirt_dirt.png", TILE_CORNER_INFO(2, DIRT, WATER, DIRT, DIRT) }, + { 72, "tiles/dirt_water_dirt_dirt.png", TILE_CORNER_INFO(3, DIRT, WATER, DIRT, DIRT) }, - { 73, "tiles/PH_dirt_water_dirt_water.png", TILE_CORNER_INFO(0, DIRT, WATER, DIRT, WATER) }, - { 74, "tiles/PH_dirt_water_dirt_water.png", TILE_CORNER_INFO(1, DIRT, WATER, DIRT, WATER) }, + { 73, "tiles/dirt_water_dirt_water.png", TILE_CORNER_INFO(0, DIRT, WATER, DIRT, WATER) }, + { 74, "tiles/dirt_water_dirt_water.png", TILE_CORNER_INFO(1, DIRT, WATER, DIRT, WATER) }, // GRASS / DIRT / WATER - { 75, "tiles/PH_grass_water_dirt_water.png", TILE_CORNER_INFO(0, GRASS, WATER, DIRT, WATER) }, - { 76, "tiles/PH_grass_water_dirt_water.png", TILE_CORNER_INFO(1, GRASS, WATER, DIRT, WATER) }, - { 77, "tiles/PH_grass_water_dirt_water.png", TILE_CORNER_INFO(2, GRASS, WATER, DIRT, WATER) }, - { 78, "tiles/PH_grass_water_dirt_water.png", TILE_CORNER_INFO(3, GRASS, WATER, DIRT, WATER) }, + { 75, "tiles/dirt_water_water_grass.png", TILE_CORNER_INFO(0, DIRT, WATER, GRASS, WATER) }, + { 76, "tiles/dirt_water_water_grass.png", TILE_CORNER_INFO(1, DIRT, WATER, GRASS, WATER) }, + { 77, "tiles/dirt_water_water_grass.png", TILE_CORNER_INFO(2, DIRT, WATER, GRASS, WATER) }, + { 78, "tiles/dirt_water_water_grass.png", TILE_CORNER_INFO(3, DIRT, WATER, GRASS, WATER) }, - { 79, "tiles/PH_water_water_dirt_grass.png", TILE_CORNER_INFO(0, WATER, WATER, DIRT, GRASS) }, - { 80, "tiles/PH_water_water_dirt_grass.png", TILE_CORNER_INFO(1, WATER, WATER, DIRT, GRASS) }, - { 81, "tiles/PH_water_water_dirt_grass.png", TILE_CORNER_INFO(2, WATER, WATER, DIRT, GRASS) }, - { 82, "tiles/PH_water_water_dirt_grass.png", TILE_CORNER_INFO(3, WATER, WATER, DIRT, GRASS) }, + { 79, "tiles/water_water_grass_dirt.png", TILE_CORNER_INFO(0, WATER, WATER, DIRT, GRASS) }, + { 80, "tiles/water_water_grass_dirt.png", TILE_CORNER_INFO(1, WATER, WATER, DIRT, GRASS) }, + { 81, "tiles/water_water_grass_dirt.png", TILE_CORNER_INFO(2, WATER, WATER, DIRT, GRASS) }, + { 82, "tiles/water_water_grass_dirt.png", TILE_CORNER_INFO(3, WATER, WATER, DIRT, GRASS) }, - { 83, "tiles/PH_water_water_grass_dirt.png", TILE_CORNER_INFO(0, WATER, WATER, GRASS, DIRT) }, - { 84, "tiles/PH_water_water_grass_dirt.png", TILE_CORNER_INFO(1, WATER, WATER, GRASS, DIRT) }, - { 85, "tiles/PH_water_water_grass_dirt.png", TILE_CORNER_INFO(2, WATER, WATER, GRASS, DIRT) }, - { 86, "tiles/PH_water_water_grass_dirt.png", TILE_CORNER_INFO(3, WATER, WATER, GRASS, DIRT) }, + { 83, "tiles/water_water_dirt_grass.png", TILE_CORNER_INFO(0, WATER, WATER, GRASS, DIRT) }, + { 84, "tiles/water_water_dirt_grass.png", TILE_CORNER_INFO(1, WATER, WATER, GRASS, DIRT) }, + { 85, "tiles/water_water_dirt_grass.png", TILE_CORNER_INFO(2, WATER, WATER, GRASS, DIRT) }, + { 86, "tiles/water_water_dirt_grass.png", TILE_CORNER_INFO(3, WATER, WATER, GRASS, DIRT) }, - { 87, "tiles/PH_grass_water_dirt_grass.png", TILE_CORNER_INFO(0, GRASS, WATER, DIRT, GRASS) }, - { 88, "tiles/PH_grass_water_dirt_grass.png", TILE_CORNER_INFO(1, GRASS, WATER, DIRT, GRASS) }, - { 89, "tiles/PH_grass_water_dirt_grass.png", TILE_CORNER_INFO(2, GRASS, WATER, DIRT, GRASS) }, - { 90, "tiles/PH_grass_water_dirt_grass.png", TILE_CORNER_INFO(3, GRASS, WATER, DIRT, GRASS) }, + { 87, "tiles/grass_grass_dirt_water.png", TILE_CORNER_INFO(0, GRASS, GRASS, WATER, DIRT) }, + { 88, "tiles/grass_grass_dirt_water.png", TILE_CORNER_INFO(1, GRASS, GRASS, WATER, DIRT) }, + { 89, "tiles/grass_grass_dirt_water.png", TILE_CORNER_INFO(2, GRASS, GRASS, WATER, DIRT) }, + { 90, "tiles/grass_grass_dirt_water.png", TILE_CORNER_INFO(3, GRASS, GRASS, WATER, DIRT) }, - { 91, "tiles/PH_dirt_water_grass_grass.png", TILE_CORNER_INFO(0, DIRT, WATER, GRASS, GRASS) }, - { 92, "tiles/PH_dirt_water_grass_grass.png", TILE_CORNER_INFO(1, DIRT, WATER, GRASS, GRASS) }, - { 93, "tiles/PH_dirt_water_grass_grass.png", TILE_CORNER_INFO(2, DIRT, WATER, GRASS, GRASS) }, - { 94, "tiles/PH_dirt_water_grass_grass.png", TILE_CORNER_INFO(3, DIRT, WATER, GRASS, GRASS) }, + { 91, "tiles/grass_grass_water_dirt.png", TILE_CORNER_INFO(0, GRASS, GRASS, DIRT, WATER) }, + { 92, "tiles/grass_grass_water_dirt.png", TILE_CORNER_INFO(1, GRASS, GRASS, DIRT, WATER) }, + { 93, "tiles/grass_grass_water_dirt.png", TILE_CORNER_INFO(2, GRASS, GRASS, DIRT, WATER) }, + { 94, "tiles/grass_grass_water_dirt.png", TILE_CORNER_INFO(3, GRASS, GRASS, DIRT, WATER) }, - { 95, "tiles/PH_grass_water_grass_dirt.png", TILE_CORNER_INFO(0, GRASS, WATER, GRASS, DIRT) }, - { 96, "tiles/PH_grass_water_grass_dirt.png", TILE_CORNER_INFO(1, GRASS, WATER, GRASS, DIRT) }, - { 97, "tiles/PH_grass_water_grass_dirt.png", TILE_CORNER_INFO(2, GRASS, WATER, GRASS, DIRT) }, - { 98, "tiles/PH_grass_water_grass_dirt.png", TILE_CORNER_INFO(3, GRASS, WATER, GRASS, DIRT) }, + { 95, "tiles/grass_water_dirt_grass.png", TILE_CORNER_INFO(0, GRASS, WATER, GRASS, DIRT) }, + { 96, "tiles/grass_water_dirt_grass.png", TILE_CORNER_INFO(1, GRASS, WATER, GRASS, DIRT) }, + { 97, "tiles/grass_water_dirt_grass.png", TILE_CORNER_INFO(2, GRASS, WATER, GRASS, DIRT) }, + { 98, "tiles/grass_water_dirt_grass.png", TILE_CORNER_INFO(3, GRASS, WATER, GRASS, DIRT) }, - { 99, "tiles/PH_dirt_water_dirt_grass.png", TILE_CORNER_INFO(0, DIRT, WATER, DIRT, GRASS) }, - { 100, "tiles/PH_dirt_water_dirt_grass.png", TILE_CORNER_INFO(1, DIRT, WATER, DIRT, GRASS) }, - { 101, "tiles/PH_dirt_water_dirt_grass.png", TILE_CORNER_INFO(2, DIRT, WATER, DIRT, GRASS) }, - { 102, "tiles/PH_dirt_water_dirt_grass.png", TILE_CORNER_INFO(3, DIRT, WATER, DIRT, GRASS) }, + { 99, "tiles/dirt_water_grass_dirt.png", TILE_CORNER_INFO(0, DIRT, WATER, DIRT, GRASS) }, + { 100, "tiles/dirt_water_grass_dirt.png", TILE_CORNER_INFO(1, DIRT, WATER, DIRT, GRASS) }, + { 101, "tiles/dirt_water_grass_dirt.png", TILE_CORNER_INFO(2, DIRT, WATER, DIRT, GRASS) }, + { 102, "tiles/dirt_water_grass_dirt.png", TILE_CORNER_INFO(3, DIRT, WATER, DIRT, GRASS) }, - { 103, "tiles/PH_dirt_water_grass_dirt.png", TILE_CORNER_INFO(0, DIRT, WATER, GRASS, DIRT) }, - { 104, "tiles/PH_dirt_water_grass_dirt.png", TILE_CORNER_INFO(1, DIRT, WATER, GRASS, DIRT) }, - { 105, "tiles/PH_dirt_water_grass_dirt.png", TILE_CORNER_INFO(2, DIRT, WATER, GRASS, DIRT) }, - { 106, "tiles/PH_dirt_water_grass_dirt.png", TILE_CORNER_INFO(3, DIRT, WATER, GRASS, DIRT) }, + { 103, "tiles/dirt_dirt_grass_water.png", TILE_CORNER_INFO(0, DIRT, DIRT, WATER, GRASS) }, + { 103, "tiles/dirt_dirt_grass_water.png", TILE_CORNER_INFO(0, DIRT, DIRT, WATER, GRASS) }, + { 103, "tiles/dirt_dirt_grass_water.png", TILE_CORNER_INFO(0, DIRT, DIRT, WATER, GRASS) }, + { 103, "tiles/dirt_dirt_grass_water.png", TILE_CORNER_INFO(0, DIRT, DIRT, WATER, GRASS) }, - { 107, "tiles/PH_grass_water_dirt_dirt.png", TILE_CORNER_INFO(0, GRASS, WATER, DIRT, DIRT) }, - { 108, "tiles/PH_grass_water_dirt_dirt.png", TILE_CORNER_INFO(1, GRASS, WATER, DIRT, DIRT) }, - { 109, "tiles/PH_grass_water_dirt_dirt.png", TILE_CORNER_INFO(2, GRASS, WATER, DIRT, DIRT) }, - { 110, "tiles/PH_grass_water_dirt_dirt.png", TILE_CORNER_INFO(3, GRASS, WATER, DIRT, DIRT) }, + { 107, "tiles/dirt_dirt_water_grass.png", TILE_CORNER_INFO(0, DIRT, DIRT, GRASS, WATER) }, + { 108, "tiles/dirt_dirt_water_grass.png", TILE_CORNER_INFO(1, DIRT, DIRT, GRASS, WATER) }, + { 109, "tiles/dirt_dirt_water_grass.png", TILE_CORNER_INFO(2, DIRT, DIRT, GRASS, WATER) }, + { 110, "tiles/dirt_dirt_water_grass.png", TILE_CORNER_INFO(3, DIRT, DIRT, GRASS, WATER) }, }; static vec4 tile_uvs[SDL_arraysize(tile_infos)];