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

cWorldGenerator speedup - doesn't call GetChunk() anymore, not queueing the chunk it's generating to be loaded recursively.

Browse Source 
cChunk fix - setting a block to the same value doesn't mark chunk dirty (resulted in un-unloadable chunks)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@279 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-02-16 17:45:26 +00:00
parent 008addf5d7
commit 2928cb6853
11 changed files with 82 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/cWorldGenerator.cpp
View File

@@ -14,7 +14,8 @@
cWorldGenerator::cWorldGenerator()
cWorldGenerator::cWorldGenerator(cWorld * a_World) :
m_World(a_World)
{
}
@@ -30,15 +31,19 @@ cWorldGenerator::~cWorldGenerator()
void cWorldGenerator::GenerateChunk( cChunkPtr a_Chunk )
void cWorldGenerator::GenerateChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ)
{
assert(!a_Chunk->IsValid());
// TODO: use a raw char array instead of the entire chunk, then set it as chunk's blockdata
memset(a_Chunk->pGetBlockData(), 0, cChunk::c_BlockDataSize);
GenerateTerrain( a_Chunk );
GenerateFoliage( a_Chunk );
a_Chunk->CalculateHeightmap();
a_Chunk->CalculateLighting();
cChunkPtr Chunk = m_World->GetChunkNoGen(a_ChunkX, a_ChunkY, a_ChunkZ);
assert(!Chunk->IsValid());
memset(Chunk->pGetBlockData(), 0, cChunk::c_BlockDataSize);
GenerateTerrain(Chunk);
GenerateFoliage(Chunk);
Chunk->CalculateHeightmap();
Chunk->CalculateLighting();
Chunk->SetValid();
}