cpp/openttd-patchpack/source Changeset - r28781:ee8d01cc7e15

Changeset - r28781:ee8d01cc7e15

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

Koen Bussemaker - 2 months ago 2024-02-17 19:15:43
koen_bussemaker@hotmail.com

Codechange: Skip non-water water region patches in neigbor search

3 files changed with 7 insertions and 1 deletions:

src/pathfinder/water_regions.cpp

src/pathfinder/water_regions.h

src/pathfinder/yapf/yapf_ship_regions.cpp

0 comments (0 inline, 0 general)

src/pathfinder/water_regions.cpp

➞

Show inline comments

@@ @@ -22,7 +22,6 @@ @@
 using TWaterRegionTraversabilityBits = uint16_t;
 constexpr TWaterRegionPatchLabel FIRST_REGION_LABEL = 1;
 constexpr TWaterRegionPatchLabel INVALID_WATER_REGION_PATCH = 0;
 static_assert(sizeof(TWaterRegionTraversabilityBits) * 8 == WATER_REGION_EDGE_LENGTH);
 static_assert(sizeof(TWaterRegionPatchLabel) == sizeof(byte)); // Important for the hash calculation.
@@ @@ -321,6 +320,8 @@ void InvalidateWaterRegion(TileIndex til @@
  */
 static inline void VisitAdjacentWaterRegionPatchNeighbors(const WaterRegionPatchDesc &water_region_patch, DiagDirection side, TVisitWaterRegionPatchCallBack &func)
+{
 	if (water_region_patch.label == INVALID_WATER_REGION_PATCH) return;
 	const WaterRegion &current_region = GetUpdatedWaterRegion(water_region_patch.x, water_region_patch.y);
 	const TileIndexDiffC offset = TileIndexDiffCByDiagDir(side);
@@ @@ -354,6 +355,7 @@ static inline void VisitAdjacentWaterReg @@
 		const TileIndex neighbor_edge_tile = GetEdgeTileCoordinate(nx, ny, opposite_side, x_or_y);
 		const TWaterRegionPatchLabel neighbor_label = neighboring_region.GetLabel(neighbor_edge_tile);
 		assert(neighbor_label != INVALID_WATER_REGION_PATCH);
 		if (std::find(unique_labels.begin(), unique_labels.end(), neighbor_label) == unique_labels.end()) unique_labels.push_back(neighbor_label);
+	}
 	for (TWaterRegionPatchLabel unique_label : unique_labels) func(WaterRegionPatchDesc{ nx, ny, unique_label });
@@ @@ -367,6 +369,8 @@ static inline void VisitAdjacentWaterReg @@
  */
 void VisitWaterRegionPatchNeighbors(const WaterRegionPatchDesc &water_region_patch, TVisitWaterRegionPatchCallBack &callback)
+{
 	if (water_region_patch.label == INVALID_WATER_REGION_PATCH) return;
 	const WaterRegion &current_region = GetUpdatedWaterRegion(water_region_patch.x, water_region_patch.y);
 	/* Visit adjacent water region patches in each cardinal direction */

src/pathfinder/water_regions.h

➞

Show inline comments

@@ @@ -18,6 +18,7 @@ using TWaterRegionIndex = uint; @@
 constexpr int WATER_REGION_EDGE_LENGTH = 16;
 constexpr int WATER_REGION_NUMBER_OF_TILES = WATER_REGION_EDGE_LENGTH * WATER_REGION_EDGE_LENGTH;
 constexpr TWaterRegionPatchLabel INVALID_WATER_REGION_PATCH = 0;
 /**
  * Describes a single interconnected patch of water within a particular water region.

src/pathfinder/yapf/yapf_ship_regions.cpp

➞

Show inline comments

@@ @@ -102,6 +102,7 @@ private: @@
 public:
 	void AddOrigin(const WaterRegionPatchDesc &water_region_patch)
+	{
 		if (water_region_patch.label == INVALID_WATER_REGION_PATCH) return;
 		if (!HasOrigin(water_region_patch)) m_origin_keys.push_back(CYapfRegionPatchNodeKey{ water_region_patch });
+	}

0 comments (0 inline, 0 general)