aboutsummaryrefslogtreecommitdiff
path: root/extension/src/openvic2/map
diff options
context:
space:
mode:
Diffstat (limited to 'extension/src/openvic2/map')
-rw-r--r--extension/src/openvic2/map/Building.cpp6
-rw-r--r--extension/src/openvic2/map/Building.hpp4
-rw-r--r--extension/src/openvic2/map/Map.cpp77
-rw-r--r--extension/src/openvic2/map/Map.hpp20
-rw-r--r--extension/src/openvic2/map/Province.cpp2
-rw-r--r--extension/src/openvic2/map/Province.hpp3
-rw-r--r--extension/src/openvic2/map/Region.cpp3
-rw-r--r--extension/src/openvic2/map/Region.hpp3
8 files changed, 64 insertions, 54 deletions
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 <cassert>
-#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 <vector>
-#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..1f44c43 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 <cassert>
#include <unordered_set>
-#include "openvic2/Logger.hpp"
+#include "../Logger.hpp"
using namespace OpenVic2;
@@ -31,16 +31,17 @@ 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;
}
Province new_province{ static_cast<index_t>(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 {
@@ -175,7 +166,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 +184,61 @@ 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<bool> province_checklist(provinces.get_item_count());
return_t ret = SUCCESS;
- std::unordered_set<colour_t> unrecognised_colours;
+ std::unordered_set<colour_t> 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);
- 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;
- 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 +309,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..cb8dcb1 100644
--- a/extension/src/openvic2/map/Map.hpp
+++ b/extension/src/openvic2/map/Map.hpp
@@ -2,8 +2,7 @@
#include <functional>
-#include "openvic2/map/Region.hpp"
-#include "openvic2/Types.hpp"
+#include "Region.hpp"
namespace OpenVic2 {
@@ -26,13 +25,18 @@ namespace OpenVic2 {
* MAP-4
*/
struct Map {
+ using terrain_t = uint8_t;
+ using terrain_variant_map_t = std::map<colour_t, terrain_t>;
+
#pragma pack(push, 1)
struct shape_pixel_t {
index_t index;
- uint8_t terrain;
+ terrain_t terrain;
};
#pragma pack(pop)
private:
+ using colour_index_map_t = std::map<colour_t, index_t>;
+
IdentifierRegistry<Province> provinces;
IdentifierRegistry<Region> regions;
IdentifierRegistry<Mapmode> mapmodes;
@@ -41,6 +45,9 @@ namespace OpenVic2 {
size_t width = 0, height = 0;
std::vector<shape_pixel_t> province_shape_image;
+ colour_index_map_t colour_index_map;
+
+ index_t get_index_from_colour(colour_t colour) const;
public:
Map();
@@ -56,14 +63,13 @@ 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);
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<shape_pixel_t> const& get_province_shape_image() const;
@@ -73,7 +79,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 <cassert>
#include <sstream>
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 <cassert>
-#include <algorithm>
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 <set>
-#include "openvic2/map/Province.hpp"
-#include "openvic2/Types.hpp"
+#include "Province.hpp"
namespace OpenVic2 {
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100