diff options
author | Julian Laubstein <julianlaubstein@yahoo.de> | 2016-02-06 11:37:34 +0100 |
---|---|---|
committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2016-02-06 11:37:34 +0100 |
commit | 6fdd7194c81be7234a126bdc3b48f0291fce3567 (patch) | |
tree | 7d5ac74b7385ce4ebf77588d80549c884c2b993c /src/Generating/CompoGen.h | |
parent | Merge pull request #2958 from LogicParrot/fence (diff) | |
parent | Bulk clearing of whitespace (diff) | |
download | cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar.gz cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar.bz2 cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar.lz cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar.xz cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.tar.zst cuberite-6fdd7194c81be7234a126bdc3b48f0291fce3567.zip |
Diffstat (limited to 'src/Generating/CompoGen.h')
-rw-r--r-- | src/Generating/CompoGen.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Generating/CompoGen.h b/src/Generating/CompoGen.h index d4d38bfdd..b5108bac6 100644 --- a/src/Generating/CompoGen.h +++ b/src/Generating/CompoGen.h @@ -31,12 +31,12 @@ public: m_BlockType(E_BLOCK_STONE), m_IsBedrocked(true) {} - + protected: BLOCKTYPE m_BlockType; bool m_IsBedrocked; - + // cTerrainCompositionGen overrides: virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override; virtual void InitializeCompoGen(cIniFile & a_IniFile) override; @@ -51,9 +51,9 @@ class cCompoGenDebugBiomes : { public: cCompoGenDebugBiomes(void) {} - + protected: - + // cTerrainCompositionGen overrides: virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override; } ; @@ -67,7 +67,7 @@ class cCompoGenClassic : { public: cCompoGenClassic(void); - + protected: int m_SeaLevel; @@ -79,7 +79,7 @@ protected: BLOCKTYPE m_BlockBeach; BLOCKTYPE m_BlockBeachBottom; BLOCKTYPE m_BlockSea; - + // cTerrainCompositionGen overrides: virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override; virtual void InitializeCompoGen(cIniFile & a_IniFile) override; @@ -94,13 +94,13 @@ class cCompoGenNether : { public: cCompoGenNether(int a_Seed); - + protected: cNoise m_Noise1; cNoise m_Noise2; - + double m_MaxThreshold; - + // cTerrainCompositionGen overrides: virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override; virtual void InitializeCompoGen(cIniFile & a_IniFile) override; @@ -117,15 +117,15 @@ class cCompoGenCache : public: cCompoGenCache(cTerrainCompositionGenPtr a_Underlying, int a_CacheSize); // Doesn't take ownership of a_Underlying ~cCompoGenCache(); - + // cTerrainCompositionGen override: virtual void ComposeTerrain(cChunkDesc & a_ChunkDesc, const cChunkDesc::Shape & a_Shape) override; virtual void InitializeCompoGen(cIniFile & a_IniFile) override; - + protected: cTerrainCompositionGenPtr m_Underlying; - + struct sCacheData { int m_ChunkX; @@ -134,12 +134,12 @@ protected: cChunkDesc::BlockNibbleBytes m_BlockMetas; // The metas are uncompressed, 1 meta per byte cChunkDef::HeightMap m_HeightMap; } ; - + // To avoid moving large amounts of data for the MRU behavior, we MRU-ize indices to an array of the actual data int m_CacheSize; int * m_CacheOrder; // MRU-ized order, indices into m_CacheData array sCacheData * m_CacheData; // m_CacheData[m_CacheOrder[0]] is the most recently used - + // Cache statistics int m_NumHits; int m_NumMisses; |