Revert "优化更新区块列表"

This reverts commit f731106.
HaokeyoFry · Oct 24, 2015 · 07badfb · 07badfb
1 parent 5b80779
commit 07badfb
Show file tree

Hide file tree

Showing 13 changed files with 176 additions and 267 deletions.
diff --git a/source/Chunk.cpp b/source/Chunk.cpp
@@ -31,8 +31,8 @@ namespace world{
 		delete[] pbrightness;
 		pblocks = nullptr;
 		pbrightness = nullptr;
-		//updated = false;
-		unloadedChunksCounter++;
+		updated = false;
+		unloadedChunks++;
 	}
 
 	void chunk::build(){
@@ -104,8 +104,7 @@ namespace world{
 		build();
 #endif
 		if (Empty)destroy();
-		//else updated = true;
-		else world::setChunkUpdated(cx, cy, cz);
+		else updated = true;
 	}
 
 	void chunk::Unload(){
@@ -133,8 +132,8 @@ namespace world{
 		file.close();
 	}
 
-	bool chunk::buildRender(){
-		if (Empty) return false;
+	void chunk::buildRender(){
+		if (Empty) return;
 #ifdef NEWORLD_DEBUG_CONSOLE_OUTPUT
 		if (pblocks == nullptr || pbrightness == nullptr){
 			DebugWarning("Empty pointer when building vertex buffers!");
@@ -147,14 +146,14 @@ namespace world{
 			for (y = -1; y <= 1; y++) {
 				for (z = -1; z <= 1; z++) {
 					if (x == 0 && y == 0 && z == 0) continue;
-					if (chunkOutOfBound(cx + x, cy + y, cz + z)) continue;
-					if (!chunkLoaded(cx + x, cy + y, cz + z)) return false;
+					if (chunkOutOfBound(cx + x, cy + y, cz + z))  continue;
+					if (!chunkLoaded(cx + x, cy + y, cz + z)) return;
 				}
 			}
 		}
 
-		//rebuiltChunksCounter++;
-		updatedChunksCounter++;
+		rebuiltChunks++;
+		updatedChunks++;
 
 		if (renderBuilt == false){
 			renderBuilt = true;
@@ -196,9 +195,8 @@ namespace world{
 			}
 		}
 		renderer::Flush(vbuffer[2], vertexes[2]);
-		//updated = false;
+		updated = false;
 
-		return true;
 	}
 
 	void chunk::destroyRender(){

diff --git a/source/Chunk.h b/source/Chunk.h
@@ -8,7 +8,7 @@ namespace world{
 	extern string worldname;
 	extern brightness BRIGHTNESSMIN;
 	extern brightness skylight;
-	
+
 	class chunk{
 
 	private:
@@ -46,7 +46,7 @@ namespace world{
 		}
 		void LoadFromFile();
 		void SaveToFile();
-		bool buildRender();
+		void buildRender();
 		void destroyRender();
 
 		inline block getblock(int x, int y, int z) {

diff --git a/source/Definitions.h b/source/Definitions.h
@@ -6,13 +6,12 @@
 
 /*
 #define NEWORLD_COMPILE_DISABLE_SECURE
+#ifndef nullptr
 #define nullptr NULL
-#ifndef M_PI
-#define M_PI 3.14159265898
 #endif
 */
 
-//#define NEWORLD_DEBUG
+#define NEWORLD_DEBUG
 #ifdef NEWORLD_DEBUG
 #define NEWORLD_DEBUG_CONSOLE_OUTPUT
 #define NEWORLD_DEBUG_NO_FILEIO