Files
@ r26913:e7b3d514fe34
Branch filter:
Location: cpp/openttd-patchpack/source/src/tile_map.cpp - annotation
r26913:e7b3d514fe34
5.0 KiB
text/x-c
Revert 92c7551: Line drawing algorithm fix broke other cases (#10497)
This reverts commit 92c755161d6a467d33477bd0041fc720d7d9ba41.
This reverts commit 92c755161d6a467d33477bd0041fc720d7d9ba41.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r8108:1d5bdeea7e20 r8108:1d5bdeea7e20 r8108:1d5bdeea7e20 r8108:1d5bdeea7e20 r21383:942c32fb8b0e r21383:942c32fb8b0e r10260:88d82a40120c r21725:48a0e77ec34b r23023:7b8669afd1db r23023:7b8669afd1db r23023:7b8669afd1db r23023:7b8669afd1db r23023:7b8669afd1db r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r24597:afde5721a3b6 r24597:afde5721a3b6 r24597:afde5721a3b6 r21725:48a0e77ec34b r23607:36c15679007d r21725:48a0e77ec34b r24597:afde5721a3b6 r24597:afde5721a3b6 r24597:afde5721a3b6 r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r10260:88d82a40120c r23607:36c15679007d r15613:193c12018337 r15613:193c12018337 r18260:9616113792ef r8108:1d5bdeea7e20 r23201:f37d3515c110 r23201:f37d3515c110 r26787:a51c38e4aac5 r26787:a51c38e4aac5 r8108:1d5bdeea7e20 r23201:f37d3515c110 r23201:f37d3515c110 r23201:f37d3515c110 r23201:f37d3515c110 r8108:1d5bdeea7e20 r21725:48a0e77ec34b r21725:48a0e77ec34b r10268:59b64ee0ce54 r21725:48a0e77ec34b r23201:f37d3515c110 r21725:48a0e77ec34b r23838:bfeaabaa7b1d r23838:bfeaabaa7b1d r23607:36c15679007d r23201:f37d3515c110 r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r21725:48a0e77ec34b r10268:59b64ee0ce54 r21725:48a0e77ec34b r23607:36c15679007d r21725:48a0e77ec34b r8108:1d5bdeea7e20 r8108:1d5bdeea7e20 r10260:88d82a40120c r20805:06eb3eae002c r20805:06eb3eae002c r23607:36c15679007d r20805:06eb3eae002c r20805:06eb3eae002c r20805:06eb3eae002c r20805:06eb3eae002c r23201:f37d3515c110 r23201:f37d3515c110 r26787:a51c38e4aac5 r26787:a51c38e4aac5 r20805:06eb3eae002c r20805:06eb3eae002c r23201:f37d3515c110 r23201:f37d3515c110 r23201:f37d3515c110 r20805:06eb3eae002c r23607:36c15679007d r20805:06eb3eae002c r20805:06eb3eae002c r20805:06eb3eae002c r20805:06eb3eae002c r10260:88d82a40120c r10260:88d82a40120c r15613:193c12018337 r15613:193c12018337 r18260:9616113792ef r8108:1d5bdeea7e20 r23201:f37d3515c110 r23201:f37d3515c110 r26787:a51c38e4aac5 r26787:a51c38e4aac5 r8108:1d5bdeea7e20 r24597:afde5721a3b6 r24597:afde5721a3b6 r24597:afde5721a3b6 r24597:afde5721a3b6 r24597:afde5721a3b6 r24597:afde5721a3b6 r8108:1d5bdeea7e20 r8108:1d5bdeea7e20 r10260:88d82a40120c r21725:48a0e77ec34b r13060:e57594b0ca84 r15613:193c12018337 r15613:193c12018337 r18260:9616113792ef r8108:1d5bdeea7e20 r23201:f37d3515c110 r23201:f37d3515c110 r26787:a51c38e4aac5 r26787:a51c38e4aac5 r8108:1d5bdeea7e20 r24597:afde5721a3b6 r24597:afde5721a3b6 r24597:afde5721a3b6 r24597:afde5721a3b6 r24597:afde5721a3b6 r24597:afde5721a3b6 r8108:1d5bdeea7e20 | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file tile_map.cpp Global tile accessors. */
#include "stdafx.h"
#include "tile_map.h"
#include "safeguards.h"
/**
* Get a tile's slope given the heigh of its four corners.
* @param hnorth The height at the northern corner in the same unit as TileHeight.
* @param hwest The height at the western corner in the same unit as TileHeight.
* @param heast The height at the eastern corner in the same unit as TileHeight.
* @param hsouth The height at the southern corner in the same unit as TileHeight.
* @param[out] h The lowest height of the four corners.
* @return The slope.
*/
static Slope GetTileSlopeGivenHeight(int hnorth, int hwest, int heast, int hsouth, int *h)
{
/* Due to the fact that tiles must connect with each other without leaving gaps, the
* biggest difference in height between any corner and 'min' is between 0, 1, or 2.
*
* Also, there is at most 1 corner with height difference of 2.
*/
int hminnw = std::min(hnorth, hwest);
int hmines = std::min(heast, hsouth);
int hmin = std::min(hminnw, hmines);
if (h != nullptr) *h = hmin;
int hmaxnw = std::max(hnorth, hwest);
int hmaxes = std::max(heast, hsouth);
int hmax = std::max(hmaxnw, hmaxes);
Slope r = SLOPE_FLAT;
if (hnorth != hmin) r |= SLOPE_N;
if (hwest != hmin) r |= SLOPE_W;
if (heast != hmin) r |= SLOPE_E;
if (hsouth != hmin) r |= SLOPE_S;
if (hmax - hmin == 2) r |= SLOPE_STEEP;
return r;
}
/**
* Return the slope of a given tile inside the map.
* @param tile Tile to compute slope of
* @param h If not \c nullptr, pointer to storage of z height
* @return Slope of the tile, except for the HALFTILE part
*/
Slope GetTileSlope(TileIndex tile, int *h)
{
uint x1 = TileX(tile);
uint y1 = TileY(tile);
uint x2 = std::min(x1 + 1, Map::MaxX());
uint y2 = std::min(y1 + 1, Map::MaxY());
int hnorth = TileHeight(tile); // Height of the North corner.
int hwest = TileHeight(TileXY(x2, y1)); // Height of the West corner.
int heast = TileHeight(TileXY(x1, y2)); // Height of the East corner.
int hsouth = TileHeight(TileXY(x2, y2)); // Height of the South corner.
return GetTileSlopeGivenHeight(hnorth, hwest, heast, hsouth, h);
}
/**
* Return the slope of a given tile, also for tiles outside the map (virtual "black" tiles).
*
* @param x X coordinate of the tile to compute slope of, may be outside the map.
* @param y Y coordinate of the tile to compute slope of, may be outside the map.
* @param h If not \c nullptr, pointer to storage of z height.
* @return Slope of the tile, except for the HALFTILE part.
*/
Slope GetTilePixelSlopeOutsideMap(int x, int y, int *h)
{
int hnorth = TileHeightOutsideMap(x, y); // N corner.
int hwest = TileHeightOutsideMap(x + 1, y); // W corner.
int heast = TileHeightOutsideMap(x, y + 1); // E corner.
int hsouth = TileHeightOutsideMap(x + 1, y + 1); // S corner.
Slope s = GetTileSlopeGivenHeight(hnorth, hwest, heast, hsouth, h);
if (h != nullptr) *h *= TILE_HEIGHT;
return s;
}
/**
* Check if a given tile is flat
* @param tile Tile to check
* @param h If not \c nullptr, pointer to storage of z height (only if tile is flat)
* @return Whether the tile is flat
*/
bool IsTileFlat(TileIndex tile, int *h)
{
uint x1 = TileX(tile);
uint y1 = TileY(tile);
uint x2 = std::min(x1 + 1, Map::MaxX());
uint y2 = std::min(y1 + 1, Map::MaxY());
uint z = TileHeight(tile);
if (TileHeight(TileXY(x2, y1)) != z) return false;
if (TileHeight(TileXY(x1, y2)) != z) return false;
if (TileHeight(TileXY(x2, y2)) != z) return false;
if (h != nullptr) *h = z;
return true;
}
/**
* Get bottom height of the tile
* @param tile Tile to compute height of
* @return Minimum height of the tile
*/
int GetTileZ(TileIndex tile)
{
uint x1 = TileX(tile);
uint y1 = TileY(tile);
uint x2 = std::min(x1 + 1, Map::MaxX());
uint y2 = std::min(y1 + 1, Map::MaxY());
return std::min({
TileHeight(tile), // N corner
TileHeight(TileXY(x2, y1)), // W corner
TileHeight(TileXY(x1, y2)), // E corner
TileHeight(TileXY(x2, y2)), // S corner
});
}
/**
* Get top height of the tile inside the map.
* @param t Tile to compute height of
* @return Maximum height of the tile
*/
int GetTileMaxZ(TileIndex t)
{
uint x1 = TileX(t);
uint y1 = TileY(t);
uint x2 = std::min(x1 + 1, Map::MaxX());
uint y2 = std::min(y1 + 1, Map::MaxY());
return std::max({
TileHeight(t), // N corner
TileHeight(TileXY(x2, y1)), // W corner
TileHeight(TileXY(x1, y2)), // E corner
TileHeight(TileXY(x2, y2)), // S corner
});
}
|