diff options
| -rw-r--r-- | src/texteff.cpp | 4 | ||||
| -rw-r--r-- | src/viewport.cpp | 33 | ||||
| -rw-r--r-- | src/viewport_type.h | 2 |
3 files changed, 26 insertions, 13 deletions
diff --git a/src/texteff.cpp b/src/texteff.cpp index 3ce40ce2f..981453c10 100644 --- a/src/texteff.cpp +++ b/src/texteff.cpp @@ -89,9 +89,9 @@ void MoveAllTextEffects() continue; } - te->MarkDirty(); + te->MarkDirty(ZOOM_LVL_OUT_8X); te->top -= ZOOM_LVL_BASE; - te->MarkDirty(); + te->MarkDirty(ZOOM_LVL_OUT_8X); } } diff --git a/src/viewport.cpp b/src/viewport.cpp index 3cce19c3b..527de40a5 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -144,6 +144,8 @@ struct ViewportDrawer { Point foundation_offset[FOUNDATION_PART_END]; ///< Pixel offset for ground sprites on the foundations. }; +static void MarkViewportDirty(const ViewPort *vp, int left, int top, int right, int bottom); + static ViewportDrawer _vd; TileHighlightData _thd; @@ -1245,20 +1247,31 @@ void ViewportSign::UpdatePosition(int center, int top, StringID str) /** * Mark the sign dirty in all viewports. + * @param maxzoom Maximum %ZoomLevel at which the text is visible. * * @ingroup dirty */ -void ViewportSign::MarkDirty() const +void ViewportSign::MarkDirty(ZoomLevel maxzoom) const { - /* We use ZOOM_LVL_MAX here, as every viewport can have another zoom, - * and there is no way for us to know which is the biggest. So make the - * biggest area dirty, and we are safe for sure. - * We also add 1 to make sure the whole thing is redrawn. */ - MarkAllViewportsDirty( - this->center - ScaleByZoom(this->width_normal / 2 + 1, ZOOM_LVL_MAX), - this->top - ScaleByZoom(1, ZOOM_LVL_MAX), - this->center + ScaleByZoom(this->width_normal / 2 + 1, ZOOM_LVL_MAX), - this->top + ScaleByZoom(VPSM_TOP + FONT_HEIGHT_NORMAL + VPSM_BOTTOM + 1, ZOOM_LVL_MAX)); + Rect zoomlevels[ZOOM_LVL_COUNT]; + + for (ZoomLevel zoom = ZOOM_LVL_BEGIN; zoom != ZOOM_LVL_END; zoom++) { + /* FIXME: This doesn't switch to width_small when appropriate. */ + zoomlevels[zoom].left = this->center - ScaleByZoom(this->width_normal / 2 + 1, zoom); + zoomlevels[zoom].top = this->top - ScaleByZoom(1, zoom); + zoomlevels[zoom].right = this->center + ScaleByZoom(this->width_normal / 2 + 1, zoom); + zoomlevels[zoom].bottom = this->top + ScaleByZoom(VPSM_TOP + FONT_HEIGHT_NORMAL + VPSM_BOTTOM + 1, zoom); + } + + Window *w; + FOR_ALL_WINDOWS_FROM_BACK(w) { + ViewPort *vp = w->viewport; + if (vp != NULL && vp->zoom <= maxzoom) { + assert(vp->width != 0); + Rect &zl = zoomlevels[vp->zoom]; + MarkViewportDirty(vp, zl.left, zl.top, zl.right, zl.bottom); + } + } } static void ViewportDrawTileSprites(const TileSpriteToDrawVector *tstdv) diff --git a/src/viewport_type.h b/src/viewport_type.h index cd8ebaea6..2c29c83b3 100644 --- a/src/viewport_type.h +++ b/src/viewport_type.h @@ -48,7 +48,7 @@ struct ViewportSign { uint16 width_small; ///< The width when zoomed out (small font) void UpdatePosition(int center, int top, StringID str); - void MarkDirty() const; + void MarkDirty(ZoomLevel maxzoom = ZOOM_LVL_MAX) const; }; /** |