dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use shift/mask to get water region ID

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-09 23:31:50 +00:00
parent 5dd67651a3
commit 9206fa1fce
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pathfinder/water_regions.cpp
View File

@@ -36,7 +36,9 @@ static inline uint32_t GetWaterRegionY(TileIndex tile) { return TileY(tile) / WA
static inline uint32_t GetWaterRegionMapSizeX() { return MapSizeX() / WATER_REGION_EDGE_LENGTH; } static inline uint32_t GetWaterRegionMapSizeX() { return MapSizeX() / WATER_REGION_EDGE_LENGTH; }
static inline uint32_t GetWaterRegionMapSizeY() { return MapSizeY() / WATER_REGION_EDGE_LENGTH; } static inline uint32_t GetWaterRegionMapSizeY() { return MapSizeY() / WATER_REGION_EDGE_LENGTH; }
static inline TWaterRegionIndex GetWaterRegionIndex(uint32_t region_x, uint32_t region_y) { return GetWaterRegionMapSizeX() * region_y + region_x; } static inline uint32_t GetWaterRegionYShift() { return MapLogX() - WATER_REGION_EDGE_LENGTH_LOG; }
static inline TWaterRegionIndex GetWaterRegionIndex(uint32_t region_x, uint32_t region_y) { return (region_y << GetWaterRegionYShift()) + region_x; }
static inline TWaterRegionIndex GetWaterRegionIndex(TileIndex tile) { return GetWaterRegionIndex(GetWaterRegionX(tile), GetWaterRegionY(tile)); } static inline TWaterRegionIndex GetWaterRegionIndex(TileIndex tile) { return GetWaterRegionIndex(GetWaterRegionX(tile), GetWaterRegionY(tile)); }
struct WaterRegionTileIterator { struct WaterRegionTileIterator {
@@ -390,8 +392,8 @@ void LoadWaterRegions(const std::vector<WaterRegionSaveLoadInfo> &save_load_info
_water_regions.reserve(save_load_info.size()); _water_regions.reserve(save_load_info.size());
TWaterRegionIndex index = 0; TWaterRegionIndex index = 0;
for (const auto &loaded_region_info : save_load_info) { for (const auto &loaded_region_info : save_load_info) {
const uint32_t region_x = index % GetWaterRegionMapSizeX(); const uint32_t region_x = index & ((1 << GetWaterRegionYShift()) - 1);
const uint32_t region_y = index / GetWaterRegionMapSizeX(); const uint32_t region_y = index >> GetWaterRegionYShift();
WaterRegion &region = _water_regions.emplace_back(region_x, region_y); WaterRegion &region = _water_regions.emplace_back(region_x, region_y);
if (loaded_region_info.initialized) region.ForceUpdate(); if (loaded_region_info.initialized) region.ForceUpdate();
index++; index++;

6
src/pathfinder/water_regions.h
View File

@@ -20,10 +20,14 @@ using TWaterRegionPatchLabel = uint8_t;
using TWaterRegionIndex = uint32_t; using TWaterRegionIndex = uint32_t;
constexpr uint32_t WATER_REGION_EDGE_LENGTH = 16; constexpr uint32_t WATER_REGION_EDGE_LENGTH = 16;
constexpr uint32_t WATER_REGION_NUMBER_OF_TILES = WATER_REGION_EDGE_LENGTH * WATER_REGION_EDGE_LENGTH; constexpr uint32_t WATER_REGION_EDGE_LENGTH_LOG = 4;
static_assert(1 << WATER_REGION_EDGE_LENGTH_LOG == WATER_REGION_EDGE_LENGTH);
constexpr uint32_t WATER_REGION_EDGE_MASK = WATER_REGION_EDGE_LENGTH - 1; constexpr uint32_t WATER_REGION_EDGE_MASK = WATER_REGION_EDGE_LENGTH - 1;
static_assert((WATER_REGION_EDGE_LENGTH & WATER_REGION_EDGE_MASK) == 0); static_assert((WATER_REGION_EDGE_LENGTH & WATER_REGION_EDGE_MASK) == 0);
constexpr uint32_t WATER_REGION_NUMBER_OF_TILES = WATER_REGION_EDGE_LENGTH * WATER_REGION_EDGE_LENGTH;
/** /**
* Describes a single interconnected patch of water within a particular water region. * Describes a single interconnected patch of water within a particular water region.
*/ */