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

Viewport map: Improve handling of sloped tile rendering

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-06-17 17:27:03 +01:00
parent c4cb700738
commit 24ad8759db
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/viewport.cpp
View File

@@ -2912,17 +2912,22 @@ uint32 ViewportMapGetColour(const Viewport * const vp, uint x, uint y, const uin
/* Very approximative but fast way to get the tile when taking Z into account. */ /* Very approximative but fast way to get the tile when taking Z into account. */
const TileIndex tile_tmp = TileVirtXY(x, y); const TileIndex tile_tmp = TileVirtXY(x, y);
const uint z = TileHeight(tile_tmp) * 4; const uint z = TileHeight(tile_tmp) * 4;
if (x + z >= MapSizeX() << 4) {
/* Wrapping of tile X coordinate causes a graphic glitch below south west border. */
return 0;
}
TileIndex tile = TileVirtXY(x + z, y + z); TileIndex tile = TileVirtXY(x + z, y + z);
if (tile >= MapSize()) return 0; if (tile >= MapSize()) return 0;
if (_settings_game.construction.freeform_edges) { const uint z2 = TileHeight(tile) * 4;
/* tile_tmp and tile must be from the same side, if (unlikely(z2 != z)) {
* otherwise it's an approximation erroneous case const uint approx_z = (z + z2) / 2;
* that leads to a graphic glitch below south west border. if (x + approx_z >= MapSizeX() << 4) {
*/ /* Wrapping of tile X coordinate causes a graphic glitch below south west border. */
if (TileX(tile_tmp) > (MapSizeX() - (MapSizeX() / 8)))
if ((TileX(tile_tmp) < (MapSizeX() / 2)) != (TileX(tile) < (MapSizeX() / 2)))
return 0; return 0;
} }
tile = TileVirtXY(x + approx_z, y + approx_z);
if (tile >= MapSize()) return 0;
}
TileType tile_type = MP_VOID; TileType tile_type = MP_VOID;
tile = ViewportMapGetMostSignificantTileType(vp, tile, &tile_type); tile = ViewportMapGetMostSignificantTileType(vp, tile, &tile_type);
if (tile_type == MP_VOID) return 0; if (tile_type == MP_VOID) return 0;