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

Add a stepped OrthogonalTileIterator for grid iteration

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-05-26 13:23:53 +01:00
parent 8cd552fd66
commit 33344482ae
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tilearea_type.h
View File

@@ -144,7 +144,8 @@ public:
}; };
/** Iterator to iterate over a tile area (rectangle) of the map. */ /** Iterator to iterate over a tile area (rectangle) of the map. */
class OrthogonalTileIterator : public TileIterator { template<uint N>
class OrthogonalTileIteratorStep : public TileIterator {
private: private:
int w; ///< The width of the iterated area. int w; ///< The width of the iterated area.
int x; ///< The current 'x' position in the rectangle. int x; ///< The current 'x' position in the rectangle.
@@ -155,7 +156,7 @@ public:
* Construct the iterator. * Construct the iterator.
* @param ta Area, i.e. begin point and width/height of to-be-iterated area. * @param ta Area, i.e. begin point and width/height of to-be-iterated area.
*/ */
OrthogonalTileIterator(const OrthogonalTileArea &ta) : TileIterator(ta.w == 0 || ta.h == 0 ? INVALID_TILE : ta.tile), w(ta.w), x(ta.w), y(ta.h) OrthogonalTileIteratorStep(const OrthogonalTileArea &ta) : TileIterator(ta.w == 0 || ta.h == 0 ? INVALID_TILE : ta.tile), w(ta.w / N), x(ta.w / N), y(ta.h / N)
{ {
} }
@@ -164,9 +165,9 @@ public:
* @param corner1 Tile from where to begin iterating. * @param corner1 Tile from where to begin iterating.
* @param corner2 Tile where to end the iterating. * @param corner2 Tile where to end the iterating.
*/ */
OrthogonalTileIterator(TileIndex corner1, TileIndex corner2) OrthogonalTileIteratorStep(TileIndex corner1, TileIndex corner2)
{ {
*this = OrthogonalTileIterator(OrthogonalTileArea(corner1, corner2)); *this = OrthogonalTileIteratorStep(OrthogonalTileArea(corner1, corner2));
} }
/** /**
@@ -177,10 +178,10 @@ public:
assert(this->tile != INVALID_TILE); assert(this->tile != INVALID_TILE);
if (--this->x > 0) { if (--this->x > 0) {
this->tile++; this->tile += N;
} else if (--this->y > 0) { } else if (--this->y > 0) {
this->x = this->w; this->x = this->w;
this->tile += TileDiffXY(1, 1) - this->w; this->tile += TileDiffXY(N, N) - (N * this->w);
} else { } else {
this->tile = INVALID_TILE; this->tile = INVALID_TILE;
} }
@@ -189,10 +190,12 @@ public:
virtual TileIterator *Clone() const virtual TileIterator *Clone() const
{ {
return new OrthogonalTileIterator(*this); return new OrthogonalTileIteratorStep(*this);
} }
}; };
using OrthogonalTileIterator = OrthogonalTileIteratorStep<1>;
/** Iterator to iterate over a tile area (rectangle) of the map. /** Iterator to iterate over a tile area (rectangle) of the map.
* It prefetches tiles once per row. * It prefetches tiles once per row.
*/ */
@@ -298,6 +301,7 @@ public:
* @param ta The tile area to search over. * @param ta The tile area to search over.
*/ */
#define TILE_AREA_LOOP(var, ta) for (OrthogonalTileIterator var(ta); var != INVALID_TILE; ++var) #define TILE_AREA_LOOP(var, ta) for (OrthogonalTileIterator var(ta); var != INVALID_TILE; ++var)
#define TILE_AREA_LOOP_STEP(var, ta, N) for (OrthogonalTileIteratorStep<N> var(ta); var != INVALID_TILE; ++var)
#define TILE_AREA_LOOP_WITH_PREFETCH(var, ta) for (OrthogonalPrefetchTileIterator var(ta); var != INVALID_TILE; ++var) #define TILE_AREA_LOOP_WITH_PREFETCH(var, ta) for (OrthogonalPrefetchTileIterator var(ta); var != INVALID_TILE; ++var)
#endif /* TILEAREA_TYPE_H */ #endif /* TILEAREA_TYPE_H */

8
src/town_cmd.cpp
View File

@@ -953,11 +953,9 @@ void UpdateTownCargoTotal(Town *t)
t->cargo_accepted_total = 0; t->cargo_accepted_total = 0;
const TileArea &area = t->cargo_accepted.GetArea(); const TileArea &area = t->cargo_accepted.GetArea();
TILE_AREA_LOOP(tile, area) { TILE_AREA_LOOP_STEP(tile, area, AcceptanceMatrix::GRID) {
if (TileX(tile) % AcceptanceMatrix::GRID == 0 && TileY(tile) % AcceptanceMatrix::GRID == 0) {
t->cargo_accepted_total |= t->cargo_accepted[tile]; t->cargo_accepted_total |= t->cargo_accepted[tile];
} }
}
} }
/** /**
@@ -1004,11 +1002,9 @@ void UpdateTownCargoes(Town *t)
if (area.tile == INVALID_TILE) return; if (area.tile == INVALID_TILE) return;
/* Update acceptance for each grid square. */ /* Update acceptance for each grid square. */
TILE_AREA_LOOP(tile, area) { TILE_AREA_LOOP_STEP(tile, area, AcceptanceMatrix::GRID) {
if (TileX(tile) % AcceptanceMatrix::GRID == 0 && TileY(tile) % AcceptanceMatrix::GRID == 0) {
UpdateTownCargoes(t, tile, false); UpdateTownCargoes(t, tile, false);
} }
}
/* Update the total acceptance. */ /* Update the total acceptance. */
UpdateTownCargoTotal(t); UpdateTownCargoTotal(t);