Use Z for up (Part 6)

Fix neighbouring chunks list on the server side, which was causing some slices of trees to appear in the air. Also switch order of loops for generating leaves to Z, Y, X.
Unarelith · Feb 21, 2020 · 2a8125a · 2a8125a
1 parent c8b5d94
commit 2a8125a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/source/world/ServerWorld.cpp b/server/source/world/ServerWorld.cpp
@@ -53,10 +53,10 @@ void ServerWorld::createChunkNeighbours(ServerChunk *chunk) {
 	gk::Vector3i surroundingChunks[6] = {
 		{chunk->x() - 1, chunk->y(),     chunk->z()},
 		{chunk->x() + 1, chunk->y(),     chunk->z()},
-		{chunk->x(),     chunk->y(),     chunk->z() - 1},
-		{chunk->x(),     chunk->y(),     chunk->z() + 1},
 		{chunk->x(),     chunk->y() - 1, chunk->z()},
 		{chunk->x(),     chunk->y() + 1, chunk->z()},
+		{chunk->x(),     chunk->y(),     chunk->z() - 1},
+		{chunk->x(),     chunk->y(),     chunk->z() + 1},
 	};
 
 	for (u8 i = 0 ; i < 6 ; ++i) {

diff --git a/server/source/world/TerrainGenerator.cpp b/server/source/world/TerrainGenerator.cpp
@@ -82,9 +82,9 @@ void TerrainGenerator::fastNoiseGeneration(ServerChunk &chunk) const {
 						}
 
 						// Leaves
-						for(int ix = -3 ; ix <= 3 ; ix++) {
+						for(int iz = -3 ; iz <= 3 ; iz++) {
 							for(int iy = -3 ; iy <= 3 ; iy++) {
-								for(int iz = -3 ; iz <= 3 ; iz++) {
+								for(int ix = -3 ; ix <= 3 ; ix++) {
 									if(ix * ix + iy * iy + iz * iz < 8 + (rand() & 1) && !chunk.getBlock(x + ix, y + iy, z + h + iz)) {
 										chunk.setBlockRaw(x + ix, y + iy, z + h + iz, m_leavesBlockID);