diff options
| author |   hop311 <hop3114@gmail.com> | 2024-01-15 01:30:02 +0100 |
|---|---|---|
| committer | hop311 <hop3114@gmail.com> | 2024-01-15 01:30:02 +0100 |
| commit | fe1dd80ca6eb6d024e046f1ab804e5be707e483e (patch) | |
| tree | 742bcbbeff8169f45a97b35de45aa06b6458d8b9 /extension | |
| parent | 92267a046506077418823a16ac8748579cf7905c (diff) | |
Improved province colouring and terrain texture tiling
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/src/openvic-extension/singletons/GameSingleton.cpp | 7 | ||||
| -rw-r--r-- | extension/src/openvic-extension/singletons/GameSingleton.hpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/extension/src/openvic-extension/singletons/GameSingleton.cpp b/extension/src/openvic-extension/singletons/GameSingleton.cpp index 8564d54..2730352 100644 --- a/extension/src/openvic-extension/singletons/GameSingleton.cpp +++ b/extension/src/openvic-extension/singletons/GameSingleton.cpp @@ -472,7 +472,7 @@ void GameSingleton::try_tick() { game_manager.get_simulation_clock().conditionally_advance_game(); } -Error GameSingleton::_load_map_images(bool flip_vertical) { +Error GameSingleton::_load_map_images() { ERR_FAIL_COND_V_MSG(province_shape_texture.is_valid(), FAILED, "Map images have already been loaded!"); Error err = OK; @@ -544,7 +544,6 @@ Error GameSingleton::_load_terrain_variants() { static constexpr int32_t SHEET_DIMS = 8, SHEET_SIZE = SHEET_DIMS * SHEET_DIMS; - terrain_sheet->flip_y(); const int32_t sheet_width = terrain_sheet->get_width(), sheet_height = terrain_sheet->get_height(); ERR_FAIL_COND_V_MSG( sheet_width < 1 || sheet_width % SHEET_DIMS != 0 || sheet_width != sheet_height, FAILED, vformat( @@ -566,7 +565,7 @@ Error GameSingleton::_load_terrain_variants() { } Error err = OK; for (int32_t idx = 0; idx < SHEET_SIZE; ++idx) { - const Rect2i slice { (idx % SHEET_DIMS) * slice_size, (7 - (idx / SHEET_DIMS)) * slice_size, slice_size, slice_size }; + const Rect2i slice { idx % SHEET_DIMS * slice_size, idx / SHEET_DIMS * slice_size, slice_size, slice_size }; const Ref<Image> terrain_image = terrain_sheet->get_region(slice); if (terrain_image.is_null() || terrain_image->is_empty()) { UtilityFunctions::push_error( @@ -655,7 +654,7 @@ Error GameSingleton::load_defines_compatibility_mode(PackedStringArray const& fi UtilityFunctions::push_error("Failed to load flag textures!"); err = FAILED; } - if (_load_map_images(true) != OK) { + if (_load_map_images() != OK) { UtilityFunctions::push_error("Failed to load map images!"); err = FAILED; } diff --git a/extension/src/openvic-extension/singletons/GameSingleton.hpp b/extension/src/openvic-extension/singletons/GameSingleton.hpp index 047d14c..913bdd4 100644 --- a/extension/src/openvic-extension/singletons/GameSingleton.hpp +++ b/extension/src/openvic-extension/singletons/GameSingleton.hpp @@ -30,7 +30,7 @@ namespace OpenVic { static godot::StringName const& _signal_clock_state_changed(); godot::Error _generate_terrain_texture_array(); - godot::Error _load_map_images(bool flip_vertical); + godot::Error _load_map_images(); godot::Error _load_terrain_variants(); godot::Error _load_flag_images(); |