Implemented style changes
This commit is contained in:
parent
4ab8288116
commit
8f964886e0
@ -1908,7 +1908,7 @@ void cBlockArea::cChunkReader::ChunkData(const cChunkData & a_BlockBuffer)
|
||||
|
||||
if (m_Area.m_BlockLight != NULL)
|
||||
{
|
||||
a_BlockBuffer.CopyLight(m_Area.m_BlockLight);
|
||||
a_BlockBuffer.CopyBlockLight(m_Area.m_BlockLight);
|
||||
}
|
||||
|
||||
if (m_Area.m_BlockSkyLight != NULL)
|
||||
|
@ -284,7 +284,7 @@ void cChunk::SetAllData(
|
||||
|
||||
m_ChunkData.SetBlocks(a_BlockTypes);
|
||||
m_ChunkData.SetMeta(a_BlockMeta);
|
||||
m_ChunkData.SetLight(a_BlockLight);
|
||||
m_ChunkData.SetBlockLight(a_BlockLight);
|
||||
m_ChunkData.SetSkyLight(a_BlockSkyLight);
|
||||
|
||||
m_IsLightValid = (a_BlockLight != NULL) && (a_BlockSkyLight != NULL);
|
||||
@ -326,7 +326,7 @@ void cChunk::SetLight(
|
||||
// TODO: We might get cases of wrong lighting when a chunk changes in the middle of a lighting calculation.
|
||||
// Postponing until we see how bad it is :)
|
||||
|
||||
m_ChunkData.SetLight(a_BlockLight);
|
||||
m_ChunkData.SetBlockLight(a_BlockLight);
|
||||
|
||||
m_ChunkData.SetSkyLight(a_SkyLight);
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
cChunkData cChunkData::Copy() const
|
||||
{
|
||||
cChunkData copy;
|
||||
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
if (m_Sections[i] != NULL)
|
||||
{
|
||||
@ -22,13 +22,16 @@ cChunkData cChunkData::Copy() const
|
||||
|
||||
void cChunkData::CopyBlocks (BLOCKTYPE * a_dest, size_t a_Idx, size_t length) const
|
||||
{
|
||||
for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16;
|
||||
if (a_Idx > 0) a_Idx = a_Idx > length ? a_Idx - length : 0;
|
||||
if (a_Idx > 0)
|
||||
{
|
||||
a_Idx = std::max(a_Idx - length, (size_t) 0);
|
||||
}
|
||||
if (a_Idx == 0)
|
||||
{
|
||||
size_t tocopy = length > segment_length ? segment_length : length;
|
||||
size_t tocopy = std::min(segment_length, length);
|
||||
length -= tocopy;
|
||||
if (m_Sections[i] != NULL)
|
||||
{
|
||||
@ -56,7 +59,7 @@ void cChunkData::CopyBlocks (BLOCKTYPE * a_dest, size_t a_Idx, size_t length)
|
||||
|
||||
void cChunkData::CopyMeta(NIBBLETYPE * a_dest) const
|
||||
{
|
||||
for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
|
||||
if (m_Sections[i] != NULL)
|
||||
@ -82,9 +85,9 @@ void cChunkData::CopyMeta(NIBBLETYPE * a_dest) const
|
||||
|
||||
|
||||
|
||||
void cChunkData::CopyLight(NIBBLETYPE * a_dest) const
|
||||
void cChunkData::CopyBlockLight(NIBBLETYPE * a_dest) const
|
||||
{
|
||||
for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
|
||||
if (m_Sections[i] != NULL)
|
||||
@ -112,7 +115,7 @@ void cChunkData::CopyLight(NIBBLETYPE * a_dest) const
|
||||
|
||||
void cChunkData::CopySkyLight(NIBBLETYPE * a_dest) const
|
||||
{
|
||||
for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
|
||||
if (m_Sections[i] != NULL)
|
||||
@ -140,7 +143,7 @@ void cChunkData::CopySkyLight(NIBBLETYPE * a_dest) const
|
||||
|
||||
void cChunkData::SetBlocks(const BLOCKTYPE * a_src)
|
||||
{
|
||||
for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16;
|
||||
if (m_Sections[i] != NULL)
|
||||
@ -153,6 +156,9 @@ void cChunkData::SetBlocks(const BLOCKTYPE * a_src)
|
||||
}
|
||||
else
|
||||
{
|
||||
// j counts how many of leading zeros the buffer has
|
||||
// if j == segment_length then the buffer is all zeros so there is no point
|
||||
// creating the buffer.
|
||||
size_t j = 0;
|
||||
// do nothing whilst 0
|
||||
for (; j < segment_length && a_src[i * segment_length + j] == 0; j++);
|
||||
@ -180,11 +186,6 @@ void cChunkData::SetBlocks(const BLOCKTYPE * a_src)
|
||||
sizeof(m_Sections[i]->m_BlockSkyLight)
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
Free(m_Sections[i]);
|
||||
m_Sections[i] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -194,7 +195,7 @@ void cChunkData::SetBlocks(const BLOCKTYPE * a_src)
|
||||
|
||||
void cChunkData::SetMeta(const NIBBLETYPE * a_src)
|
||||
{
|
||||
for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
|
||||
if (m_Sections[i] != NULL)
|
||||
@ -207,6 +208,9 @@ void cChunkData::SetMeta(const NIBBLETYPE * a_src)
|
||||
}
|
||||
else
|
||||
{
|
||||
// j counts how many of leading zeros the buffer has
|
||||
// if j == segment_length then the buffer is all zeros so there is no point
|
||||
// creating the buffer.
|
||||
size_t j = 0;
|
||||
// do nothing whilst 0
|
||||
for (; j < segment_length && a_src[i * segment_length + j] == 0; j++);
|
||||
@ -234,11 +238,6 @@ void cChunkData::SetMeta(const NIBBLETYPE * a_src)
|
||||
sizeof(m_Sections[i]->m_BlockSkyLight)
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
Free(m_Sections[i]);
|
||||
m_Sections[i] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -246,10 +245,10 @@ void cChunkData::SetMeta(const NIBBLETYPE * a_src)
|
||||
|
||||
|
||||
|
||||
void cChunkData::SetLight(const NIBBLETYPE * a_src)
|
||||
void cChunkData::SetBlockLight(const NIBBLETYPE * a_src)
|
||||
{
|
||||
if (!a_src) return;
|
||||
for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
|
||||
if (m_Sections[i] != NULL)
|
||||
@ -262,6 +261,9 @@ void cChunkData::SetLight(const NIBBLETYPE * a_src)
|
||||
}
|
||||
else
|
||||
{
|
||||
// j counts how many of leading zeros the buffer has
|
||||
// if j == segment_length then the buffer is all zeros so there is no point
|
||||
// creating the buffer.
|
||||
size_t j = 0;
|
||||
// do nothing whilst 0
|
||||
for (; j < segment_length && a_src[i * segment_length + j] == 0; j++);
|
||||
@ -289,11 +291,6 @@ void cChunkData::SetLight(const NIBBLETYPE * a_src)
|
||||
sizeof(m_Sections[i]->m_BlockSkyLight)
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
Free(m_Sections[i]);
|
||||
m_Sections[i] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -304,7 +301,7 @@ void cChunkData::SetLight(const NIBBLETYPE * a_src)
|
||||
void cChunkData::SetSkyLight (const NIBBLETYPE * a_src)
|
||||
{
|
||||
if (!a_src) return;
|
||||
for (size_t i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
const size_t segment_length = CHUNK_SECTION_HEIGHT * 16 * 16 / 2;
|
||||
if (m_Sections[i] != NULL)
|
||||
@ -317,6 +314,9 @@ void cChunkData::SetSkyLight (const NIBBLETYPE * a_src)
|
||||
}
|
||||
else
|
||||
{
|
||||
// j counts how many of leading zeros the buffer has
|
||||
// if j == segment_length then the buffer is all zeros so there is no point
|
||||
// creating the buffer.
|
||||
size_t j = 0;
|
||||
// do nothing whilst 0
|
||||
for (; j < segment_length && a_src[i * segment_length + j] == 0xFF; j++);
|
||||
@ -344,11 +344,6 @@ void cChunkData::SetSkyLight (const NIBBLETYPE * a_src)
|
||||
sizeof(m_Sections[i]->m_BlockLight)
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
Free(m_Sections[i]);
|
||||
m_Sections[i] = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -8,8 +8,7 @@
|
||||
#include "ChunkDef.h"
|
||||
|
||||
|
||||
#define CHUNK_SECTION_HEIGHT 16
|
||||
#define CHUNK_SECTION_NUM (256 / CHUNK_SECTION_HEIGHT)
|
||||
|
||||
|
||||
#if __cplusplus < 201103L
|
||||
// auto_ptr style interface for memory management
|
||||
@ -33,9 +32,12 @@ public:
|
||||
{
|
||||
#if __cplusplus < 201103L
|
||||
// auto_ptr style interface for memory management
|
||||
if (!IsOwner) return;
|
||||
if (!IsOwner)
|
||||
{
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
if (m_Sections[i] == NULL) Free(m_Sections[i]);;
|
||||
}
|
||||
@ -46,7 +48,7 @@ public:
|
||||
cChunkData(const cChunkData& other) :
|
||||
IsOwner(true)
|
||||
{
|
||||
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
m_Sections[i] = other.m_Sections[i];
|
||||
}
|
||||
@ -59,13 +61,13 @@ public:
|
||||
{
|
||||
if (IsOwner)
|
||||
{
|
||||
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
if (m_Sections[i]) Free(m_Sections[i]);;
|
||||
}
|
||||
}
|
||||
IsOwner = true;
|
||||
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
m_Sections[i] = other.m_Sections[i];
|
||||
}
|
||||
@ -78,10 +80,10 @@ public:
|
||||
// unique_ptr style interface for memory management
|
||||
cChunkData(cChunkData&& other)
|
||||
{
|
||||
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
m_Sections[i] = other.m_Sections[i];
|
||||
other.m_Sections[i] = 0;
|
||||
other.m_Sections[i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@ -89,11 +91,11 @@ public:
|
||||
{
|
||||
if (&other != this)
|
||||
{
|
||||
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
|
||||
for (size_t i = 0; i < CHUNK_SECTION_COUNT; i++)
|
||||
{
|
||||
Free(m_Sections[i]);;
|
||||
m_Sections[i] = other.m_Sections[i];
|
||||
other.m_Sections[i] = 0;
|
||||
other.m_Sections[i] = NULL;
|
||||
}
|
||||
}
|
||||
return *this;
|
||||
@ -150,7 +152,10 @@ public:
|
||||
|
||||
NIBBLETYPE GetMeta(int a_RelX, int a_RelY, int a_RelZ) const
|
||||
{
|
||||
if ((a_RelX < cChunkDef::Width) && (a_RelX > -1) && (a_RelY < cChunkDef::Height) && (a_RelY > -1) && (a_RelZ < cChunkDef::Width) && (a_RelZ > -1))
|
||||
if (
|
||||
(a_RelX < cChunkDef::Width) && (a_RelX > -1) &&
|
||||
(a_RelY < cChunkDef::Height) && (a_RelY > -1) &&
|
||||
(a_RelZ < cChunkDef::Width) && (a_RelZ > -1))
|
||||
{
|
||||
int Section = a_RelY / CHUNK_SECTION_HEIGHT;
|
||||
if (m_Sections[Section] != NULL)
|
||||
@ -244,16 +249,19 @@ public:
|
||||
cChunkData Copy() const;
|
||||
void CopyBlocks (BLOCKTYPE * a_dest, size_t a_Idx = 0, size_t length = cChunkDef::NumBlocks) const;
|
||||
void CopyMeta (NIBBLETYPE * a_dest) const;
|
||||
void CopyLight (NIBBLETYPE * a_dest) const;
|
||||
void CopyBlockLight (NIBBLETYPE * a_dest) const;
|
||||
void CopySkyLight (NIBBLETYPE * a_dest) const;
|
||||
|
||||
void SetBlocks (const BLOCKTYPE * a_src);
|
||||
void SetMeta (const NIBBLETYPE * a_src);
|
||||
void SetLight (const NIBBLETYPE * a_src);
|
||||
void SetBlockLight (const NIBBLETYPE * a_src);
|
||||
void SetSkyLight (const NIBBLETYPE * a_src);
|
||||
|
||||
private:
|
||||
|
||||
static const size_t CHUNK_SECTION_HEIGHT = 16;
|
||||
static const size_t CHUNK_SECTION_COUNT = (256 / CHUNK_SECTION_HEIGHT);
|
||||
|
||||
#if __cplusplus < 201103L
|
||||
// auto_ptr style interface for memory management
|
||||
mutable bool IsOwner;
|
||||
@ -266,7 +274,7 @@ private:
|
||||
NIBBLETYPE m_BlockSkyLight[CHUNK_SECTION_HEIGHT * 16 * 16 / 2];
|
||||
};
|
||||
|
||||
sChunkSection *m_Sections[CHUNK_SECTION_NUM];
|
||||
sChunkSection *m_Sections[CHUNK_SECTION_COUNT];
|
||||
|
||||
sChunkSection * Allocate() const;
|
||||
void Free(sChunkSection * ptr) const;
|
||||
|
@ -75,7 +75,7 @@ protected:
|
||||
{
|
||||
a_ChunkBuffer.CopyBlocks(m_BlockData);
|
||||
a_ChunkBuffer.CopyMeta(m_BlockData + cChunkDef::NumBlocks);
|
||||
a_ChunkBuffer.CopyLight(m_BlockData + 3 * cChunkDef::NumBlocks / 2);
|
||||
a_ChunkBuffer.CopyBlockLight(m_BlockData + 3 * cChunkDef::NumBlocks / 2);
|
||||
a_ChunkBuffer.CopySkyLight(m_BlockData + 2 * cChunkDef::NumBlocks);
|
||||
}
|
||||
};
|
||||
@ -98,7 +98,7 @@ protected:
|
||||
{
|
||||
a_ChunkBuffer.CopyBlocks(m_BlockTypes);
|
||||
a_ChunkBuffer.CopyMeta(m_BlockMetas);
|
||||
a_ChunkBuffer.CopyLight(m_BlockLight);
|
||||
a_ChunkBuffer.CopyBlockLight(m_BlockLight);
|
||||
a_ChunkBuffer.CopySkyLight(m_BlockSkyLight);
|
||||
}
|
||||
} ;
|
||||
|
@ -10,107 +10,77 @@ int main(int argc, char** argv)
|
||||
// Test first segment
|
||||
cChunkData buffer;
|
||||
|
||||
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];
|
||||
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
|
||||
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
|
||||
SrcNibbleBuffer[(6+1*16+2*16*16)/2] = 0xE;
|
||||
SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xE;
|
||||
buffer.SetMeta(SrcNibbleBuffer);
|
||||
testassert(buffer.GetMeta(6, 2, 1) == 0xE);
|
||||
delete SrcNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
|
||||
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);
|
||||
SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xE;
|
||||
buffer.SetBlockLight(SrcNibbleBuffer);
|
||||
testassert(buffer.GetBlockLight(6, 2, 1) == 0xE);
|
||||
delete SrcNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
|
||||
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
|
||||
SrcNibbleBuffer[(6+1*16+2*16*16)/2] = 0xE;
|
||||
SrcNibbleBuffer[(6 + (1 * 16) + (2 * 16 * 16)) / 2] = 0xE;
|
||||
buffer.SetSkyLight(SrcNibbleBuffer);
|
||||
testassert(buffer.GetSkyLight(6, 2, 1) == 0xE);
|
||||
delete SrcNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
}
|
||||
|
||||
{
|
||||
// test following segment
|
||||
cChunkData buffer;
|
||||
|
||||
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;
|
||||
|
||||
NIBBLETYPE * SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
|
||||
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
|
||||
SrcNibbleBuffer[(6+1*16+24*16*16)/2] = 0xE;
|
||||
SrcNibbleBuffer[(6 + (1 * 16) + (24 * 16 * 16)) / 2] = 0xE;
|
||||
buffer.SetMeta(SrcNibbleBuffer);
|
||||
testassert(buffer.GetMeta(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;
|
||||
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;
|
||||
}
|
||||
|
||||
{
|
||||
// test zeros
|
||||
cChunkData buffer;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -16,7 +16,7 @@ int main(int argc, char** argv)
|
||||
testassert(copy.GetBlock(3, 1, 4) == 0xDE);
|
||||
testassert(copy.GetMeta(3, 1, 4) == 0xA);
|
||||
|
||||
BLOCKTYPE * SrcBlockBuffer = new BLOCKTYPE[16 * 16 * 256];
|
||||
BLOCKTYPE SrcBlockBuffer[16 * 16 * 256];
|
||||
for (int i = 0; i < 16 * 16 * 256; i += 4)
|
||||
{
|
||||
SrcBlockBuffer[i+0] = 0xDE;
|
||||
@ -26,30 +26,20 @@ int main(int argc, char** argv)
|
||||
}
|
||||
|
||||
buffer.SetBlocks(SrcBlockBuffer);
|
||||
BLOCKTYPE * DstBlockBuffer = new BLOCKTYPE[16 * 16 * 256];
|
||||
BLOCKTYPE DstBlockBuffer[16 * 16 * 256];
|
||||
buffer.CopyBlocks(DstBlockBuffer);
|
||||
testassert(memcmp(SrcBlockBuffer, DstBlockBuffer, (16 * 16 * 256) - 1) == 0);
|
||||
delete SrcBlockBuffer;
|
||||
delete DstBlockBuffer;
|
||||
SrcBlockBuffer = NULL;
|
||||
DstBlockBuffer = NULL;
|
||||
|
||||
SrcBlockBuffer = new BLOCKTYPE[16 * 16 * 256];
|
||||
memset(SrcBlockBuffer, 0x00, 16 * 16 * 256);
|
||||
buffer.SetBlocks(SrcBlockBuffer);
|
||||
DstBlockBuffer = new BLOCKTYPE[16 * 16 * 256];
|
||||
buffer.CopyBlocks(DstBlockBuffer);
|
||||
testassert(memcmp(SrcBlockBuffer, DstBlockBuffer, (16 * 16 * 256) - 1) == 0);
|
||||
delete SrcBlockBuffer;
|
||||
delete DstBlockBuffer;
|
||||
SrcBlockBuffer = NULL;
|
||||
DstBlockBuffer = NULL;
|
||||
|
||||
}
|
||||
{
|
||||
cChunkData buffer;
|
||||
|
||||
NIBBLETYPE * SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
|
||||
for (int i = 0; i < 16 * 16 * 256 / 2; i += 4)
|
||||
{
|
||||
SrcNibbleBuffer[i+0] = 0xEF;
|
||||
@ -59,30 +49,21 @@ int main(int argc, char** argv)
|
||||
}
|
||||
|
||||
buffer.SetMeta(SrcNibbleBuffer);
|
||||
NIBBLETYPE * DstNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/ 2];
|
||||
NIBBLETYPE DstNibbleBuffer[16 * 16 * 256/ 2];
|
||||
buffer.CopyMeta(DstNibbleBuffer);
|
||||
testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
|
||||
delete SrcNibbleBuffer;
|
||||
delete DstNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
DstNibbleBuffer = NULL;
|
||||
|
||||
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
|
||||
buffer.SetMeta(SrcNibbleBuffer);
|
||||
DstNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/ 2];
|
||||
buffer.CopyMeta(DstNibbleBuffer);
|
||||
testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
|
||||
delete SrcNibbleBuffer;
|
||||
delete DstNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
DstNibbleBuffer = NULL;
|
||||
|
||||
|
||||
}
|
||||
{
|
||||
cChunkData buffer;
|
||||
|
||||
NIBBLETYPE * SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
|
||||
for (int i = 0; i < 16 * 16 * 256 / 2; i += 4)
|
||||
{
|
||||
SrcNibbleBuffer[i+0] = 0xDE;
|
||||
@ -91,32 +72,22 @@ int main(int argc, char** argv)
|
||||
SrcNibbleBuffer[i+3] = 0xEF;
|
||||
}
|
||||
|
||||
buffer.SetLight(SrcNibbleBuffer);
|
||||
NIBBLETYPE * DstNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/ 2];
|
||||
buffer.CopyLight(DstNibbleBuffer);
|
||||
buffer.SetBlockLight(SrcNibbleBuffer);
|
||||
NIBBLETYPE DstNibbleBuffer[16 * 16 * 256 / 2];
|
||||
buffer.CopyBlockLight(DstNibbleBuffer);
|
||||
testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 /2) - 1) == 0);
|
||||
delete SrcNibbleBuffer;
|
||||
delete DstNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
DstNibbleBuffer = NULL;
|
||||
|
||||
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 /2);
|
||||
buffer.SetLight(SrcNibbleBuffer);
|
||||
DstNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/ 2];
|
||||
buffer.CopyLight(DstNibbleBuffer);
|
||||
buffer.SetBlockLight(SrcNibbleBuffer);
|
||||
buffer.CopyBlockLight(DstNibbleBuffer);
|
||||
testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 /2) - 1) == 0);
|
||||
delete SrcNibbleBuffer;
|
||||
delete DstNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
DstNibbleBuffer = NULL;
|
||||
|
||||
|
||||
}
|
||||
{
|
||||
cChunkData buffer;
|
||||
|
||||
NIBBLETYPE * SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
|
||||
for (int i = 0; i < 16 * 16 * 256 / 2; i += 4)
|
||||
{
|
||||
SrcNibbleBuffer[i+0] = 0xAD;
|
||||
@ -126,68 +97,38 @@ int main(int argc, char** argv)
|
||||
}
|
||||
|
||||
buffer.SetSkyLight(SrcNibbleBuffer);
|
||||
NIBBLETYPE * DstNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/ 2];
|
||||
NIBBLETYPE DstNibbleBuffer[16 * 16 * 256/ 2];
|
||||
buffer.CopySkyLight(DstNibbleBuffer);
|
||||
testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
|
||||
delete SrcNibbleBuffer;
|
||||
delete DstNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
DstNibbleBuffer = NULL;
|
||||
|
||||
|
||||
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
memset(SrcNibbleBuffer, 0xFF, 16 * 16 * 256 / 2);
|
||||
buffer.SetSkyLight(SrcNibbleBuffer);
|
||||
DstNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/ 2];
|
||||
buffer.CopySkyLight(DstNibbleBuffer);
|
||||
testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
|
||||
delete SrcNibbleBuffer;
|
||||
delete DstNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
DstNibbleBuffer = NULL;
|
||||
|
||||
}
|
||||
{
|
||||
cChunkData buffer;
|
||||
|
||||
BLOCKTYPE * SrcBlockBuffer = new BLOCKTYPE[16 * 16 * 256];
|
||||
BLOCKTYPE SrcBlockBuffer[16 * 16 * 256];
|
||||
memset(SrcBlockBuffer, 0x00, 16 * 16 * 256);
|
||||
BLOCKTYPE * DstBlockBuffer = new BLOCKTYPE[16 * 16 * 256];
|
||||
BLOCKTYPE DstBlockBuffer[16 * 16 * 256];
|
||||
buffer.CopyBlocks(DstBlockBuffer);
|
||||
testassert(memcmp(SrcBlockBuffer, DstBlockBuffer, (16 * 16 * 256) - 1) == 0);
|
||||
delete SrcBlockBuffer;
|
||||
delete DstBlockBuffer;
|
||||
SrcBlockBuffer = NULL;
|
||||
DstBlockBuffer = NULL;
|
||||
|
||||
NIBBLETYPE * SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
NIBBLETYPE SrcNibbleBuffer[16 * 16 * 256 / 2];
|
||||
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
|
||||
NIBBLETYPE * DstNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/ 2];
|
||||
NIBBLETYPE DstNibbleBuffer[16 * 16 * 256 / 2];
|
||||
buffer.CopyMeta(DstNibbleBuffer);
|
||||
testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
|
||||
delete SrcNibbleBuffer;
|
||||
delete DstNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
DstNibbleBuffer = NULL;
|
||||
|
||||
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
memset(SrcNibbleBuffer, 0x00, 16 * 16 * 256 / 2);
|
||||
DstNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/ 2];
|
||||
buffer.CopyLight(DstNibbleBuffer);
|
||||
buffer.CopyBlockLight(DstNibbleBuffer);
|
||||
testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
|
||||
delete SrcNibbleBuffer;
|
||||
delete DstNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
DstNibbleBuffer = NULL;
|
||||
|
||||
SrcNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/2];
|
||||
memset(SrcNibbleBuffer, 0xFF, 16 * 16 * 256 / 2);
|
||||
DstNibbleBuffer = new NIBBLETYPE[16 * 16 * 256/ 2];
|
||||
buffer.CopySkyLight(DstNibbleBuffer);
|
||||
testassert(memcmp(SrcNibbleBuffer, DstNibbleBuffer, (16 * 16 * 256 / 2) - 1) == 0);
|
||||
delete SrcNibbleBuffer;
|
||||
delete DstNibbleBuffer;
|
||||
SrcNibbleBuffer = NULL;
|
||||
DstNibbleBuffer = NULL;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user