Files
@ r3016:b28a60dfd364
Branch filter:
Location: cpp/openttd-patchpack/source/map.h - annotation
r3016:b28a60dfd364
5.1 KiB
text/x-c
(svn r3596) -Codechange: [OSX] changed to use Apple's macros instead of OTTD macros for endian conversion
This increases the execution speed a lot since GCC can't detect the OTTD macro as an endian conversion
while Apple's code uses the instruction to convert endian instead of a series of instructions to produce the same result
Since we don't have that many endian conversions in the game, overall performance should not increase noteworthy
This increases the execution speed a lot since GCC can't detect the OTTD macro as an endian conversion
while Apple's code uses the instruction to convert endian instead of a series of instructions to produce the same result
Since we don't have that many endian conversions in the game, overall performance should not increase noteworthy
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 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | r2186:5ee653b1b5e1 r2186:5ee653b1b5e1 r679:3a7b08cc8504 r679:3a7b08cc8504 r679:3a7b08cc8504 r1210:c146ba199eb2 r1210:c146ba199eb2 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r1394:275bd5541bae r926:fcf36609eb94 r2049:7e26d55f0f4c r2049:7e26d55f0f4c r2360:8cc52b4a45df r2049:7e26d55f0f4c r2049:7e26d55f0f4c r2049:7e26d55f0f4c r2049:7e26d55f0f4c r2049:7e26d55f0f4c r2049:7e26d55f0f4c r2049:7e26d55f0f4c r2049:7e26d55f0f4c r1218:b56319aa5250 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r689:c33ae44e7bfc r2051:04d7c352ccc4 r689:c33ae44e7bfc r2051:04d7c352ccc4 r2051:04d7c352ccc4 r689:c33ae44e7bfc r2051:04d7c352ccc4 r2051:04d7c352ccc4 r689:c33ae44e7bfc r2051:04d7c352ccc4 r689:c33ae44e7bfc r1202:95cf4c0fd209 r1202:95cf4c0fd209 r1202:95cf4c0fd209 r1202:95cf4c0fd209 r1174:4ffa62f5467c r1981:addba4bccc89 r1981:addba4bccc89 r1981:addba4bccc89 r1981:addba4bccc89 r2051:04d7c352ccc4 r1981:addba4bccc89 r1981:addba4bccc89 r1981:addba4bccc89 r1981:addba4bccc89 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r2051:04d7c352ccc4 r1981:addba4bccc89 r1330:62eaa061ec97 r1980:3622a0cd06c2 r1980:3622a0cd06c2 r1980:3622a0cd06c2 r1980:3622a0cd06c2 r1980:3622a0cd06c2 r1330:62eaa061ec97 r1330:62eaa061ec97 r1330:62eaa061ec97 r1330:62eaa061ec97 r1330:62eaa061ec97 r1330:62eaa061ec97 r1330:62eaa061ec97 r1247:d01094dbcdcc r1977:1f8b99c96041 r1247:d01094dbcdcc r926:fcf36609eb94 r1942:ea8e39498c72 r1942:ea8e39498c72 r1942:ea8e39498c72 r1942:ea8e39498c72 r1942:ea8e39498c72 r1942:ea8e39498c72 r1942:ea8e39498c72 r926:fcf36609eb94 r926:fcf36609eb94 r926:fcf36609eb94 r926:fcf36609eb94 r926:fcf36609eb94 r926:fcf36609eb94 r926:fcf36609eb94 r926:fcf36609eb94 r926:fcf36609eb94 r926:fcf36609eb94 r926:fcf36609eb94 r909:898755bd4512 r909:898755bd4512 r909:898755bd4512 r909:898755bd4512 r909:898755bd4512 r909:898755bd4512 r909:898755bd4512 r909:898755bd4512 r909:898755bd4512 r900:6c526ed4f41b r955:63797b6ea518 r955:63797b6ea518 r955:63797b6ea518 r955:63797b6ea518 r955:63797b6ea518 r955:63797b6ea518 r955:63797b6ea518 r955:63797b6ea518 r955:63797b6ea518 r1981:addba4bccc89 r955:63797b6ea518 r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1247:d01094dbcdcc r1981:addba4bccc89 r1247:d01094dbcdcc r955:63797b6ea518 r1245:eb9b943bd917 r1677:37d9fb173278 r1245:eb9b943bd917 r1245:eb9b943bd917 r1245:eb9b943bd917 r1245:eb9b943bd917 r1245:eb9b943bd917 r1245:eb9b943bd917 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r2159:2c706fe6b0a7 r900:6c526ed4f41b r900:6c526ed4f41b r909:898755bd4512 r900:6c526ed4f41b r900:6c526ed4f41b r909:898755bd4512 r900:6c526ed4f41b r900:6c526ed4f41b r1677:37d9fb173278 r1677:37d9fb173278 r1677:37d9fb173278 r1679:85964efc57dc r1679:85964efc57dc r1677:37d9fb173278 r1679:85964efc57dc r1677:37d9fb173278 r2436:963efe8b84cc | /* $Id$ */
#ifndef MAP_H
#define MAP_H
#include "stdafx.h"
// Putting externs inside inline functions seems to confuse the aliasing
// checking on MSVC6. Never use those variables directly.
extern uint _map_log_x;
extern uint _map_size_x;
extern uint _map_size_y;
extern uint _map_tile_mask;
extern uint _map_size;
#define TILE_MASK(x) ((x) & _map_tile_mask)
#define TILE_ASSERT(x) assert(TILE_MASK(x) == (x));
typedef struct Tile {
byte type_height;
byte m1;
uint16 m2;
byte m3;
byte m4;
byte m5;
byte extra;
} Tile;
extern Tile* _m;
void AllocateMap(uint size_x, uint size_y);
// binary logarithm of the map size, try to avoid using this one
static inline uint MapLogX(void) { return _map_log_x; }
/* The size of the map */
static inline uint MapSizeX(void) { return _map_size_x; }
static inline uint MapSizeY(void) { return _map_size_y; }
/* The maximum coordinates */
static inline uint MapMaxX(void) { return _map_size_x - 1; }
static inline uint MapMaxY(void) { return _map_size_y - 1; }
/* The number of tiles in the map */
static inline uint MapSize(void) { return _map_size; }
// Scale a number relative to the map size
uint ScaleByMapSize(uint); // Scale relative to the number of tiles
uint ScaleByMapSize1D(uint); // Scale relative to the circumference of the map
typedef uint32 TileIndex;
typedef int32 TileIndexDiff;
static inline TileIndex TileXY(uint x, uint y)
{
return (y * MapSizeX()) + x;
}
static inline TileIndexDiff TileDiffXY(int x, int y)
{
// Multiplication gives much better optimization on MSVC than shifting.
// 0 << shift isn't optimized to 0 properly.
// Typically x and y are constants, and then this doesn't result
// in any actual multiplication in the assembly code..
return (y * MapSizeX()) + x;
}
static inline TileIndex TileVirtXY(uint x, uint y)
{
return (y >> 4 << MapLogX()) + (x >> 4);
}
typedef enum {
OWNER_TOWN = 0xf, // a town owns the tile
OWNER_NONE = 0x10, // nobody owns the tile
OWNER_WATER = 0x11, // "water" owns the tile
OWNER_SPECTATOR = 0xff, // spectator in MP or in scenario editor
} Owner;
enum {
INVALID_TILE = (TileIndex)-1
};
enum {
TILE_SIZE = 16, /* Tiles are 16x16 "units" in size */
TILE_PIXELS = 32, /* a tile is 32x32 pixels */
TILE_HEIGHT = 8, /* The standard height-difference between tiles on two levels is 8 (z-diff 8) */
};
static inline uint TileX(TileIndex tile)
{
return tile & MapMaxX();
}
static inline uint TileY(TileIndex tile)
{
return tile >> MapLogX();
}
typedef struct TileIndexDiffC {
int16 x;
int16 y;
} TileIndexDiffC;
static inline TileIndexDiff ToTileIndexDiff(TileIndexDiffC tidc)
{
return (tidc.y << MapLogX()) + tidc.x;
}
#ifndef _DEBUG
#define TILE_ADD(x,y) ((x) + (y))
#else
extern TileIndex TileAdd(TileIndex tile, TileIndexDiff add,
const char *exp, const char *file, int line);
#define TILE_ADD(x, y) (TileAdd((x), (y), #x " + " #y, __FILE__, __LINE__))
#endif
#define TILE_ADDXY(tile, x, y) TILE_ADD(tile, TileDiffXY(x, y))
uint TileAddWrap(TileIndex tile, int addx, int addy);
static inline TileIndexDiffC TileIndexDiffCByDir(uint dir) {
extern const TileIndexDiffC _tileoffs_by_dir[4];
return _tileoffs_by_dir[dir];
}
/* Returns tile + the diff given in diff. If the result tile would end up
* outside of the map, INVALID_TILE is returned instead.
*/
static inline TileIndex AddTileIndexDiffCWrap(TileIndex tile, TileIndexDiffC diff) {
int x = TileX(tile) + diff.x;
int y = TileY(tile) + diff.y;
if (x < 0 || y < 0 || x > (int)MapMaxX() || y > (int)MapMaxY())
return INVALID_TILE;
else
return TileXY(x, y);
}
// Functions to calculate distances
uint DistanceManhattan(TileIndex, TileIndex); // also known as L1-Norm. Is the shortest distance one could go over diagonal tracks (or roads)
uint DistanceSquare(TileIndex, TileIndex); // euclidian- or L2-Norm squared
uint DistanceMax(TileIndex, TileIndex); // also known as L-Infinity-Norm
uint DistanceMaxPlusManhattan(TileIndex, TileIndex); // Max + Manhattan
uint DistanceFromEdge(TileIndex); // shortest distance from any edge of the map
#define BEGIN_TILE_LOOP(var,w,h,tile) \
{ \
int h_cur = h; \
uint var = tile; \
do { \
int w_cur = w; \
do {
#define END_TILE_LOOP(var,w,h,tile) \
} while (++var, --w_cur != 0); \
} while (var += TileDiffXY(0, 1) - (w), --h_cur != 0); \
}
static inline TileIndexDiff TileOffsByDir(uint dir)
{
extern const TileIndexDiffC _tileoffs_by_dir[4];
assert(dir < lengthof(_tileoffs_by_dir));
return ToTileIndexDiff(_tileoffs_by_dir[dir]);
}
/* Approximation of the length of a straight track, relative to a diagonal
* track (ie the size of a tile side). #defined instead of const so it can
* stay integer. (no runtime float operations) Is this needed?
* Watch out! There are _no_ brackets around here, to prevent intermediate
* rounding! Be careful when using this!
* This value should be sqrt(2)/2 ~ 0.7071 */
#define STRAIGHT_TRACK_LENGTH 7071/10000
#endif /* MAP_H */
|