summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-08-22 14:34:43 +0200
committerMattes D <github@xoft.cz>2017-08-22 14:34:43 +0200
commitcc2d719c59446804f59a956b98fe9f7702da7515 (patch)
tree9c43009ecbdfc81d968e5fea5ac9d1aaa366b758
parentAdded .editorconfig (#3936) (diff)
downloadcuberite-cc2d719c59446804f59a956b98fe9f7702da7515.tar
cuberite-cc2d719c59446804f59a956b98fe9f7702da7515.tar.gz
cuberite-cc2d719c59446804f59a956b98fe9f7702da7515.tar.bz2
cuberite-cc2d719c59446804f59a956b98fe9f7702da7515.tar.lz
cuberite-cc2d719c59446804f59a956b98fe9f7702da7515.tar.xz
cuberite-cc2d719c59446804f59a956b98fe9f7702da7515.tar.zst
cuberite-cc2d719c59446804f59a956b98fe9f7702da7515.zip
Diffstat (limited to '')
-rw-r--r--src/SpawnPrepare.cpp19
-rw-r--r--src/SpawnPrepare.h11
2 files changed, 17 insertions, 13 deletions
diff --git a/src/SpawnPrepare.cpp b/src/SpawnPrepare.cpp
index 3ea383ee9..3e56c721b 100644
--- a/src/SpawnPrepare.cpp
+++ b/src/SpawnPrepare.cpp
@@ -12,17 +12,18 @@ class cSpawnPrepareCallback :
public cChunkCoordCallback
{
public:
- cSpawnPrepareCallback(cSpawnPrepare & a_SpawnPrepare) :
- m_SpawnPrepare(a_SpawnPrepare)
+ cSpawnPrepareCallback(std::shared_ptr<cSpawnPrepare> a_SpawnPrepare) :
+ m_SpawnPrepare(std::move(a_SpawnPrepare))
{
+ ASSERT(m_SpawnPrepare != nullptr);
}
protected:
- cSpawnPrepare & m_SpawnPrepare;
+ std::shared_ptr<cSpawnPrepare> m_SpawnPrepare;
virtual void Call(int a_ChunkX, int a_ChunkZ, bool a_IsSuccess) override
{
- m_SpawnPrepare.PreparedChunkCallback(a_ChunkX, a_ChunkZ);
+ m_SpawnPrepare->PreparedChunkCallback(a_ChunkX, a_ChunkZ);
}
};
@@ -30,7 +31,7 @@ protected:
-cSpawnPrepare::cSpawnPrepare(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance, int a_FirstIdx):
+cSpawnPrepare::cSpawnPrepare(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance, int a_FirstIdx, sMakeSharedTag):
m_World(a_World),
m_SpawnChunkX(a_SpawnChunkX),
m_SpawnChunkZ(a_SpawnChunkZ),
@@ -55,18 +56,18 @@ void cSpawnPrepare::PrepareChunks(cWorld & a_World, int a_SpawnChunkX, int a_Spa
// Queue the initial chunks:
int MaxIdx = a_PrepareDistance * a_PrepareDistance;
int maxQueue = std::min(MaxIdx - 1, 100); // Number of chunks to queue at once
- cSpawnPrepare prep(a_World, a_SpawnChunkX, a_SpawnChunkZ, a_PrepareDistance, maxQueue);
+ auto prep = std::make_shared<cSpawnPrepare>(a_World, a_SpawnChunkX, a_SpawnChunkZ, a_PrepareDistance, maxQueue, sMakeSharedTag{});
for (int i = 0; i < maxQueue; i++)
{
int chunkX, chunkZ;
- prep.DecodeChunkCoords(i, chunkX, chunkZ);
+ prep->DecodeChunkCoords(i, chunkX, chunkZ);
a_World.PrepareChunk(chunkX, chunkZ, cpp14::make_unique<cSpawnPrepareCallback>(prep));
} // for i
// Wait for the lighting thread to prepare everything. Event is set in the Call() callback:
if (MaxIdx > 0)
{
- prep.m_EvtFinished.Wait();
+ prep->m_EvtFinished.Wait();
}
}
@@ -108,7 +109,7 @@ void cSpawnPrepare::PreparedChunkCallback(int a_ChunkX, int a_ChunkZ)
{
int chunkX, chunkZ;
DecodeChunkCoords(m_NextIdx, chunkX, chunkZ);
- m_World.GetLightingThread().QueueChunk(chunkX, chunkZ, cpp14::make_unique<cSpawnPrepareCallback>(*this));
+ m_World.GetLightingThread().QueueChunk(chunkX, chunkZ, cpp14::make_unique<cSpawnPrepareCallback>(shared_from_this()));
m_NextIdx += 1;
}
diff --git a/src/SpawnPrepare.h b/src/SpawnPrepare.h
index 6d001b5f7..62daf1f84 100644
--- a/src/SpawnPrepare.h
+++ b/src/SpawnPrepare.h
@@ -6,10 +6,15 @@ class cWorld;
/** Generates and lights the spawn area of the world. Runs as a separate thread. */
-class cSpawnPrepare
+class cSpawnPrepare:
+ public std::enable_shared_from_this<cSpawnPrepare>
{
-
+ /** Private tag allows public constructors that can only be used with private access. */
+ struct sMakeSharedTag {};
public:
+
+ cSpawnPrepare(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance, int a_FirstIdx, sMakeSharedTag);
+
static void PrepareChunks(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance);
protected:
@@ -36,8 +41,6 @@ protected:
/** Number of chunks prepared when the last progress report was emitted. */
int m_LastReportChunkCount;
- cSpawnPrepare(cWorld & a_World, int a_SpawnChunkX, int a_SpawnChunkZ, int a_PrepareDistance, int a_FirstIdx);
-
void PreparedChunkCallback(int a_ChunkX, int a_ChunkZ);
/** Decodes the index into chunk coords. Provides the specific chunk ordering. */