From 7e2700514652212e50a006ad525e7c7ca8e7840c Mon Sep 17 00:00:00 2001 From: Hop311 Date: Sat, 29 Apr 2023 20:00:44 +0100 Subject: Terrain textures + province colour alpha channel --- extension/src/openvic2/Date.cpp | 4 +-- extension/src/openvic2/GameAdvancementHook.cpp | 2 +- extension/src/openvic2/GameManager.cpp | 4 +-- extension/src/openvic2/GameManager.hpp | 5 ++- extension/src/openvic2/Good.hpp | 1 - extension/src/openvic2/Logger.cpp | 2 +- extension/src/openvic2/Types.cpp | 7 ++-- extension/src/openvic2/Types.hpp | 19 +++++++--- extension/src/openvic2/map/Building.cpp | 6 ++-- extension/src/openvic2/map/Building.hpp | 4 +-- extension/src/openvic2/map/Map.cpp | 49 +++++++++++++++++--------- extension/src/openvic2/map/Map.hpp | 13 ++++--- extension/src/openvic2/map/Province.cpp | 2 +- extension/src/openvic2/map/Province.hpp | 3 +- extension/src/openvic2/map/Region.cpp | 3 +- extension/src/openvic2/map/Region.hpp | 3 +- 16 files changed, 75 insertions(+), 52 deletions(-) (limited to 'extension/src/openvic2') diff --git a/extension/src/openvic2/Date.cpp b/extension/src/openvic2/Date.cpp index bb891fd..ed800d5 100644 --- a/extension/src/openvic2/Date.cpp +++ b/extension/src/openvic2/Date.cpp @@ -1,9 +1,9 @@ -#include "openvic2/Date.hpp" +#include "Date.hpp" #include #include -#include "openvic2/Logger.hpp" +#include "Logger.hpp" using namespace OpenVic2; diff --git a/extension/src/openvic2/GameAdvancementHook.cpp b/extension/src/openvic2/GameAdvancementHook.cpp index 4b9bc25..d90b7b1 100644 --- a/extension/src/openvic2/GameAdvancementHook.cpp +++ b/extension/src/openvic2/GameAdvancementHook.cpp @@ -1,4 +1,4 @@ -#include "openvic2/GameAdvancementHook.hpp" +#include "GameAdvancementHook.hpp" using namespace OpenVic2; diff --git a/extension/src/openvic2/GameManager.cpp b/extension/src/openvic2/GameManager.cpp index ca6e8ab..58e40bb 100644 --- a/extension/src/openvic2/GameManager.cpp +++ b/extension/src/openvic2/GameManager.cpp @@ -1,6 +1,6 @@ -#include "openvic2/GameManager.hpp" +#include "GameManager.hpp" -#include "openvic2/Logger.hpp" +#include "Logger.hpp" using namespace OpenVic2; diff --git a/extension/src/openvic2/GameManager.hpp b/extension/src/openvic2/GameManager.hpp index 7b15dc8..70e98bd 100644 --- a/extension/src/openvic2/GameManager.hpp +++ b/extension/src/openvic2/GameManager.hpp @@ -1,8 +1,7 @@ #pragma once -#include "openvic2/GameAdvancementHook.hpp" -#include "openvic2/map/Map.hpp" -#include "openvic2/Types.hpp" +#include "GameAdvancementHook.hpp" +#include "map/Map.hpp" namespace OpenVic2 { struct GameManager { diff --git a/extension/src/openvic2/Good.hpp b/extension/src/openvic2/Good.hpp index 54078dd..378bbc4 100644 --- a/extension/src/openvic2/Good.hpp +++ b/extension/src/openvic2/Good.hpp @@ -1,6 +1,5 @@ #pragma once -#include #include "Types.hpp" namespace OpenVic2 { diff --git a/extension/src/openvic2/Logger.cpp b/extension/src/openvic2/Logger.cpp index 56d74ab..4d7378e 100644 --- a/extension/src/openvic2/Logger.cpp +++ b/extension/src/openvic2/Logger.cpp @@ -1,4 +1,4 @@ -#include "openvic2/Logger.hpp" +#include "Logger.hpp" #include diff --git a/extension/src/openvic2/Types.cpp b/extension/src/openvic2/Types.cpp index 42aa5a4..f51ad7c 100644 --- a/extension/src/openvic2/Types.cpp +++ b/extension/src/openvic2/Types.cpp @@ -1,9 +1,8 @@ -#include "openvic2/Types.hpp" +#include "Types.hpp" #include #include #include -#include "Types.hpp" using namespace OpenVic2; @@ -16,7 +15,7 @@ std::string const& HasIdentifier::get_identifier() const { } HasColour::HasColour(colour_t const new_colour) : colour(new_colour) { - assert(colour <= MAX_COLOUR && colour != NULL_COLOUR); + assert(colour != NULL_COLOUR && colour <= MAX_COLOUR_RGB); } colour_t HasColour::get_colour() const { return colour; } @@ -29,4 +28,4 @@ std::string OpenVic2::HasColour::colour_to_hex_string(colour_t const colour) { std::string HasColour::colour_to_hex_string() const { return colour_to_hex_string(colour); -} \ No newline at end of file +} diff --git a/extension/src/openvic2/Types.hpp b/extension/src/openvic2/Types.hpp index f1ba639..1359fbe 100644 --- a/extension/src/openvic2/Types.hpp +++ b/extension/src/openvic2/Types.hpp @@ -3,18 +3,27 @@ #include #include #include +#include -#include "openvic2/Logger.hpp" +#include "Logger.hpp" namespace OpenVic2 { - //Represents a 24-bit RGB integer + // Represents a 24-bit RGB integer OR a 32-bit ARGB integer using colour_t = uint32_t; - using index_t = uint16_t; + /* When colour_t is used as an identifier, NULL_COLOUR is disallowed + * and should be reserved as an error value. + * When colour_t is used in a purely graphical context, NULL_COLOUR + * should be allowed. + */ + static constexpr colour_t NULL_COLOUR = 0, MAX_COLOUR_RGB = 0xFFFFFF; + constexpr colour_t to_alpha_value(float a) { + return static_cast(std::clamp(a, 0.0f, 1.0f) * 255.0f) << 24; + } - static constexpr colour_t NULL_COLOUR = 0, MAX_COLOUR = 0xFFFFFF; + using index_t = uint16_t; static constexpr index_t NULL_INDEX = 0, MAX_INDEX = 0xFFFF; - //TODO: price_t must be changed to a fixed-point numeric type before multiplayer + // TODO: price_t must be changed to a fixed-point numeric type before multiplayer using price_t = double; using return_t = bool; diff --git a/extension/src/openvic2/map/Building.cpp b/extension/src/openvic2/map/Building.cpp index 00e121b..1e26873 100644 --- a/extension/src/openvic2/map/Building.cpp +++ b/extension/src/openvic2/map/Building.cpp @@ -1,9 +1,9 @@ -#include "openvic2/map/Building.hpp" +#include "Building.hpp" #include -#include "openvic2/Logger.hpp" -#include "openvic2/map/Province.hpp" +#include "../Logger.hpp" +#include "Province.hpp" using namespace OpenVic2; diff --git a/extension/src/openvic2/map/Building.hpp b/extension/src/openvic2/map/Building.hpp index 1305014..78d08ae 100644 --- a/extension/src/openvic2/map/Building.hpp +++ b/extension/src/openvic2/map/Building.hpp @@ -2,8 +2,8 @@ #include -#include "openvic2/Types.hpp" -#include "openvic2/Date.hpp" +#include "../Types.hpp" +#include "../Date.hpp" namespace OpenVic2 { struct Province; diff --git a/extension/src/openvic2/map/Map.cpp b/extension/src/openvic2/map/Map.cpp index 4e7c0bb..ab035ad 100644 --- a/extension/src/openvic2/map/Map.cpp +++ b/extension/src/openvic2/map/Map.cpp @@ -1,9 +1,9 @@ -#include "openvic2/map/Map.hpp" +#include "Map.hpp" #include #include -#include "openvic2/Logger.hpp" +#include "../Logger.hpp" using namespace OpenVic2; @@ -31,7 +31,7 @@ return_t Map::add_province(std::string const& identifier, colour_t colour) { Logger::error("Invalid province identifier - empty!"); return FAILURE; } - if (colour == NULL_COLOUR || colour > MAX_COLOUR) { + if (colour == NULL_COLOUR || colour > MAX_COLOUR_RGB) { Logger::error("Invalid province colour: ", Province::colour_to_hex_string(colour)); return FAILURE; } @@ -175,7 +175,8 @@ static colour_t colour_at(uint8_t const* colour_data, int32_t idx) { return (colour_data[idx * 3] << 16) | (colour_data[idx * 3 + 1] << 8) | colour_data[idx * 3 + 2]; } -return_t Map::generate_province_shape_image(size_t new_width, size_t new_height, uint8_t const* colour_data) { +return_t Map::generate_province_shape_image(size_t new_width, size_t new_height, uint8_t const* colour_data, + uint8_t const* terrain_data, terrain_variant_map_t const& terrain_variant_map) { if (!province_shape_image.empty()) { Logger::error("Province index image has already been generated!"); return FAILURE; @@ -192,47 +193,62 @@ return_t Map::generate_province_shape_image(size_t new_width, size_t new_height, Logger::error("Province colour data pointer is null!"); return FAILURE; } + if (terrain_data == nullptr) { + Logger::error("Province terrain data pointer is null!"); + return FAILURE; + } width = new_width; height = new_height; province_shape_image.resize(width * height); std::vector province_checklist(provinces.get_item_count()); return_t ret = SUCCESS; - std::unordered_set unrecognised_colours; + std::unordered_set unrecognised_province_colours, unrecognised_terrain_colours; for (int32_t y = 0; y < height; ++y) { for (int32_t x = 0; x < width; ++x) { const int32_t idx = x + y * width; - const colour_t colour = colour_at(colour_data, idx); + + const colour_t terrain_colour = colour_at(terrain_data, idx); + const terrain_variant_map_t::const_iterator it = terrain_variant_map.find(terrain_colour); + if (it != terrain_variant_map.end()) province_shape_image[idx].terrain = it->second; + else { + if (unrecognised_terrain_colours.find(terrain_colour) == unrecognised_terrain_colours.end()) { + unrecognised_terrain_colours.insert(terrain_colour); + Logger::error("Unrecognised terrain colour ", Province::colour_to_hex_string(terrain_colour), " at (", x, ", ", y, ")"); + ret = FAILURE; + } + province_shape_image[idx].terrain = 0; + } + + const colour_t province_colour = colour_at(colour_data, idx); if (x > 0) { const int32_t jdx = idx - 1; - if (colour_at(colour_data, jdx) == colour) { - province_shape_image[idx] = province_shape_image[jdx]; + if (colour_at(colour_data, jdx) == province_colour) { + province_shape_image[idx].index = province_shape_image[jdx].index; continue; } } if (y > 0) { const int32_t jdx = idx - width; - if (colour_at(colour_data, jdx) == colour) { - province_shape_image[idx] = province_shape_image[jdx]; + if (colour_at(colour_data, jdx) == province_colour) { + province_shape_image[idx].index = province_shape_image[jdx].index; continue; } } - Province const* province = get_province_by_colour(colour); + Province const* province = get_province_by_colour(province_colour); if (province != nullptr) { const index_t index = province->get_index(); province_checklist[index - 1] = true; province_shape_image[idx].index = index; - province_shape_image[idx].terrain = !province->is_water(); continue; } - if (unrecognised_colours.find(colour) == unrecognised_colours.end()) { - unrecognised_colours.insert(colour); - Logger::error("Unrecognised province colour ", Province::colour_to_hex_string(colour), " at (", x, ", ", y, ")"); + if (unrecognised_province_colours.find(province_colour) == unrecognised_province_colours.end()) { + unrecognised_province_colours.insert(province_colour); + Logger::error("Unrecognised province colour ", Province::colour_to_hex_string(province_colour), " at (", x, ", ", y, ")"); ret = FAILURE; } province_shape_image[idx].index = NULL_INDEX; - province_shape_image[idx].terrain = 0; } } @@ -303,6 +319,7 @@ return_t Map::generate_mapmode_colours(Mapmode::index_t index, uint8_t* target) *target++ = (colour >> 16) & 0xFF; *target++ = (colour >> 8) & 0xFF; *target++ = colour & 0xFF; + *target++ = (colour >> 24) & 0xFF; } return SUCCESS; } diff --git a/extension/src/openvic2/map/Map.hpp b/extension/src/openvic2/map/Map.hpp index e5be9c7..a075505 100644 --- a/extension/src/openvic2/map/Map.hpp +++ b/extension/src/openvic2/map/Map.hpp @@ -1,9 +1,9 @@ #pragma once #include +#include -#include "openvic2/map/Region.hpp" -#include "openvic2/Types.hpp" +#include "Region.hpp" namespace OpenVic2 { @@ -26,10 +26,12 @@ namespace OpenVic2 { * MAP-4 */ struct Map { + using terrain_t = uint8_t; + using terrain_variant_map_t = std::unordered_map; #pragma pack(push, 1) struct shape_pixel_t { index_t index; - uint8_t terrain; + terrain_t terrain; }; #pragma pack(pop) private: @@ -63,7 +65,8 @@ namespace OpenVic2 { Region* get_region_by_identifier(std::string const& identifier); Region const* get_region_by_identifier(std::string const& identifier) const; - return_t generate_province_shape_image(size_t new_width, size_t new_height, uint8_t const* colour_data); + return_t generate_province_shape_image(size_t new_width, size_t new_height, uint8_t const* colour_data, + uint8_t const* terrain_data, terrain_variant_map_t const& terrain_variant_map); size_t get_width() const; size_t get_height() const; std::vector const& get_province_shape_image() const; @@ -73,7 +76,7 @@ namespace OpenVic2 { size_t get_mapmode_count() const; Mapmode const* get_mapmode_by_index(Mapmode::index_t index) const; Mapmode const* get_mapmode_by_identifier(std::string const& identifier) const; - static constexpr size_t MAPMODE_COLOUR_SIZE = 3; + static constexpr size_t MAPMODE_COLOUR_SIZE = 4; return_t generate_mapmode_colours(Mapmode::index_t index, uint8_t* target) const; return_t generate_province_buildings(BuildingManager const& manager); diff --git a/extension/src/openvic2/map/Province.cpp b/extension/src/openvic2/map/Province.cpp index 472cccb..b3d455b 100644 --- a/extension/src/openvic2/map/Province.cpp +++ b/extension/src/openvic2/map/Province.cpp @@ -1,4 +1,4 @@ -#include "openvic2/map/Province.hpp" +#include "Province.hpp" #include #include diff --git a/extension/src/openvic2/map/Province.hpp b/extension/src/openvic2/map/Province.hpp index 65eaa09..9b07fc1 100644 --- a/extension/src/openvic2/map/Province.hpp +++ b/extension/src/openvic2/map/Province.hpp @@ -1,7 +1,6 @@ #pragma once -#include "openvic2/map/Building.hpp" -#include "openvic2/Types.hpp" +#include "Building.hpp" namespace OpenVic2 { struct Map; diff --git a/extension/src/openvic2/map/Region.cpp b/extension/src/openvic2/map/Region.cpp index 6839a10..da0dfdd 100644 --- a/extension/src/openvic2/map/Region.cpp +++ b/extension/src/openvic2/map/Region.cpp @@ -1,7 +1,6 @@ -#include "openvic2/map/Region.hpp" +#include "Region.hpp" #include -#include using namespace OpenVic2; diff --git a/extension/src/openvic2/map/Region.hpp b/extension/src/openvic2/map/Region.hpp index 58fad31..3920dfc 100644 --- a/extension/src/openvic2/map/Region.hpp +++ b/extension/src/openvic2/map/Region.hpp @@ -2,8 +2,7 @@ #include -#include "openvic2/map/Province.hpp" -#include "openvic2/Types.hpp" +#include "Province.hpp" namespace OpenVic2 { -- cgit v1.2.3-56-ga3b1 From 2fec521cc6bbe7b2cda0eef3b830acbfc8b68333 Mon Sep 17 00:00:00 2001 From: Hop311 Date: Sun, 30 Apr 2023 23:59:54 +0100 Subject: Hashmaps instead of linear + better province hover --- extension/src/openvic2/Types.hpp | 17 ++++++++++------- extension/src/openvic2/map/Map.cpp | 30 ++++++++++-------------------- extension/src/openvic2/map/Map.hpp | 11 +++++++---- game/src/GameSession/MapView.gd | 1 + 4 files changed, 28 insertions(+), 31 deletions(-) (limited to 'extension/src/openvic2') diff --git a/extension/src/openvic2/Types.hpp b/extension/src/openvic2/Types.hpp index 1359fbe..e4a0e2d 100644 --- a/extension/src/openvic2/Types.hpp +++ b/extension/src/openvic2/Types.hpp @@ -1,9 +1,9 @@ #pragma once -#include #include #include #include +#include #include "Logger.hpp" @@ -74,9 +74,12 @@ namespace OpenVic2 { */ template::value>::type* = nullptr> class IdentifierRegistry { + using identifier_index_map_t = std::map; + const std::string name; std::vector items; bool locked = false; + identifier_index_map_t identifier_index_map; public: IdentifierRegistry(std::string const& new_name) : name(new_name) {} return_t add_item(T&& item) { @@ -89,6 +92,7 @@ namespace OpenVic2 { Logger::error("Cannot add item to the ", name, " registry - an item with the identifier \"", item.get_identifier(), "\" already exists!"); return FAILURE; } + identifier_index_map[item.get_identifier()] = items.size(); items.push_back(std::move(item)); return SUCCESS; } @@ -104,6 +108,7 @@ namespace OpenVic2 { return locked; } void reset() { + identifier_index_map.clear(); items.clear(); locked = false; } @@ -111,15 +116,13 @@ namespace OpenVic2 { return items.size(); } T* get_item_by_identifier(std::string const& identifier) { - if (!identifier.empty()) - for (T& item : items) - if (item.get_identifier() == identifier) return &item; + const identifier_index_map_t::const_iterator it = identifier_index_map.find(identifier); + if (it != identifier_index_map.end()) return &items[it->second]; return nullptr; } T const* get_item_by_identifier(std::string const& identifier) const { - if (!identifier.empty()) - for (T const& item : items) - if (item.get_identifier() == identifier) return &item; + const identifier_index_map_t::const_iterator it = identifier_index_map.find(identifier); + if (it != identifier_index_map.end()) return &items[it->second]; return nullptr; } T* get_item_by_index(size_t index) { diff --git a/extension/src/openvic2/map/Map.cpp b/extension/src/openvic2/map/Map.cpp index ab035ad..1f44c43 100644 --- a/extension/src/openvic2/map/Map.cpp +++ b/extension/src/openvic2/map/Map.cpp @@ -36,11 +36,12 @@ return_t Map::add_province(std::string const& identifier, colour_t colour) { return FAILURE; } Province new_province{ static_cast(provinces.get_item_count() + 1), identifier, colour }; - Province const* old_province = get_province_by_colour(colour); - if (old_province != nullptr) { - Logger::error("Duplicate province colours: ", old_province->to_string(), " and ", new_province.to_string()); + const index_t index = get_index_from_colour(colour); + if (index != NULL_INDEX) { + Logger::error("Duplicate province colours: ", get_province_by_index(index)->to_string(), " and ", new_province.to_string()); return FAILURE; } + colour_index_map[new_province.get_colour()] = new_province.get_index(); return provinces.add_item(std::move(new_province)); } @@ -142,20 +143,10 @@ Province const* Map::get_province_by_identifier(std::string const& identifier) c return provinces.get_item_by_identifier(identifier); } -Province* Map::get_province_by_colour(colour_t colour) { - if (colour != NULL_COLOUR) - for (Province& province : provinces.get_items()) - if (province.get_colour() == colour) return &province; - return nullptr; -} - -Province const* Map::get_province_by_colour(colour_t colour) const { - if (colour == NULL_COLOUR) { return nullptr; } - for (Province const& province : provinces.get_items()) { - if (province.get_colour() == colour) - return &province; - } - return nullptr; +index_t Map::get_index_from_colour(colour_t colour) const { + const colour_index_map_t::const_iterator it = colour_index_map.find(colour); + if (it != colour_index_map.end()) return it->second; + return NULL_INDEX; } index_t Map::get_province_index_at(size_t x, size_t y) const { @@ -236,9 +227,8 @@ return_t Map::generate_province_shape_image(size_t new_width, size_t new_height, continue; } } - Province const* province = get_province_by_colour(province_colour); - if (province != nullptr) { - const index_t index = province->get_index(); + const index_t index = get_index_from_colour(province_colour); + if (index != NULL_INDEX) { province_checklist[index - 1] = true; province_shape_image[idx].index = index; continue; diff --git a/extension/src/openvic2/map/Map.hpp b/extension/src/openvic2/map/Map.hpp index a075505..cb8dcb1 100644 --- a/extension/src/openvic2/map/Map.hpp +++ b/extension/src/openvic2/map/Map.hpp @@ -1,7 +1,6 @@ #pragma once #include -#include #include "Region.hpp" @@ -27,7 +26,8 @@ namespace OpenVic2 { */ struct Map { using terrain_t = uint8_t; - using terrain_variant_map_t = std::unordered_map; + using terrain_variant_map_t = std::map; + #pragma pack(push, 1) struct shape_pixel_t { index_t index; @@ -35,6 +35,8 @@ namespace OpenVic2 { }; #pragma pack(pop) private: + using colour_index_map_t = std::map; + IdentifierRegistry provinces; IdentifierRegistry regions; IdentifierRegistry mapmodes; @@ -43,6 +45,9 @@ namespace OpenVic2 { size_t width = 0, height = 0; std::vector province_shape_image; + colour_index_map_t colour_index_map; + + index_t get_index_from_colour(colour_t colour) const; public: Map(); @@ -58,8 +63,6 @@ namespace OpenVic2 { Province const* get_province_by_index(index_t index) const; Province* get_province_by_identifier(std::string const& identifier); Province const* get_province_by_identifier(std::string const& identifier) const; - Province* get_province_by_colour(colour_t colour); - Province const* get_province_by_colour(colour_t colour) const; index_t get_province_index_at(size_t x, size_t y) const; Region* get_region_by_identifier(std::string const& identifier); diff --git a/game/src/GameSession/MapView.gd b/game/src/GameSession/MapView.gd index 2e2c5e6..e2c8519 100644 --- a/game/src/GameSession/MapView.gd +++ b/game/src/GameSession/MapView.gd @@ -228,6 +228,7 @@ func _on_mouse_entered_viewport(): func _on_mouse_exited_viewport(): _mouse_over_viewport = false + _map_shader_material.set_shader_parameter(Events.ShaderManager.param_hover_index, 0) func _on_minimap_clicked(pos_clicked : Vector2): pos_clicked *= _map_mesh_dims -- cgit v1.2.3-56-ga3b1