From 31a11a6df4922b590a50a5ff3d3c00d42a45599d Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Mon, 23 Jul 2018 19:12:51 +0100 Subject: Optimise chunk set (#4260) Closes #1244 Initially I was just going to add the cChunkData to cSetChunkData but profiling revealed that the copying wasn't even the biggest slowdown. Much more time was being spent in cChunk::CreateBlockEntities and cChunk::WakeUpSimulators than was in memcpy so I've made those significantly faster as well. Optimisations performed: * cSetChunkData now stores blocks in a cChunkData object * cChunkData objects can now perform moves even if they are using different pools * cChunk::CreateBlockEntities now iterates in the correct order and only over present chunk sections * Similarly for cChunk::WakeUpSimulators * cSetChunkData::CalculateHeightMap now shortcuts to the highest present chunk section before checking blocks directly --- src/ChunkDataCallback.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ChunkDataCallback.h') diff --git a/src/ChunkDataCallback.h b/src/ChunkDataCallback.h index 2bf554b74..ec8e1180f 100644 --- a/src/ChunkDataCallback.h +++ b/src/ChunkDataCallback.h @@ -115,13 +115,13 @@ public: }; cChunkDataCopyCollector(): - m_Pool(cpp14::make_unique()), + m_Pool(cpp14::make_unique(), cChunkData::NumSections), // Keep 1 chunk worth of reserve m_Data(m_Pool) { } - cListAllocationPool m_Pool; // Keep 1 chunk worth of reserve + cListAllocationPool m_Pool; cChunkData m_Data; protected: -- cgit v1.2.3