flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

cChunk and cChunkData: Use vectors for block get and set functions (#4172)

Browse Source 
* cChunkData: Change interface to use Vector3i
* cChunk: Add Vector3i overloads for bounded block get and set functions.
This commit is contained in:
peterbell10
2018-02-04 22:15:31 +00:00
committed by GitHub
parent d12804d4c0
commit 2df14a0496
9 changed files with 243 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/ChunkData/ArraytoCoord.cpp
View File

@@ -10,19 +10,19 @@ int main(int argc, char** argv)
class cMockAllocationPool
: public cAllocationPool<cChunkData::sChunkSection>
{
{
virtual cChunkData::sChunkSection * Allocate()
{
return new cChunkData::sChunkSection();
}
virtual void Free(cChunkData::sChunkSection * a_Ptr)
{
delete a_Ptr;
}
} Pool;
{
// Test first segment
cChunkData buffer(Pool);
@@ -30,25 +30,25 @@ int main(int argc, char** argv)
memset(SrcBlockBuffer, 0x00, sizeof(SrcBlockBuffer));
SrcBlockBuffer[7 + (4 * 16) + (5 * 16 * 16)] = 0xcd;
buffer.SetBlockTypes(SrcBlockBuffer);
testassert(buffer.GetBlock(7, 5, 4) == 0xcd);
testassert(buffer.GetBlock({ 7, 5, 4 }) == 0xcd);
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xe;
buffer.SetMetas(SrcNibbleBuffer);
testassert(buffer.GetMeta(6, 2, 1) == 0xe);
testassert(buffer.GetMeta({ 6, 2, 1 }) == 0xe);
memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xe;
buffer.SetBlockLight(SrcNibbleBuffer);
testassert(buffer.GetBlockLight(6, 2, 1) == 0xe);
testassert(buffer.GetBlockLight({ 6, 2, 1 }) == 0xe);
memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xe;
buffer.SetSkyLight(SrcNibbleBuffer);
testassert(buffer.GetSkyLight(6, 2, 1) == 0xe);
testassert(buffer.GetSkyLight({ 6, 2, 1 }) == 0xe);
}
{
// test following segment
cChunkData buffer(Pool);
@@ -57,25 +57,25 @@ int main(int argc, char** argv)
memset(SrcBlockBuffer, 0x00, sizeof(SrcBlockBuffer));
SrcBlockBuffer[7 + (4 * 16) + (24 * 16 * 16)] = 0xcd;
buffer.SetBlockTypes(SrcBlockBuffer);
testassert(buffer.GetBlock(7, 24, 4) == 0xcd);
testassert(buffer.GetBlock({ 7, 24, 4 }) == 0xcd);
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
SrcNibbleBuffer[(6 + (1 * 16) + (24 * 16 * 16)) / 2] = 0xe;
buffer.SetMetas(SrcNibbleBuffer);
testassert(buffer.GetMeta(6, 24, 1) == 0xe);
testassert(buffer.GetMeta({ 6, 24, 1 }) == 0xe);
memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
SrcNibbleBuffer[(6 + 1 * 16 + 24 * 16 * 16) / 2] = 0xe;
buffer.SetBlockLight(SrcNibbleBuffer);
testassert(buffer.GetBlockLight(6, 24, 1) == 0xe);
testassert(buffer.GetBlockLight({ 6, 24, 1 }) == 0xe);
memset(SrcNibbleBuffer, 0xff, sizeof(SrcNibbleBuffer));
SrcNibbleBuffer[(6 + (1 * 16) + (24 * 16 * 16)) / 2] = 0xe;
buffer.SetSkyLight(SrcNibbleBuffer);
testassert(buffer.GetSkyLight(6, 24, 1) == 0xe);
testassert(buffer.GetSkyLight({ 6, 24, 1 }) == 0xe);
}
{
// test zeros
cChunkData buffer(Pool);
@@ -83,22 +83,22 @@ int main(int argc, char** argv)
BLOCKTYPE SrcBlockBuffer[16 * 16 * 256];
memset(SrcBlockBuffer, 0x00, sizeof(SrcBlockBuffer));
buffer.SetBlockTypes(SrcBlockBuffer);
testassert(buffer.GetBlock(7, 24, 4) == 0x00);
testassert(buffer.GetBlock({ 7, 24, 4 }) == 0x00);
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
buffer.SetMetas(SrcNibbleBuffer);
testassert(buffer.GetMeta(6, 24, 1) == 0x0);
testassert(buffer.GetMeta({ 6, 24, 1 }) == 0x0);
memset(SrcNibbleBuffer, 0x00, sizeof(SrcNibbleBuffer));
buffer.SetBlockLight(SrcNibbleBuffer);
testassert(buffer.GetBlockLight(6, 24, 1) == 0x0);
testassert(buffer.GetBlockLight({ 6, 24, 1 }) == 0x0);
memset(SrcNibbleBuffer, 0xff, sizeof(SrcNibbleBuffer));
buffer.SetSkyLight(SrcNibbleBuffer);
testassert(buffer.GetSkyLight(6, 24, 1) == 0xf);
testassert(buffer.GetSkyLight({ 6, 24, 1 }) == 0xf);
}
// All tests passed:
return 0;
}