summaryrefslogtreecommitdiffstats
path: root/src/Generating/NetherFortGen.h
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-05-07 22:34:06 +0200
committermadmaxoft <github@xoft.cz>2014-05-07 22:34:06 +0200
commit564261cfd9e385dfe6331c0585cae3b46989dd17 (patch)
tree33562e8da096a6f7d8ed28911a9179181d1a738b /src/Generating/NetherFortGen.h
parentInitial cPrefabPiecePool refactoring. (diff)
downloadcuberite-564261cfd9e385dfe6331c0585cae3b46989dd17.tar
cuberite-564261cfd9e385dfe6331c0585cae3b46989dd17.tar.gz
cuberite-564261cfd9e385dfe6331c0585cae3b46989dd17.tar.bz2
cuberite-564261cfd9e385dfe6331c0585cae3b46989dd17.tar.lz
cuberite-564261cfd9e385dfe6331c0585cae3b46989dd17.tar.xz
cuberite-564261cfd9e385dfe6331c0585cae3b46989dd17.tar.zst
cuberite-564261cfd9e385dfe6331c0585cae3b46989dd17.zip
Diffstat (limited to '')
-rw-r--r--src/Generating/NetherFortGen.h61
1 files changed, 9 insertions, 52 deletions
diff --git a/src/Generating/NetherFortGen.h b/src/Generating/NetherFortGen.h
index d51596b9e..f35801a3c 100644
--- a/src/Generating/NetherFortGen.h
+++ b/src/Generating/NetherFortGen.h
@@ -10,77 +10,34 @@
#pragma once
#include "ComposableGenerator.h"
-#include "PieceGenerator.h"
+#include "PrefabPiecePool.h"
+#include "GridStructGen.h"
class cNetherFortGen :
- public cFinishGen,
- public cPiecePool
+ public cGridStructGen
{
+ typedef cGridStructGen super;
+
public:
cNetherFortGen(int a_Seed, int a_GridSize, int a_MaxDepth);
- virtual ~cNetherFortGen();
-
protected:
friend class cNetherFortPerfTest; // fwd: NetherFortGen.cpp
class cNetherFort; // fwd: NetherFortGen.cpp
- typedef std::list<cNetherFort *> cNetherForts;
-
-
- /** The seed used for generating*/
- int m_Seed;
-
- /** The noise used for generating */
- cNoise m_Noise;
-
- /** Average spacing between the fortresses*/
- int m_GridSize;
/** Maximum depth of the piece-generator tree */
int m_MaxDepth;
-
- /** Cache of the most recently used systems. MoveToFront used. */
- cNetherForts m_Cache;
- /** All the pieces that are allowed for building.
- This is the list that's used for memory allocation and deallocation for the pieces. */
- cPieces m_AllPieces;
+ /** The pool of pieces to use for generating. Static, so that it's shared by multiple generators. */
+ static cPrefabPiecePool m_PiecePool;
- /** The pieces that are used as starting pieces.
- This list is not shared and the pieces need deallocation. */
- cPieces m_StartingPieces;
-
- /** The pieces that have an "outer" connector.
- The pieces are copies out of m_AllPieces and shouldn't be ever delete-d. */
- cPieces m_OuterPieces;
-
- /** The pieces that have an "inner" connector.
- The pieces are copies out of m_AllPieces and shouldn't be ever delete-d. */
- cPieces m_InnerPieces;
-
- /** Clears everything from the cache.
- Also invalidates the forst returned by GetFortsForChunk(). */
- void ClearCache(void);
-
- /** Returns all forts that *may* intersect the given chunk.
- The returned forts live within m_Cache.They are valid until the next call
- to this function (which may delete some of the pointers). */
- void GetFortsForChunk(int a_ChunkX, int a_ChunkZ, cNetherForts & a_Forts);
-
- // cFinishGen overrides:
- virtual void GenFinish(cChunkDesc & a_ChunkDesc) override;
-
- // cPiecePool overrides:
- virtual cPieces GetPiecesWithConnector(int a_ConnectorType) override;
- virtual cPieces GetStartingPieces(void) override;
- virtual int GetPieceWeight(const cPlacedPiece & a_PlacedPiece, const cPiece::cConnector & a_ExistingConnector, const cPiece & a_NewPiece) override;
- virtual void PiecePlaced(const cPiece & a_Piece) override;
- virtual void Reset(void) override;
+ // cGridStructGen overrides:
+ virtual cStructurePtr CreateStructure(int a_OriginX, int a_OriginZ) override;
} ;