mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-13 11:02:47 +01:00
Code Issues Releases Wiki Activity

Don't invalidate temporary map animation if not in view

Browse Source
This commit is contained in:
mix
2025-05-24 06:19:30 +01:00
parent 8a5145678c
commit 17d321103f
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,17 +394,22 @@ static std::optional<UpdateType> UpdateTile(const TileCoordsXY& coords, const Vi
return hasAnimations ? std::optional(updateType) : std::nullopt; return hasAnimations ? std::optional(updateType) : std::nullopt;
} }
template<bool invalidate>
static bool UpdateOnRidePhotoAnimation(TrackElement& track, const CoordsXYZ& coords) static bool UpdateOnRidePhotoAnimation(TrackElement& track, const CoordsXYZ& coords)
{ {
if (track.IsTakingPhoto()) if (track.IsTakingPhoto())
{ {
track.DecrementPhotoTimeout(); track.DecrementPhotoTimeout();
ViewportsInvalidate(coords.x, coords.y, coords.z, track.GetClearanceZ(), kMaxZoom); if constexpr (invalidate)
{
ViewportsInvalidate(coords.x, coords.y, coords.z, track.GetClearanceZ(), kMaxZoom);
}
return true; return true;
} }
return false; return false;
} }
template<bool invalidate>
static bool UpdateLandEdgeDoorsAnimation(TrackElement& track, const CoordsXYZ& coords) static bool UpdateLandEdgeDoorsAnimation(TrackElement& track, const CoordsXYZ& coords)
{ {
if (getGameState().currentTicks & 3) if (getGameState().currentTicks & 3)
@@ -418,12 +423,18 @@ static bool UpdateLandEdgeDoorsAnimation(TrackElement& track, const CoordsXYZ& c
if (doorAState >= kLandEdgeDoorFrameEnd) if (doorAState >= kLandEdgeDoorFrameEnd)
{ {
track.SetDoorAState(kLandEdgeDoorFrameClosed); track.SetDoorAState(kLandEdgeDoorFrameClosed);
ViewportsInvalidate(coords.x, coords.y, coords.z, coords.z + 32, kMaxZoom); if constexpr (invalidate)
{
ViewportsInvalidate(coords.x, coords.y, coords.z, coords.z + 32, kMaxZoom);
}
} }
else if (doorAState != kLandEdgeDoorFrameClosed && doorAState != kLandEdgeDoorFrameOpen) else if (doorAState != kLandEdgeDoorFrameClosed && doorAState != kLandEdgeDoorFrameOpen)
{ {
track.SetDoorAState(doorAState + 1); track.SetDoorAState(doorAState + 1);
ViewportsInvalidate(coords.x, coords.y, coords.z, coords.z + 32, kMaxZoom); if constexpr (invalidate)
{
ViewportsInvalidate(coords.x, coords.y, coords.z, coords.z + 32, kMaxZoom);
}
isAnimating = true; isAnimating = true;
} }
@@ -431,18 +442,25 @@ static bool UpdateLandEdgeDoorsAnimation(TrackElement& track, const CoordsXYZ& c
if (doorBState >= kLandEdgeDoorFrameEnd) if (doorBState >= kLandEdgeDoorFrameEnd)
{ {
track.SetDoorBState(kLandEdgeDoorFrameClosed); track.SetDoorBState(kLandEdgeDoorFrameClosed);
ViewportsInvalidate(coords.x, coords.y, coords.z, coords.z + 32, kMaxZoom); if constexpr (invalidate)
{
ViewportsInvalidate(coords.x, coords.y, coords.z, coords.z + 32, kMaxZoom);
}
} }
else if (doorBState != kLandEdgeDoorFrameClosed && doorBState != kLandEdgeDoorFrameOpen) else if (doorBState != kLandEdgeDoorFrameClosed && doorBState != kLandEdgeDoorFrameOpen)
{ {
track.SetDoorBState(doorBState + 1); track.SetDoorBState(doorBState + 1);
ViewportsInvalidate(coords.x, coords.y, coords.z, coords.z + 32, kMaxZoom); if constexpr (invalidate)
{
ViewportsInvalidate(coords.x, coords.y, coords.z, coords.z + 32, kMaxZoom);
}
isAnimating = true; isAnimating = true;
} }
return isAnimating; return isAnimating;
} }
template<bool invalidate>
static bool UpdateTemporaryAnimation(const TemporaryMapAnimation& animation) static bool UpdateTemporaryAnimation(const TemporaryMapAnimation& animation)
{ {
const TileCoordsXYZ tileCoords{ animation.location }; const TileCoordsXYZ tileCoords{ animation.location };
@@ -462,7 +480,7 @@ static bool UpdateTemporaryAnimation(const TemporaryMapAnimation& animation)
if (tileElement->GetType() == TileElementType::Track && tileElement->BaseHeight == tileCoords.z if (tileElement->GetType() == TileElementType::Track && tileElement->BaseHeight == tileCoords.z
&& tileElement->AsTrack()->GetTrackType() == TrackElemType::OnRidePhoto) && tileElement->AsTrack()->GetTrackType() == TrackElemType::OnRidePhoto)
{ {
isAnimating |= UpdateOnRidePhotoAnimation(*tileElement->AsTrack(), animation.location); isAnimating |= UpdateOnRidePhotoAnimation<invalidate>(*tileElement->AsTrack(), animation.location);
} }
break; break;
} }
@@ -470,7 +488,7 @@ static bool UpdateTemporaryAnimation(const TemporaryMapAnimation& animation)
{ {
if (tileElement->GetType() == TileElementType::Track && tileElement->BaseHeight == tileCoords.z) if (tileElement->GetType() == TileElementType::Track && tileElement->BaseHeight == tileCoords.z)
{ {
isAnimating |= UpdateLandEdgeDoorsAnimation(*tileElement->AsTrack(), animation.location); isAnimating |= UpdateLandEdgeDoorsAnimation<invalidate>(*tileElement->AsTrack(), animation.location);
} }
} }
} }
@@ -700,12 +718,15 @@ static void UpdateAll(const ViewportList& viewports)
} }
} }
static void UpdateAllTemporary() static void UpdateAllTemporary(const ViewportList& viewports)
{ {
auto it = _temporaryMapAnimations.begin(); auto it = _temporaryMapAnimations.begin();
while (it != _temporaryMapAnimations.end()) while (it != _temporaryMapAnimations.end())
{ {
if (UpdateTemporaryAnimation(*it)) const auto& animation = *it;
const bool isVisible = IsTileVisible(viewports, TileCoordsXY(animation.location));
const auto result = isVisible ? UpdateTemporaryAnimation<true>(*it) : UpdateTemporaryAnimation<false>(*it);
if (result)
{ {
++it; ++it;
} }
@@ -723,7 +744,7 @@ void MapAnimations::InvalidateAndUpdateAll()
const auto viewports = GetVisibleViewports(); const auto viewports = GetVisibleViewports();
InvalidateAll(viewports); InvalidateAll(viewports);
UpdateAll(viewports); UpdateAll(viewports);
UpdateAllTemporary(); UpdateAllTemporary(viewports);
} }
void MapAnimations::ClearAll() void MapAnimations::ClearAll()