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

Prevent scrolling text map animations invalidating when not drawn

Browse Source
This commit is contained in:
mix
2025-05-26 00:24:45 +01:00
parent d6d44f05b9
commit aed3a9cb3b
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@
using namespace OpenRCT2;
constexpr ZoomLevel kMaxZoom{ 2 };
constexpr ZoomLevel kMaxScrollingTextZoom{ 0 };
struct TemporaryMapAnimation
{
@@ -76,15 +77,17 @@ static std::set<TileCoordsXY, TileCoordsXYCmp> _mapAnimationsUpdate;
static std::set<TemporaryMapAnimation> _temporaryMapAnimations;
template<bool invalidateAllViewports>
static void Invalidate(const Viewport* const viewport, const int32_t x, const int32_t y, const int32_t z0, const int32_t z1)
static void Invalidate(
const Viewport* const viewport, const int32_t x, const int32_t y, const int32_t z0, const int32_t z1,
const ZoomLevel maxZoom)
{
if constexpr (invalidateAllViewports)
{
ViewportsInvalidate(x, y, z0, z1, kMaxZoom);
ViewportsInvalidate(x, y, z0, z1, maxZoom);
}
else
{
viewport->Invalidate(x, y, z0, z1, kMaxZoom);
viewport->Invalidate(x, y, z0, z1, maxZoom);
}
}
@@ -103,7 +106,8 @@ static bool UpdateEntranceAnimation(
if constexpr (invalidate)
{
Invalidate<invalidateAllViewports>(
viewport, loc.x, loc.y, baseZ + stationObj->Height + 8, baseZ + stationObj->Height + 24);
viewport, loc.x, loc.y, baseZ + stationObj->Height + 8, baseZ + stationObj->Height + 24,
kMaxScrollingTextZoom);
}
return true;
}
@@ -116,7 +120,7 @@ static bool UpdateEntranceAnimation(
const int32_t direction = (entrance.GetDirection() + GetCurrentRotation()) & 3;
if (direction == TILE_ELEMENT_DIRECTION_SOUTH || direction == TILE_ELEMENT_DIRECTION_WEST)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ + 32, baseZ + 64);
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ + 32, baseZ + 64, kMaxScrollingTextZoom);
}
}
return true;
@@ -136,7 +140,7 @@ static bool UpdatePathAnimation(
const int32_t direction = (path.GetQueueBannerDirection() + GetCurrentRotation()) & 3;
if (direction == TILE_ELEMENT_DIRECTION_NORTH || direction == TILE_ELEMENT_DIRECTION_EAST)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ + 16, baseZ + 30);
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ + 16, baseZ + 30, kMaxScrollingTextZoom);
}
}
return true;
@@ -184,13 +188,13 @@ static std::optional<UpdateType> UpdateSmallSceneryAnimation(
}
if constexpr (invalidate)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, scenery.GetClearanceZ());
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, scenery.GetClearanceZ(), kMaxZoom);
}
}
}
else if constexpr (invalidate)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, scenery.GetClearanceZ());
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, scenery.GetClearanceZ(), kMaxZoom);
}
return std::optional(animationType);
}
@@ -206,20 +210,20 @@ static bool UpdateTrackAnimation(TrackElement& track, const CoordsXYZ& loc, cons
case TrackElemType::Waterfall:
if constexpr (invalidate)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ + 14, baseZ + 46);
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ + 14, baseZ + 46, kMaxZoom);
}
return true;
case TrackElemType::Rapids:
case TrackElemType::Whirlpool:
if constexpr (invalidate)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ + 14, baseZ + 18);
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ + 14, baseZ + 18, kMaxZoom);
}
return true;
case TrackElemType::SpinningTunnel:
if constexpr (invalidate)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ + 14, baseZ + 32);
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ + 14, baseZ + 32, kMaxZoom);
}
return true;
default:
@@ -238,7 +242,7 @@ static bool UpdateLargeSceneryAnimation(
{
if constexpr (invalidate)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, baseZ + 16);
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, baseZ + 16, kMaxZoom);
}
return true;
}
@@ -291,7 +295,7 @@ static std::optional<UpdateType> UpdateWallAnimation(
wall.SetAnimationFrame(newFrame);
if constexpr (invalidate)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, baseZ + 32);
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, baseZ + 32, kMaxZoom);
}
}
}
@@ -302,7 +306,7 @@ static std::optional<UpdateType> UpdateWallAnimation(
{
if constexpr (invalidate)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, baseZ + 16);
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, baseZ + 16, kMaxZoom);
}
return std::optional(UpdateType::invalidate);
}
@@ -316,7 +320,7 @@ static bool UpdateBannerAnimation(
{
if constexpr (invalidate)
{
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, baseZ + 16);
Invalidate<invalidateAllViewports>(viewport, loc.x, loc.y, baseZ, baseZ + 16, kMaxScrollingTextZoom);
}
return true;
}