mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 04:09:48 +00:00
Code Issues Releases Wiki Activity

Merge branch 'constexpr_const' into 'master'

Browse source 
Define ESM::Land static constants as constexpr

See merge request OpenMW/openmw!993
This commit is contained in:
psi29a 2021-07-05 06:14:21 +00:00
commit 09bc088f36
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
components/esm/loadland.hpp
View file

@ -49,28 +49,28 @@ struct Land
}; };
// default height to use in case there is no Land record // default height to use in case there is no Land record
static const int DEFAULT_HEIGHT = -2048; static constexpr int DEFAULT_HEIGHT = -2048;
// number of vertices per side // number of vertices per side
static const int LAND_SIZE = 65; static constexpr int LAND_SIZE = 65;
// cell terrain size in world coords // cell terrain size in world coords
static const int REAL_SIZE = Constants::CellSizeInUnits; static constexpr int REAL_SIZE = Constants::CellSizeInUnits;
// total number of vertices // total number of vertices
static const int LAND_NUM_VERTS = LAND_SIZE * LAND_SIZE; static constexpr int LAND_NUM_VERTS = LAND_SIZE * LAND_SIZE;
static const int HEIGHT_SCALE = 8; static constexpr int HEIGHT_SCALE = 8;
//number of textures per side of land //number of textures per side of land
static const int LAND_TEXTURE_SIZE = 16; static constexpr int LAND_TEXTURE_SIZE = 16;
//total number of textures per land //total number of textures per land
static const int LAND_NUM_TEXTURES = LAND_TEXTURE_SIZE * LAND_TEXTURE_SIZE; static constexpr int LAND_NUM_TEXTURES = LAND_TEXTURE_SIZE * LAND_TEXTURE_SIZE;
static const int LAND_GLOBAL_MAP_LOD_SIZE = 81; static constexpr int LAND_GLOBAL_MAP_LOD_SIZE = 81;
static const int LAND_GLOBAL_MAP_LOD_SIZE_SQRT = 9; static constexpr int LAND_GLOBAL_MAP_LOD_SIZE_SQRT = 9;
#pragma pack(push,1) #pragma pack(push,1)
struct VHGT struct VHGT