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

Only update vehicle image when in the vicinity of a viewport

Browse Source 
This reduces the performance impact of expensive NewGRF
graphics chains.
This commit is contained in:
Jonathan G Rennison
2021-05-20 18:03:11 +01:00
parent 3e8ee4f49f
commit aa0c1ba2e0
5 changed files with 228 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/vehicle.cpp
View File

@@ -890,6 +890,49 @@ static void UpdateVehicleViewportHash(Vehicle *v, int x, int y)
}
}
struct ViewportHashDeferredItem {
Vehicle *v;
int new_hash;
int old_hash;
};
static std::vector<ViewportHashDeferredItem> _viewport_hash_deferred;
static void UpdateVehicleViewportHashDeferred(Vehicle *v, int x, int y)
{
int old_x = v->coord.left;
int old_y = v->coord.top;
int new_hash = (x == INVALID_COORD) ? INVALID_COORD : GEN_HASH(x, y);
int old_hash = (old_x == INVALID_COORD) ? INVALID_COORD : GEN_HASH(old_x, old_y);
if (new_hash != old_hash) {
_viewport_hash_deferred.push_back({ v, new_hash, old_hash });
}
}
static void ProcessDeferredUpdateVehicleViewportHashes()
{
for (const ViewportHashDeferredItem &item : _viewport_hash_deferred) {
Vehicle *v = item.v;
/* remove from hash table? */
if (item.old_hash != INVALID_COORD) {
if (v->hash_viewport_next != nullptr) v->hash_viewport_next->hash_viewport_prev = v->hash_viewport_prev;
*v->hash_viewport_prev = v->hash_viewport_next;
}
/* insert into hash table? */
if (item.new_hash != INVALID_COORD) {
Vehicle **new_hash = &_vehicle_viewport_hash[item.new_hash];
v->hash_viewport_next = *new_hash;
if (v->hash_viewport_next != nullptr) v->hash_viewport_next->hash_viewport_prev = &v->hash_viewport_next;
v->hash_viewport_prev = new_hash;
*new_hash = v;
}
}
_viewport_hash_deferred.clear();
}
void ResetVehicleHash()
{
for (Vehicle *v : Vehicle::Iterate()) { v->hash_tile_current = nullptr; }
@@ -1686,9 +1729,11 @@ struct ViewportHashBound {
int xl, xu, yl, yu;
};
static ViewportHashBound GetViewportHashBound(int l, int r, int t, int b) {
int xl = (l - (70 * ZOOM_LVL_BASE)) >> (7 + ZOOM_LVL_SHIFT);
int xu = (r ) >> (7 + ZOOM_LVL_SHIFT);
static const int VHB_BASE_MARGIN = 70;
static ViewportHashBound GetViewportHashBound(int l, int r, int t, int b, int x_margin, int y_margin) {
int xl = (l - ((VHB_BASE_MARGIN + x_margin) * ZOOM_LVL_BASE)) >> (7 + ZOOM_LVL_SHIFT);
int xu = (r + (x_margin * ZOOM_LVL_BASE)) >> (7 + ZOOM_LVL_SHIFT);
/* compare after shifting instead of before, so that lower bits don't affect comparison result */
if (xu - xl < (1 << 6)) {
xl &= 0x3F;
@@ -1699,8 +1744,8 @@ static ViewportHashBound GetViewportHashBound(int l, int r, int t, int b) {
xu = 0x3F;
}
int yl = (t - (70 * ZOOM_LVL_BASE)) >> (6 + ZOOM_LVL_SHIFT);
int yu = (b ) >> (6 + ZOOM_LVL_SHIFT);
int yl = (t - ((VHB_BASE_MARGIN + y_margin) * ZOOM_LVL_BASE)) >> (6 + ZOOM_LVL_SHIFT);
int yu = (b + (y_margin * ZOOM_LVL_BASE)) >> (6 + ZOOM_LVL_SHIFT);
/* compare after shifting instead of before, so that lower bits don't affect comparison result */
if (yu - yl < (1 << 6)) {
yl = (yl & 0x3F) << 6;
@@ -1713,11 +1758,8 @@ static ViewportHashBound GetViewportHashBound(int l, int r, int t, int b) {
return { xl, xu, yl, yu };
};
/**
* Add the vehicle sprites that should be drawn at a part of the screen.
* @param dpi Rectangle being drawn.
*/
void ViewportAddVehicles(DrawPixelInfo *dpi)
template <bool update_vehicles>
void ViewportAddVehiclesIntl(DrawPixelInfo *dpi)
{
/* The bounding rectangle */
const int l = dpi->left;
@@ -1726,19 +1768,45 @@ void ViewportAddVehicles(DrawPixelInfo *dpi)
const int b = dpi->top + dpi->height;
/* The hash area to scan */
const ViewportHashBound vhb = GetViewportHashBound(l, r, t, b);
const ViewportHashBound vhb = GetViewportHashBound(l, r, t, b,
update_vehicles ? MAX_VEHICLE_PIXEL_X - VHB_BASE_MARGIN : 0, update_vehicles ? MAX_VEHICLE_PIXEL_Y - VHB_BASE_MARGIN : 0);
const int ul = l - (MAX_VEHICLE_PIXEL_X * ZOOM_LVL_BASE);
const int ur = r + (MAX_VEHICLE_PIXEL_X * ZOOM_LVL_BASE);
const int ut = t - (MAX_VEHICLE_PIXEL_Y * ZOOM_LVL_BASE);
const int ub = b + (MAX_VEHICLE_PIXEL_Y * ZOOM_LVL_BASE);
for (int y = vhb.yl;; y = (y + (1 << 6)) & (0x3F << 6)) {
for (int x = vhb.xl;; x = (x + 1) & 0x3F) {
const Vehicle *v = _vehicle_viewport_hash[x + y]; // already masked & 0xFFF
while (v != nullptr) {
if (v->IsDrawn() &&
l <= v->coord.right &&
t <= v->coord.bottom &&
r >= v->coord.left &&
b >= v->coord.top) {
DoDrawVehicle(v);
if (v->IsDrawn()) {
if (update_vehicles &&
HasBit(v->vcache.cached_veh_flags, VCF_IMAGE_REFRESH) &&
ul <= v->coord.right &&
ut <= v->coord.bottom &&
ur >= v->coord.left &&
ub >= v->coord.top) {
Vehicle *v_mutable = const_cast<Vehicle *>(v);
Direction current_direction = v_mutable->GetMapImageDirection();
switch (v->type) {
case VEH_TRAIN: Train::From(v_mutable)->UpdateImageState(current_direction, v_mutable->sprite_seq); break;
case VEH_ROAD: RoadVehicle::From(v_mutable)->UpdateImageState(current_direction, v_mutable->sprite_seq); break;
case VEH_SHIP: Ship::From(v_mutable)->UpdateImageState(current_direction, v_mutable->sprite_seq); break;
case VEH_AIRCRAFT: Aircraft::From(v_mutable)->UpdateImageState(current_direction, v_mutable->sprite_seq); break;
default: break;
}
v_mutable->UpdateSpriteSeqBound();
v_mutable->UpdateViewportDeferred();
}
if (l <= v->coord.right &&
t <= v->coord.bottom &&
r >= v->coord.left &&
b >= v->coord.top) {
DoDrawVehicle(v);
}
}
v = v->hash_viewport_next;
}
@@ -1748,6 +1816,22 @@ void ViewportAddVehicles(DrawPixelInfo *dpi)
if (y == vhb.yu) break;
}
if (update_vehicles) ProcessDeferredUpdateVehicleViewportHashes();
}
/**
* Add the vehicle sprites that should be drawn at a part of the screen.
* @param dpi Rectangle being drawn.
* @param update_vehicles Whether to update vehicles around drawing rectangle.
*/
void ViewportAddVehicles(DrawPixelInfo *dpi, bool update_vehicles)
{
if (update_vehicles) {
ViewportAddVehiclesIntl<true>(dpi);
} else {
ViewportAddVehiclesIntl<false>(dpi);
}
}
void ViewportMapDrawVehicles(DrawPixelInfo *dpi, Viewport *vp)
@@ -1759,7 +1843,7 @@ void ViewportMapDrawVehicles(DrawPixelInfo *dpi, Viewport *vp)
const int b = vp->virtual_top + vp->virtual_height;
/* The hash area to scan */
const ViewportHashBound vhb = GetViewportHashBound(l, r, t, b);
const ViewportHashBound vhb = GetViewportHashBound(l, r, t, b, 0, 0);
Blitter *blitter = BlitterFactory::GetCurrentBlitter();
for (int y = vhb.yl;; y = (y + (1 << 6)) & (0x3F << 6)) {
@@ -2489,6 +2573,21 @@ void Vehicle::UpdateViewport(bool dirty)
}
}
void Vehicle::UpdateViewportDeferred()
{
Rect new_coord = ConvertRect<Rect16, Rect>(this->sprite_seq_bounds);
Point pt = RemapCoords(this->x_pos + this->x_offs, this->y_pos + this->y_offs, this->z_pos);
new_coord.left += pt.x;
new_coord.top += pt.y;
new_coord.right += pt.x + 2 * ZOOM_LVL_BASE;
new_coord.bottom += pt.y + 2 * ZOOM_LVL_BASE;
UpdateVehicleViewportHashDeferred(this, new_coord.left, new_coord.top);
this->coord = new_coord;
}
/**
* Update the position of the vehicle, and update the viewport.
*/