1
0

Merge branch 'chunksparsing/structs' into AllocationPool

Conflicts:
	src/ChunkData.cpp
	src/ChunkData.h
	tests/ChunkData/Coordinates.cpp
This commit is contained in:
Tycho
2014-05-25 18:02:33 +01:00
89 changed files with 2713 additions and 1603 deletions

View File

@@ -19,107 +19,77 @@ int main(int argc, char** argv)
// Test first segment
cChunkData buffer(Pool);
BLOCKTYPE* SrcBlockBuffer = new BLOCKTYPE[16 * 16 * 256];
BLOCKTYPE SrcBlockBuffer[16 * 16 * 256];
memset(SrcBlockBuffer, 0x00, 16 * 16 * 256);
SrcBlockBuffer[7+4*16+5*16*16] = 0xCD;
SrcBlockBuffer[7 + (4 * 16) + (5 * 16 * 16)] = 0xCD;
buffer.SetBlocks(SrcBlockBuffer);
testassert(buffer.GetBlock(7,5,4) == 0xCD);
delete SrcBlockBuffer;
SrcBlockBuffer = NULL;
NIBBLETYPE * SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
SrcNibbleBuffer[(6+1*16+2*16*16)/2] = 0xE;
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xE;
buffer.SetMeta(SrcNibbleBuffer);
testassert(buffer.GetMeta(6,2,1) == 0xE);
delete SrcNibbleBuffer;
SrcNibbleBuffer = NULL;
testassert(buffer.GetMeta(6, 2, 1) == 0xE);
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
SrcNibbleBuffer[(6+1*16+2*16*16)/2] = 0xE;
buffer.SetLight(SrcNibbleBuffer);
testassert(buffer.GetBlockLight(6,2,1) == 0xE);
delete SrcNibbleBuffer;
SrcNibbleBuffer = NULL;
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xE;
buffer.SetBlockLight(SrcNibbleBuffer);
testassert(buffer.GetBlockLight(6, 2, 1) == 0xE);
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
SrcNibbleBuffer[(6+1*16+2*16*16)/2] = 0xE;
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xE;
buffer.SetSkyLight(SrcNibbleBuffer);
testassert(buffer.GetSkyLight(6,2,1) == 0xE);
delete SrcNibbleBuffer;
SrcNibbleBuffer = NULL;
testassert(buffer.GetSkyLight(6, 2, 1) == 0xE);
}
{
// test following segment
cChunkData buffer(Pool);
BLOCKTYPE* SrcBlockBuffer = new BLOCKTYPE[16 * 16 * 256];
BLOCKTYPE SrcBlockBuffer[16 * 16 * 256];
memset(SrcBlockBuffer, 0x00, 16 * 16 * 256);
SrcBlockBuffer[7+4*16+24*16*16] = 0xCD;
SrcBlockBuffer[7 + (4 * 16) + (24 * 16 * 16)] = 0xCD;
buffer.SetBlocks(SrcBlockBuffer);
testassert(buffer.GetBlock(7,24,4) == 0xCD);
delete SrcBlockBuffer;
SrcBlockBuffer = NULL;
testassert(buffer.GetBlock(7, 24, 4) == 0xCD);
NIBBLETYPE * SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
SrcNibbleBuffer[(6+1*16+24*16*16)/2] = 0xE;
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
SrcNibbleBuffer[(6 + (1 * 16) + (24 * 16 * 16)) / 2] = 0xE;
buffer.SetMeta(SrcNibbleBuffer);
testassert(buffer.GetMeta(6,24,1) == 0xE);
delete SrcNibbleBuffer;
SrcNibbleBuffer = NULL;
testassert(buffer.GetMeta(6, 24, 1) == 0xE);
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
SrcNibbleBuffer[(6+1*16+24*16*16)/2] = 0xE;
buffer.SetLight(SrcNibbleBuffer);
buffer.SetBlockLight(SrcNibbleBuffer);
testassert(buffer.GetBlockLight(6,24,1) == 0xE);
delete SrcNibbleBuffer;
SrcNibbleBuffer = NULL;
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
SrcNibbleBuffer[(6+1*16+24*16*16)/2] = 0xE;
memset(SrcNibbleBuffer, 0xFF, 16 * 16 * 256 / 2);
SrcNibbleBuffer[(6 + (1 * 16) + (24 * 16 * 16))/2] = 0xE;
buffer.SetSkyLight(SrcNibbleBuffer);
testassert(buffer.GetSkyLight(6,24,1) == 0xE);
delete SrcNibbleBuffer;
SrcNibbleBuffer = NULL;
testassert(buffer.GetSkyLight(6, 24, 1) == 0xE);
}
{
// test zeros
cChunkData buffer(Pool);
BLOCKTYPE* SrcBlockBuffer = new BLOCKTYPE[16 * 16 * 256];
BLOCKTYPE SrcBlockBuffer[16 * 16 * 256];
memset(SrcBlockBuffer, 0x00, 16 * 16 * 256);
buffer.SetBlocks(SrcBlockBuffer);
testassert(buffer.GetBlock(7,24,4) == 0x00);
delete SrcBlockBuffer;
SrcBlockBuffer = NULL;
testassert(buffer.GetBlock(7, 24, 4) == 0x00);
NIBBLETYPE * SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256/2];
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
buffer.SetMeta(SrcNibbleBuffer);
testassert(buffer.GetMeta(6,24,1) == 0x0);
delete SrcNibbleBuffer;
SrcNibbleBuffer = NULL;
testassert(buffer.GetMeta(6, 24, 1) == 0x0);
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
buffer.SetLight(SrcNibbleBuffer);
buffer.SetBlockLight(SrcNibbleBuffer);
testassert(buffer.GetBlockLight(6,24,1) == 0x0);
delete SrcNibbleBuffer;
SrcNibbleBuffer = NULL;
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
memset(SrcNibbleBuffer, 0xFF, 16 * 16 * 256 /2);
buffer.SetSkyLight(SrcNibbleBuffer);
testassert(buffer.GetSkyLight(6,24,1) == 0xF);
delete SrcNibbleBuffer;
SrcNibbleBuffer = NULL;
testassert(buffer.GetSkyLight(6, 24, 1) == 0xF);
}
}