1
0

Gen: Moved PiecePool into a separate file.

Also rewritten the PieceGenerator to use std::unique_ptr.
This commit is contained in:
Mattes D
2017-02-26 22:49:23 +01:00
parent f709f74aeb
commit 187abe3f5e
20 changed files with 635 additions and 636 deletions

View File

@@ -14,11 +14,11 @@
cPrefabStructure::cPrefabStructure(
int a_GridX, int a_GridZ,
int a_OriginX, int a_OriginZ,
cPlacedPieces & a_Pieces,
cPlacedPieces && a_Pieces,
cTerrainHeightGenPtr a_HeightGen
):
Super(a_GridX, a_GridZ, a_OriginX, a_OriginZ),
m_Pieces(a_Pieces),
m_Pieces(std::move(a_Pieces)),
m_HeightGen(a_HeightGen)
{
}
@@ -27,15 +27,6 @@ cPrefabStructure::cPrefabStructure(
cPrefabStructure::~cPrefabStructure()
{
cPieceGenerator::FreePieces(m_Pieces);
}
void cPrefabStructure::DrawIntoChunk(cChunkDesc & a_Chunk)
{
// Iterate over all items
@@ -47,7 +38,7 @@ void cPrefabStructure::DrawIntoChunk(cChunkDesc & a_Chunk)
{
PlacePieceOnGround(**itr);
}
Prefab.Draw(a_Chunk, *itr);
Prefab.Draw(a_Chunk, itr->get());
} // for itr - m_PlacedPieces[]
}