dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Speed up filtering of which viewport labels should be displayed.

Browse Source 
Add an inline, fast, inaccurate check to catch most off-screen labels,
before the relatively slow and expensive checks.
This commit is contained in:
Jonathan G Rennison
2016-01-01 21:53:58 +00:00
parent 5aad0b51a3
commit 726b5cb4f6
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/viewport.cpp
View File

@@ -1304,12 +1304,31 @@ void ViewportAddString(const DrawPixelInfo *dpi, ZoomLevel small_from, const Vie
} }
} }
struct ViewportAddStringApproxBoundsChecker {
int top;
int bottom;
ViewportAddStringApproxBoundsChecker(const DrawPixelInfo *dpi)
{
this->top = dpi->top - ScaleByZoom(VPSM_TOP + FONT_HEIGHT_NORMAL + VPSM_BOTTOM, dpi->zoom);
this->bottom = dpi->top + dpi->height;
}
bool IsSignMaybeOnScreen(const ViewportSign *sign) const
{
return !(this->bottom < sign->top || this->top > sign->top);
}
};
static void ViewportAddTownNames(DrawPixelInfo *dpi) static void ViewportAddTownNames(DrawPixelInfo *dpi)
{ {
if (!HasBit(_display_opt, DO_SHOW_TOWN_NAMES) || _game_mode == GM_MENU) return; if (!HasBit(_display_opt, DO_SHOW_TOWN_NAMES) || _game_mode == GM_MENU) return;
ViewportAddStringApproxBoundsChecker checker(dpi);
const Town *t; const Town *t;
FOR_ALL_TOWNS(t) { FOR_ALL_TOWNS(t) {
if (!checker.IsSignMaybeOnScreen(&t->cache.sign)) continue;
ViewportAddString(dpi, ZOOM_LVL_OUT_16X, &t->cache.sign, ViewportAddString(dpi, ZOOM_LVL_OUT_16X, &t->cache.sign,
t->Label(), t->SmallLabel(), STR_VIEWPORT_TOWN_TINY_BLACK, t->Label(), t->SmallLabel(), STR_VIEWPORT_TOWN_TINY_BLACK,
t->index, t->cache.population); t->index, t->cache.population);
@@ -1321,6 +1340,8 @@ static void ViewportAddStationNames(DrawPixelInfo *dpi)
{ {
if (!(HasBit(_display_opt, DO_SHOW_STATION_NAMES) || HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES)) || _game_mode == GM_MENU) return; if (!(HasBit(_display_opt, DO_SHOW_STATION_NAMES) || HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES)) || _game_mode == GM_MENU) return;
ViewportAddStringApproxBoundsChecker checker(dpi);
const BaseStation *st; const BaseStation *st;
FOR_ALL_BASE_STATIONS(st) { FOR_ALL_BASE_STATIONS(st) {
/* Check whether the base station is a station or a waypoint */ /* Check whether the base station is a station or a waypoint */
@@ -1332,6 +1353,8 @@ static void ViewportAddStationNames(DrawPixelInfo *dpi)
/* Don't draw if station is owned by another company and competitor station names are hidden. Stations owned by none are never ignored. */ /* Don't draw if station is owned by another company and competitor station names are hidden. Stations owned by none are never ignored. */
if (!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS) && _local_company != st->owner && st->owner != OWNER_NONE) continue; if (!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS) && _local_company != st->owner && st->owner != OWNER_NONE) continue;
if (!checker.IsSignMaybeOnScreen(&st->sign)) continue;
ViewportAddString(dpi, ZOOM_LVL_OUT_16X, &st->sign, ViewportAddString(dpi, ZOOM_LVL_OUT_16X, &st->sign,
is_station ? STR_VIEWPORT_STATION : STR_VIEWPORT_WAYPOINT, is_station ? STR_VIEWPORT_STATION : STR_VIEWPORT_WAYPOINT,
(is_station ? STR_VIEWPORT_STATION : STR_VIEWPORT_WAYPOINT) + 1, STR_NULL, (is_station ? STR_VIEWPORT_STATION : STR_VIEWPORT_WAYPOINT) + 1, STR_NULL,
@@ -1345,6 +1368,8 @@ static void ViewportAddSigns(DrawPixelInfo *dpi)
/* Signs are turned off or are invisible */ /* Signs are turned off or are invisible */
if (!HasBit(_display_opt, DO_SHOW_SIGNS) || IsInvisibilitySet(TO_SIGNS)) return; if (!HasBit(_display_opt, DO_SHOW_SIGNS) || IsInvisibilitySet(TO_SIGNS)) return;
ViewportAddStringApproxBoundsChecker checker(dpi);
const Sign *si; const Sign *si;
FOR_ALL_SIGNS(si) { FOR_ALL_SIGNS(si) {
/* Don't draw if sign is owned by another company and competitor signs should be hidden. /* Don't draw if sign is owned by another company and competitor signs should be hidden.
@@ -1352,6 +1377,8 @@ static void ViewportAddSigns(DrawPixelInfo *dpi)
* companies can leave OWNER_NONE signs after them. */ * companies can leave OWNER_NONE signs after them. */
if (!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS) && _local_company != si->owner && si->owner != OWNER_DEITY) continue; if (!HasBit(_display_opt, DO_SHOW_COMPETITOR_SIGNS) && _local_company != si->owner && si->owner != OWNER_DEITY) continue;
if (!checker.IsSignMaybeOnScreen(&si->sign)) continue;
ViewportAddString(dpi, ZOOM_LVL_OUT_16X, &si->sign, ViewportAddString(dpi, ZOOM_LVL_OUT_16X, &si->sign,
STR_WHITE_SIGN, STR_WHITE_SIGN,
(IsTransparencySet(TO_SIGNS) || si->owner == OWNER_DEITY) ? STR_VIEWPORT_SIGN_SMALL_WHITE : STR_VIEWPORT_SIGN_SMALL_BLACK, STR_NULL, (IsTransparencySet(TO_SIGNS) || si->owner == OWNER_DEITY) ? STR_VIEWPORT_SIGN_SMALL_WHITE : STR_VIEWPORT_SIGN_SMALL_BLACK, STR_NULL,