petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Turn ZoomLevel into enum class.

Browse Source
This commit is contained in:
frosch
2025-05-03 20:21:05 +02:00
committed by frosch
parent c0d4ab69d0
commit 8571af9833
39 changed files with 176 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/viewport.cpp
View File

@@ -1481,7 +1481,7 @@ static void ViewportAddKdtreeSigns(DrawPixelInfo *dpi)
});
/* Small versions of signs are used zoom level 4X and higher. */
bool small = dpi->zoom >= ZOOM_LVL_OUT_4X;
bool small = dpi->zoom >= ZoomLevel::Out4x;
/* Layering order (bottom to top): Town names, signs, stations */
ViewportAddTownStrings(dpi, towns, small);
@@ -1525,17 +1525,17 @@ void ViewportSign::UpdatePosition(int center, int top, std::string_view str, std
*/
void ViewportSign::MarkDirty(ZoomLevel maxzoom) const
{
Rect zoomlevels[ZOOM_LVL_END];
Rect zoomlevels[to_underlying(ZoomLevel::End)];
/* We don't know which size will be drawn, so mark the largest area dirty. */
const uint half_width = std::max(this->width_normal, this->width_small) / 2 + 1;
const uint height = WidgetDimensions::scaled.fullbevel.top + std::max(GetCharacterHeight(FS_NORMAL), GetCharacterHeight(FS_SMALL)) + WidgetDimensions::scaled.fullbevel.bottom + 1;
for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) {
zoomlevels[zoom].left = this->center - ScaleByZoom(half_width, zoom);
zoomlevels[zoom].top = this->top - ScaleByZoom(1, zoom);
zoomlevels[zoom].right = this->center + ScaleByZoom(half_width, zoom);
zoomlevels[zoom].bottom = this->top + ScaleByZoom(height, zoom);
for (ZoomLevel zoom = ZoomLevel::Begin; zoom != ZoomLevel::End; zoom++) {
zoomlevels[to_underlying(zoom)].left = this->center - ScaleByZoom(half_width, zoom);
zoomlevels[to_underlying(zoom)].top = this->top - ScaleByZoom(1, zoom);
zoomlevels[to_underlying(zoom)].right = this->center + ScaleByZoom(half_width, zoom);
zoomlevels[to_underlying(zoom)].bottom = this->top + ScaleByZoom(height, zoom);
}
for (const Window *w : Window::Iterate()) {
@@ -1544,7 +1544,7 @@ void ViewportSign::MarkDirty(ZoomLevel maxzoom) const
Viewport &vp = *w->viewport;
if (vp.zoom <= maxzoom) {
assert(vp.width != 0);
Rect &zl = zoomlevels[vp.zoom];
Rect &zl = zoomlevels[to_underlying(vp.zoom)];
MarkViewportDirty(vp, zl.left, zl.top, zl.right, zl.bottom);
}
}
@@ -1820,7 +1820,7 @@ void ViewportDoDraw(const Viewport &vp, int left, int top, int right, int bottom
DrawPixelInfo dp = _vd.dpi;
ZoomLevel zoom = _vd.dpi.zoom;
dp.zoom = ZOOM_LVL_MIN;
dp.zoom = ZoomLevel::Min;
dp.width = UnScaleByZoom(dp.width, zoom);
dp.height = UnScaleByZoom(dp.height, zoom);
AutoRestoreBackup cur_dpi(_cur_dpi, &dp);
@@ -2026,8 +2026,8 @@ void UpdateViewportPosition(Window *w, uint32_t delta_ms)
static bool MarkViewportDirty(const Viewport &vp, int left, int top, int right, int bottom)
{
/* Rounding wrt. zoom-out level */
right += (1 << vp.zoom) - 1;
bottom += (1 << vp.zoom) - 1;
right += (1 << to_underlying(vp.zoom)) - 1;
bottom += (1 << to_underlying(vp.zoom)) - 1;
right -= vp.virtual_left;
if (right <= 0) return false;
@@ -2055,10 +2055,10 @@ static bool MarkViewportDirty(const Viewport &vp, int left, int top, int right,
/**
* Mark all viewports that display an area as dirty (in need of repaint).
* @param left Left edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_MIN)
* @param top Top edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_MIN)
* @param right Right edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_MIN)
* @param bottom Bottom edge of area to repaint. (viewport coordinates, that is wrt. #ZOOM_LVL_MIN)
* @param left Left edge of area to repaint. (viewport coordinates, that is wrt. #ZoomLevel::Min)
* @param top Top edge of area to repaint. (viewport coordinates, that is wrt. #ZoomLevel::Min)
* @param right Right edge of area to repaint. (viewport coordinates, that is wrt. #ZoomLevel::Min)
* @param bottom Bottom edge of area to repaint. (viewport coordinates, that is wrt. #ZoomLevel::Min)
* @return true if at least one viewport has a dirty block
* @ingroup dirty
*/
@@ -2240,7 +2240,7 @@ void SetSelectionRed(bool b)
*/
static bool CheckClickOnViewportSign(const Viewport &vp, int x, int y, const ViewportSign *sign)
{
bool small = (vp.zoom >= ZOOM_LVL_OUT_4X);
bool small = (vp.zoom >= ZoomLevel::Out4x);
int sign_half_width = ScaleByZoom((small ? sign->width_small : sign->width_normal) / 2, vp.zoom);
int sign_height = ScaleByZoom(WidgetDimensions::scaled.fullbevel.top + GetCharacterHeight(small ? FS_SMALL : FS_NORMAL) + WidgetDimensions::scaled.fullbevel.bottom, vp.zoom);