31a11a6df4
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
129 lines
3.0 KiB
C++
129 lines
3.0 KiB
C++
|
|
#include "Globals.h"
|
|
#include "ChunkData.h"
|
|
|
|
|
|
|
|
int main(int argc, char** argv)
|
|
{
|
|
LOGD("Test started");
|
|
|
|
class cMockAllocationPool
|
|
: public cAllocationPool<cChunkData::sChunkSection>
|
|
{
|
|
virtual cChunkData::sChunkSection * Allocate() override
|
|
{
|
|
return new cChunkData::sChunkSection();
|
|
}
|
|
|
|
virtual void Free(cChunkData::sChunkSection * a_Ptr) override
|
|
{
|
|
delete a_Ptr;
|
|
}
|
|
|
|
virtual bool DoIsEqual(const cAllocationPool<cChunkData::sChunkSection> &) const NOEXCEPT override
|
|
{
|
|
return false;
|
|
}
|
|
} Pool;
|
|
{
|
|
cChunkData buffer(Pool);
|
|
|
|
// Empty chunks
|
|
buffer.SetBlock({ 0, 0, 0 }, 0xAB);
|
|
testassert(buffer.GetBlock({ 0, 0, 0 }) == 0xAB);
|
|
buffer.SetMeta({ 0, 16, 0 }, 0xC);
|
|
testassert(buffer.GetMeta({ 0, 16, 0 }) == 0xC);
|
|
|
|
// loaded but not written segments
|
|
testassert(buffer.GetBlock({ 1, 0, 0 }) == 0x0);
|
|
testassert(buffer.GetMeta({ 1, 16, 0 }) == 0x0);
|
|
|
|
// Notloaded segments
|
|
testassert(buffer.GetBlock({ 0, 32, 0 }) == 0x0);
|
|
testassert(buffer.GetMeta({ 0, 48, 0 }) == 0x0);
|
|
|
|
// Out of range SetBlock
|
|
CheckAsserts(
|
|
buffer.SetBlock({ -1, 0, 0 }, 0);
|
|
);
|
|
CheckAsserts(
|
|
buffer.SetBlock({ 0, -1, 0 }, 0);
|
|
);
|
|
CheckAsserts(
|
|
buffer.SetBlock({ 0, 0, -1 }, 0);
|
|
);
|
|
CheckAsserts(
|
|
buffer.SetBlock({ 256, 0, 0 }, 0);
|
|
);
|
|
CheckAsserts(
|
|
buffer.SetBlock({ 0, 256, 0 }, 0);
|
|
);
|
|
CheckAsserts(
|
|
buffer.SetBlock({ 0, 0, 256 }, 0);
|
|
);
|
|
// Out of range SetMeta
|
|
CheckAsserts(
|
|
buffer.SetMeta({ -1, 0, 0 }, 0);
|
|
);
|
|
CheckAsserts(
|
|
buffer.SetMeta({ 0, -1, 0 }, 0);
|
|
);
|
|
CheckAsserts(
|
|
buffer.SetMeta({ 0, 0, -1 }, 0);
|
|
);
|
|
CheckAsserts(
|
|
buffer.SetMeta({ 256, 0, 0 }, 0);
|
|
);
|
|
CheckAsserts(
|
|
buffer.SetMeta({ 0, 256, 0 }, 0);
|
|
);
|
|
CheckAsserts(
|
|
buffer.SetMeta({ 0, 0, 256 }, 0);
|
|
);
|
|
|
|
// Reading out of range blocks should return air
|
|
testassert(buffer.GetBlock({ -1, 0, 0 }) == 0);
|
|
testassert(buffer.GetBlock({ 0, -1, 0 }) == 0);
|
|
testassert(buffer.GetBlock({ 0, 0, -1 }) == 0);
|
|
testassert(buffer.GetBlock({ 256, 0, 0 }) == 0);
|
|
testassert(buffer.GetBlock({ 0, 256, 0 }) == 0);
|
|
testassert(buffer.GetBlock({ 0, 0, 256 }) == 0);
|
|
|
|
// Reading out of range metas should return 0
|
|
testassert(buffer.GetMeta({ -1, 0, 0 }) == 0);
|
|
testassert(buffer.GetMeta({ 0, -1, 0 }) == 0);
|
|
testassert(buffer.GetMeta({ 0, 0, -1 }) == 0);
|
|
testassert(buffer.GetMeta({ 256, 0, 0 }) == 0);
|
|
testassert(buffer.GetMeta({ 0, 256, 0 }) == 0);
|
|
testassert(buffer.GetMeta({ 0, 0, 256 }) == 0);
|
|
}
|
|
|
|
{
|
|
cChunkData buffer(Pool);
|
|
|
|
// Zero's
|
|
buffer.SetBlock({ 0, 0, 0 }, 0x0);
|
|
buffer.SetBlock({ 0, 0, 1 }, 0xab);
|
|
testassert(buffer.GetBlock({ 0, 0, 0 }) == 0x0);
|
|
testassert(buffer.GetBlock({ 0, 0, 1 }) == 0xab);
|
|
|
|
buffer.SetMeta({ 0, 16, 0 }, 0x0);
|
|
buffer.SetMeta({ 0, 16, 1 }, 0xc);
|
|
testassert(buffer.GetMeta({ 0, 16, 0 }) == 0x0);
|
|
testassert(buffer.GetMeta({ 0, 16, 1 }) == 0xc);
|
|
}
|
|
|
|
|
|
{
|
|
// Operator =
|
|
cChunkData buffer(Pool);
|
|
buffer.SetBlock({ 0, 0, 0 }, 0x42);
|
|
cChunkData copy(Pool);
|
|
copy = std::move(buffer);
|
|
testassert(copy.GetBlock({ 0, 0, 0 }) == 0x42);
|
|
}
|
|
|
|
return 0;
|
|
}
|