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

Fixed a bug in writting zeros to a non-allocated section

Browse Source
This commit is contained in:
Tycho 2014-05-11 15:52:02 +01:00
parent 009f749962
commit 9278bb732d
3 changed files with 134 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ChunkBuffer.cpp
View File

@ -295,3 +295,14 @@ void cChunkBuffer::Free(cChunkBuffer::sChunkSection * ptr) const
void cChunkBuffer::ZeroSection(cChunkBuffer::sChunkSection * ptr) const
{
memset(ptr->m_BlockTypes,0x00,sizeof(ptr->m_BlockTypes));
memset(ptr->m_BlockMeta,0x00,sizeof(ptr->m_BlockMeta));
memset(ptr->m_BlockLight,0x00,sizeof(ptr->m_BlockLight));
memset(ptr->m_BlockSkyLight,0x00,sizeof(ptr->m_BlockSkyLight));
}

12
src/ChunkBuffer.h
View File

@ -121,12 +121,17 @@ public:
int Section = a_RelY / CHUNK_SECTION_HEIGHT; int Section = a_RelY / CHUNK_SECTION_HEIGHT;
if(!m_Sections[Section]) if(!m_Sections[Section])
{ {
if(a_Block == 0x00)
{
return;
}
m_Sections[Section] = Allocate(); m_Sections[Section] = Allocate();
if(!m_Sections[Section]) if(!m_Sections[Section])
{ {
ASSERT(!"Failed to allocate a new section in Chunkbuffer"); ASSERT(!"Failed to allocate a new section in Chunkbuffer");
return; return;
} }
ZeroSection(m_Sections[Section]);
} }
int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ); int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ);
m_Sections[Section]->m_BlockTypes[Index] = a_Block; m_Sections[Section]->m_BlockTypes[Index] = a_Block;
@ -166,12 +171,17 @@ public:
int Section = a_RelY / CHUNK_SECTION_HEIGHT; int Section = a_RelY / CHUNK_SECTION_HEIGHT;
if(!m_Sections[Section]) if(!m_Sections[Section])
{ {
if((a_Nibble & 0xf) == 0x00)
{
return;
}
m_Sections[Section] = Allocate(); m_Sections[Section] = Allocate();
if(!m_Sections[Section]) if(!m_Sections[Section])
{ {
ASSERT(!"Failed to allocate a new section in Chunkbuffer"); ASSERT(!"Failed to allocate a new section in Chunkbuffer");
return; return;
} }
ZeroSection(m_Sections[Section]);
} }
int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ); int Index = cChunkDef::MakeIndexNoCheck(a_RelX, a_RelY - (Section * CHUNK_SECTION_HEIGHT), a_RelZ);
m_Sections[Section]->m_BlockMeta[Index / 2] = static_cast<NIBBLETYPE>( m_Sections[Section]->m_BlockMeta[Index / 2] = static_cast<NIBBLETYPE>(
@ -247,6 +257,8 @@ private:
sChunkSection * Allocate() const; sChunkSection * Allocate() const;
void Free(sChunkSection * ptr) const; void Free(sChunkSection * ptr) const;
void ZeroSection(sChunkSection * ptr) const;
}; };

204
tests/ChunkBuffer/Coordinates.cpp
View File

@ -6,101 +6,119 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
cChunkBuffer buffer; {
cChunkBuffer buffer;
// 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
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
CheckAsserts(
buffer.GetBlock(-1, 0, 0);
);
CheckAsserts(
buffer.GetBlock(0, -1, 0);
);
CheckAsserts(
buffer.GetBlock(0, 0, -1);
);
CheckAsserts(
buffer.GetBlock(256, 0, 0);
);
CheckAsserts(
buffer.GetBlock(0, 256, 0);
);
CheckAsserts(
buffer.GetBlock(0, 0, 256);
);
// Out of Range
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);
);
// Out of Range
CheckAsserts(
buffer.GetMeta(-1, 0, 0);
);
CheckAsserts(
buffer.GetMeta(0, -1, 0);
);
CheckAsserts(
buffer.GetMeta(0, 0, -1);
);
CheckAsserts(
buffer.GetMeta(256, 0, 0);
);
CheckAsserts(
buffer.GetMeta(0, 256, 0);
);
CheckAsserts(
buffer.GetMeta(0, 0, 256);
);
}
// Empty chunks {
buffer.SetBlock(0,0,0, 0xAB); cChunkBuffer buffer;
testassert(buffer.GetBlock(0,0,0) == 0xAB);
buffer.SetMeta(0,16,0, 0xC); // Zero's
testassert(buffer.GetMeta(0,16,0) == 0xC); 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);
}
// 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
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
CheckAsserts(
buffer.GetBlock(-1, 0, 0);
);
CheckAsserts(
buffer.GetBlock(0, -1, 0);
);
CheckAsserts(
buffer.GetBlock(0, 0, -1);
);
CheckAsserts(
buffer.GetBlock(256, 0, 0);
);
CheckAsserts(
buffer.GetBlock(0, 256, 0);
);
CheckAsserts(
buffer.GetBlock(0, 0, 256);
);
// Out of Range
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);
);
// Out of Range
CheckAsserts(
buffer.GetMeta(-1, 0, 0);
);
CheckAsserts(
buffer.GetMeta(0, -1, 0);
);
CheckAsserts(
buffer.GetMeta(0, 0, -1);
);
CheckAsserts(
buffer.GetMeta(256, 0, 0);
);
CheckAsserts(
buffer.GetMeta(0, 256, 0);
);
CheckAsserts(
buffer.GetMeta(0, 0, 256);
);
return 0; return 0;
} }