mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-16 20:42:40 +01:00
Code Issues Releases Wiki Activity

Change invalidating map animations from set to vector of bools

Browse Source
This commit is contained in:
mix
2025-05-31 17:59:52 +01:00
parent c7dba755b1
commit 22f3dd429d
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/openrct2/world/MapAnimation.cpp
View File

@@ -71,7 +71,8 @@ struct TileCoordsXYCmp
} }
}; };
static std::set<TileCoordsXY, TileCoordsXYCmp> _mapAnimationsInvalidate; static std::vector<bool> _mapAnimationsInvalidate = std::vector<bool>(
kMaximumMapSizeTechnical * kMaximumMapSizeTechnical, false);
static std::set<TileCoordsXY, TileCoordsXYCmp> _mapAnimationsUpdate; static std::set<TileCoordsXY, TileCoordsXYCmp> _mapAnimationsUpdate;
static std::set<TemporaryMapAnimation> _temporaryMapAnimations; static std::set<TemporaryMapAnimation> _temporaryMapAnimations;
@@ -598,16 +599,19 @@ static std::optional<UpdateType> IsElementAnimated(const TileElementBase& elemen
void MapAnimations::MarkTileForInvalidation(const TileCoordsXY coords) void MapAnimations::MarkTileForInvalidation(const TileCoordsXY coords)
{ {
if (!_mapAnimationsUpdate.contains(coords)) if (!MapIsEdge(coords.ToCoordsXY()) && !_mapAnimationsUpdate.contains(coords))
{ {
_mapAnimationsInvalidate.insert(coords); _mapAnimationsInvalidate[coords.x + (coords.y * kMaximumMapSizeTechnical)] = true;
} }
} }
void MapAnimations::MarkTileForUpdate(const TileCoordsXY coords) void MapAnimations::MarkTileForUpdate(const TileCoordsXY coords)
{ {
_mapAnimationsInvalidate.erase(coords); if (!MapIsEdge(coords.ToCoordsXY()))
{
_mapAnimationsInvalidate[coords.x + (coords.y * kMaximumMapSizeTechnical)] = false;
_mapAnimationsUpdate.insert(coords); _mapAnimationsUpdate.insert(coords);
}
} }
void MapAnimations::CreateTemporary(const CoordsXYZ& coords, const TemporaryType type) void MapAnimations::CreateTemporary(const CoordsXYZ& coords, const TemporaryType type)
@@ -674,11 +678,12 @@ static void InvalidateAll(const ViewportList& viewports)
for (int32_t i = 0; i < numVerticalTiles; ++i) for (int32_t i = 0; i < numVerticalTiles; ++i)
{ {
if (_mapAnimationsInvalidate.contains(tileCoords)) if (!MapIsEdge(tileCoords.ToCoordsXY())
&& _mapAnimationsInvalidate[tileCoords.x + (tileCoords.y * kMaximumMapSizeTechnical)])
{ {
if (!UpdateTile<true, false>(tileCoords, viewport)) if (!UpdateTile<true, false>(tileCoords, viewport))
{ {
_mapAnimationsInvalidate.erase(tileCoords); _mapAnimationsInvalidate[tileCoords.x + (tileCoords.y * kMaximumMapSizeTechnical)] = false;
} }
} }
tileCoords += nextVerticalTile; tileCoords += nextVerticalTile;
@@ -714,7 +719,8 @@ static void UpdateAll(const ViewportList& viewports)
{ {
if (result.value() == UpdateType::invalidate) if (result.value() == UpdateType::invalidate)
{ {
_mapAnimationsInvalidate.insert(*it); const auto& coords = *it;
_mapAnimationsInvalidate[coords.x + (coords.y * kMaximumMapSizeTechnical)] = true;
it = _mapAnimationsUpdate.erase(it); it = _mapAnimationsUpdate.erase(it);
} }
else else
@@ -760,7 +766,7 @@ void MapAnimations::InvalidateAndUpdateAll()
void MapAnimations::ClearAll() void MapAnimations::ClearAll()
{ {
_mapAnimationsInvalidate.clear(); _mapAnimationsInvalidate.assign(_mapAnimationsInvalidate.size(), false);
_mapAnimationsUpdate.clear(); _mapAnimationsUpdate.clear();
_temporaryMapAnimations.clear(); _temporaryMapAnimations.clear();
} }
@@ -770,17 +776,27 @@ void MapAnimations::ShiftAll(const CoordsXY amount)
if (amount.x == 0 && amount.y == 0) if (amount.x == 0 && amount.y == 0)
return; return;
std::set<TileCoordsXY, TileCoordsXYCmp> newMapAnimationsInvalidate; const auto tileAmount = TileCoordsXY(amount);
for (const auto a : _mapAnimationsInvalidate)
std::vector<bool> newMapAnimationsInvalidate(_mapAnimationsInvalidate.size(), false);
for (int32_t y = 0; y < kMaximumMapSizeTechnical; y++)
{ {
newMapAnimationsInvalidate.insert(a + TileCoordsXY(amount)); for (int32_t x = 0; x < kMaximumMapSizeTechnical; x++)
{
const bool animated = _mapAnimationsInvalidate[x + (y * kMaximumMapSizeTechnical)];
const TileCoordsXY newCoords = TileCoordsXY(x, y) + tileAmount;
if (!MapIsEdge(newCoords.ToCoordsXY()))
{
newMapAnimationsInvalidate[newCoords.x + (newCoords.y * kMaximumMapSizeTechnical)] = animated;
}
}
} }
_mapAnimationsInvalidate = std::move(newMapAnimationsInvalidate); _mapAnimationsInvalidate = std::move(newMapAnimationsInvalidate);
std::set<TileCoordsXY, TileCoordsXYCmp> newMapAnimationsUpdate; std::set<TileCoordsXY, TileCoordsXYCmp> newMapAnimationsUpdate;
for (const auto a : _mapAnimationsUpdate) for (const auto a : _mapAnimationsUpdate)
{ {
newMapAnimationsUpdate.insert(a + TileCoordsXY(amount)); newMapAnimationsUpdate.insert(a + tileAmount);
} }
_mapAnimationsUpdate = std::move(newMapAnimationsUpdate); _mapAnimationsUpdate = std::move(newMapAnimationsUpdate);