Skip to content

Optimize province pixel processing in load_map_images #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Optimize province pixel processing in load_map_images #608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/openvic-simulation/map/MapDefinition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,15 +641,6 @@ bool MapDefinition::load_region_file(ast::NodeCPtr root, std::span<const colour_
return ret;
}

static constexpr colour_t colour_at(uint8_t const* colour_data, int32_t idx) {
/* colour_data is filled with BGR byte triplets - to get pixel idx as a
* single RGB value, multiply idx by 3 to get the index of the corresponding
* triplet, then combine the bytes in reverse order.
*/
idx *= 3;
return { colour_data[idx + 2], colour_data[idx + 1], colour_data[idx] };
}

// Constants in the River BMP Palette
static constexpr uint8_t START_COLOUR = 0;
static constexpr uint8_t MERGE_COLOUR = 1;
Expand Down Expand Up @@ -853,23 +844,36 @@ bool MapDefinition::load_map_images(fs::path const& province_path, fs::path cons
memory::vector<fixed_point_t> pixels_per_province(province_definitions.size());
memory::vector<fvec2_t> pixel_position_sum_per_province(province_definitions.size());

memory::vector<colour_t> pixels;
pixels.reserve(province_bmp.get_pixel_data().size() / 3);
for (int32_t y = 0; y < get_height(); ++y) {
for (int32_t x = 0; x < get_width(); ++x) {
/* province_data is filled with BGR byte triplets - to get pixel idx as a
* single RGB value, multiply idx by 3 to get the index of the corresponding
* triplet, then combine the bytes in reverse order.
*/
int32_t index = get_pixel_index_from_pos({ x, y }) * 3;
pixels.emplace_back(province_data[index + 2], province_data[index + 1], province_data[index]);
}
}

for (ivec2_t pos {}; pos.y < get_height(); ++pos.y) {
for (pos.x = 0; pos.x < get_width(); ++pos.x) {
const size_t pixel_index = get_pixel_index_from_pos(pos);
const colour_t province_colour = colour_at(province_data, pixel_index);
colour_t& province_colour = pixels[pixel_index];
ProvinceDefinition::index_t province_number = ProvinceDefinition::NULL_INDEX;

if (pos.x > 0) {
const size_t jdx = pixel_index - 1;
if (colour_at(province_data, jdx) == province_colour) {
if (pixels[jdx] == province_colour) {
province_number = province_shape_image[jdx].province_number;
goto index_found;
}
}

if (pos.y > 0) {
const size_t jdx = pixel_index - get_width();
if (colour_at(province_data, jdx) == province_colour) {
if (pixels[jdx] == province_colour) {
province_number = province_shape_image[jdx].province_number;
goto index_found;
}
Expand Down