From 3b061058132d977da43e6931465f9f6dc00e96c7 Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Fri, 11 Jul 2025 22:38:08 -0400 Subject: [PATCH] Map tiles are generating fine, and I can make a map, now to bring it into the game and see how it works. --- assets/map_tiles.json | 58 +++++++++++++++++++++--------------------- assets/map_tiles.png | Bin 9791 -> 4761 bytes constants.hpp | 2 ++ tests/map.cpp | 2 +- tools/icongen.cpp | 11 +------- 5 files changed, 33 insertions(+), 40 deletions(-) diff --git a/assets/map_tiles.json b/assets/map_tiles.json index 3523cd8..677aecf 100644 --- a/assets/map_tiles.json +++ b/assets/map_tiles.json @@ -8,121 +8,121 @@ { "centered": false, "display": 8284, - "x": 64, + "x": 32, "y": 0 }, { "centered": false, "display": 11590, - "x": 128, + "x": 64, "y": 0 }, { "centered": false, "display": 10899, - "x": 192, + "x": 96, "y": 0 }, { "centered": false, "display": 9256, - "x": 256, + "x": 128, "y": 0 }, { "centered": false, "display": 9608, - "x": 320, + "x": 160, "y": 0 }, { "centered": false, "display": 10747, - "x": 384, + "x": 192, "y": 0 }, { "centered": false, "display": 8285, - "x": 448, + "x": 224, "y": 0 }, { "centered": true, "display": 1003, - "x": 512, + "x": 256, "y": 0 }, { "centered": true, "display": 3848, - "x": 576, + "x": 288, "y": 0 }, { "centered": true, "display": 85, "x": 0, - "y": 64 + "y": 32 }, { "centered": true, "display": 8687, - "x": 64, - "y": 64 + "x": 32, + "y": 32 }, { "centered": true, "display": 10949, - "x": 128, - "y": 64 + "x": 64, + "y": 32 }, { "centered": true, "display": 8793, - "x": 192, - "y": 64 + "x": 96, + "y": 32 }, { "centered": true, "display": 95, - "x": 256, - "y": 64 + "x": 128, + "y": 32 }, { "centered": true, "display": 1898, - "x": 320, - "y": 64 + "x": 160, + "y": 32 }, { "centered": true, "display": 42586, - "x": 384, - "y": 64 + "x": 192, + "y": 32 }, { "centered": true, "display": 2189, - "x": 448, - "y": 64 + "x": 224, + "y": 32 }, { "centered": true, "display": 41981, - "x": 512, - "y": 64 + "x": 256, + "y": 32 }, { "centered": true, "display": 2220, - "x": 576, - "y": 64 + "x": 288, + "y": 32 }, { "centered": true, "display": 1218, "x": 0, - "y": 128 + "y": 64 } ] diff --git a/assets/map_tiles.png b/assets/map_tiles.png index 1c87bb792e9431cf5a2ae2de052eec15a169fcda..f750379423605046d7436400b3d1086f8f909c95 100644 GIT binary patch literal 4761 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 literal 9791 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 PFp$Mg>m7GZ@KOH(ago3L diff --git a/constants.hpp b/constants.hpp index aff596c..5087749 100644 --- a/constants.hpp +++ b/constants.hpp @@ -15,6 +15,8 @@ constexpr const int RAY_VIEW_Y=0; constexpr const int GLOW_LIMIT=220; constexpr const int LIGHT_MULTIPLIER=2.5; constexpr const float AIMED_AT_BRIGHTNESS=0.2f; +constexpr const int MAP_TILE_DIM=32; +constexpr const int ICONGEN_MAP_TILE_DIM=32; constexpr const int BOSS_VIEW_WIDTH=1080; constexpr const int BOSS_VIEW_HEIGHT=SCREEN_HEIGHT; diff --git a/tests/map.cpp b/tests/map.cpp index 15eb3b7..8a0f0b4 100644 --- a/tests/map.cpp +++ b/tests/map.cpp @@ -96,7 +96,7 @@ TEST_CASE("map image test", "[map-sprite]") { auto &walls = level.map->tiles(); auto &tile_set = textures::get_map_tile_set(); - sf::Vector2i size{64,64}; + sf::Vector2i size{MAP_TILE_DIM,MAP_TILE_DIM}; matrix::dump("TILES?", walls); std::unordered_map sprite_coord; diff --git a/tools/icongen.cpp b/tools/icongen.cpp index 134e839..16ba758 100644 --- a/tools/icongen.cpp +++ b/tools/icongen.cpp @@ -13,7 +13,6 @@ namespace fs = std::filesystem; constexpr const int TILE_COUNT=10; constexpr const sf::Color DEFAULT_COLOR{255, 255, 255, 255}; -constexpr const size_t DEFAULT_DIM=64; using namespace nlohmann; using namespace shiterator; @@ -85,7 +84,6 @@ struct MapTileBuilder { void run_real_textures(MapConfig &config) { sf::Vector2u crop{$size.x * (unsigned int)config.it.width, ($size.y) * ((unsigned int)config.it.y + 1)}; - fmt::println("TEXTURE CROP: {},{}; size: {},{}", $size.x, $size.y, crop.x, crop.y); $render = std::make_shared(crop); $render->clear({0,0,0,0}); @@ -154,9 +152,6 @@ struct MapTileBuilder { dbc::check($size.x - t_size.x >= 0, "font too big on x"); dbc::check($size.y - t_size.y >= 0, "font too big on y"); - fmt::println("display: {}, bg: {},{},{},{}; fg: {},{},{},{}", - (int)display_char, bg.r, bg.g, bg.b, bg.a, fg.r, fg.g, fg.b, fg.a); - // draw the background first background.setFillColor(bg); @@ -223,20 +218,16 @@ void load_config(MapConfig& config, bool is_centered, std::string path, std::fun if(data.contains("foreground")) { auto fg_color = data["foreground"]; sf::Color fg{fg_color[0], fg_color[1], fg_color[2]}; - fmt::println("TILE {}, display: {} has foreground: {},{},{}", key, (int)display, fg.r, fg.g, fg.b); config.colors.insert_or_assign(display, fg); } else { - fmt::println("TILE {}, {} has DEFAULT COLOR", key, (int)display); config.colors.insert_or_assign(display, DEFAULT_COLOR); } if(data.contains("background")) { auto bg_color = data["background"]; sf::Color bg{bg_color[0], bg_color[1], bg_color[2]}; - fmt::println("TILE {} display: {} has background: {},{},{}", key, (int)display, bg.r, bg.g, bg.b); config.backgrounds.insert_or_assign(display, bg); } else { - fmt::println("TILE {} display: {} has transparent background", key, (int)display); sf::Color bg{0, 0, 0, 0}; config.backgrounds.insert_or_assign(display, bg); } @@ -269,7 +260,7 @@ int main() { load_config(config, true, "./assets/enemies.json", component_display); fmt::println("-----------------------------------------"); - MapTileBuilder builder(DEFAULT_DIM, DEFAULT_DIM); + MapTileBuilder builder(ICONGEN_MAP_TILE_DIM, ICONGEN_MAP_TILE_DIM); builder.run(config); builder.save_image("./assets/map_tiles.png");