From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Wed, 11 Mar 2015 17:36:13 +0000 (+0100)
Subject: recycle chunks flagged for deletion
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=2d5671c2ef977defae9ce0ce7248582ab3e8f011;p=blank.git

recycle chunks flagged for deletion
---

diff --git a/src/chunk.cpp b/src/chunk.cpp
index 04c64f2..10031e7 100644
--- a/src/chunk.cpp
+++ b/src/chunk.cpp
@@ -161,9 +161,9 @@ struct ChunkLess {
 	explicit ChunkLess(const Chunk::Pos &base)
 	: base(base) { }
 
-	bool operator ()(const Chunk &a, const Chunk &b) const {
-		Chunk::Pos da(base - a.Position());
-		Chunk::Pos db(base - b.Position());
+	bool operator ()(const Chunk::Pos &a, const Chunk::Pos &b) const {
+		Chunk::Pos da(base - a);
+		Chunk::Pos db(base - b);
 		return
 			da.x * da.x + da.y * da.y + da.z * da.z <
 			db.x * db.x + db.y * db.y + db.z * db.z;
@@ -187,8 +187,7 @@ void ChunkLoader::Generate(const Chunk::Pos &from, const Chunk::Pos &to) {
 					loaded.back().Position(pos);
 					gen(loaded.back());
 				} else {
-					to_generate.emplace_back(reg);
-					to_generate.back().Position(pos);
+					to_generate.emplace_back(pos);
 				}
 			}
 		}
@@ -205,19 +204,17 @@ Chunk *ChunkLoader::Loaded(const Chunk::Pos &pos) {
 	return nullptr;
 }
 
-Chunk *ChunkLoader::Queued(const Chunk::Pos &pos) {
-	for (Chunk &chunk : to_generate) {
-		if (chunk.Position() == pos) {
-			return &chunk;
+bool ChunkLoader::Queued(const Chunk::Pos &pos) {
+	for (const Chunk::Pos &chunk : to_generate) {
+		if (chunk == pos) {
+			return true;
 		}
 	}
 	return nullptr;
 }
 
-Chunk *ChunkLoader::Known(const Chunk::Pos &pos) {
-	Chunk *chunk = Loaded(pos);
-	if (chunk) return chunk;
-
+bool ChunkLoader::Known(const Chunk::Pos &pos) {
+	if (Loaded(pos)) return true;
 	return Queued(pos);
 }
 
@@ -227,10 +224,11 @@ Chunk &ChunkLoader::ForceLoad(const Chunk::Pos &pos) {
 		return *chunk;
 	}
 
-	chunk = Queued(pos);
-	if (chunk) {
-		gen(*chunk);
-		return *chunk;
+	for (auto iter(to_generate.begin()), end(to_generate.end()); iter != end; ++iter) {
+		if (*iter == pos) {
+			to_generate.erase(iter);
+			break;
+		}
 	}
 
 	loaded.emplace_back(reg);
@@ -259,9 +257,9 @@ void ChunkLoader::Rebase(const Chunk::Pos &new_base) {
 	}
 	// abort far away queued chunks
 	for (auto iter(to_generate.begin()), end(to_generate.end()); iter != end;) {
-		if (std::abs(base.x - iter->Position().x) > unload_dist
-				|| std::abs(base.y - iter->Position().y) > unload_dist
-				|| std::abs(base.z - iter->Position().z) > unload_dist) {
+		if (std::abs(base.x - iter->x) > unload_dist
+				|| std::abs(base.y - iter->y) > unload_dist
+				|| std::abs(base.z - iter->z) > unload_dist) {
 			iter = to_generate.erase(iter);
 		} else {
 			++iter;
@@ -273,12 +271,32 @@ void ChunkLoader::Rebase(const Chunk::Pos &new_base) {
 }
 
 void ChunkLoader::Update() {
+	bool reused = false;
 	if (!to_generate.empty()) {
-		gen(to_generate.front());
-		loaded.splice(loaded.end(), to_generate, to_generate.begin());
+		Chunk::Pos pos(to_generate.front());
+
+		for (auto iter(to_free.begin()), end(to_free.end()); iter != end; ++iter) {
+			if (iter->Position() == pos) {
+				loaded.splice(loaded.end(), to_free, iter);
+				reused = true;
+				break;
+			}
+		}
+
+		if (!reused) {
+			if (to_free.empty()) {
+				loaded.emplace_back(reg);
+			} else {
+				loaded.splice(loaded.end(), to_free, to_free.begin());
+				reused = true;
+			}
+			loaded.back().Position(pos);
+			gen(loaded.back());
+		}
+		to_generate.pop_front();
 	}
 
-	if (!to_free.empty()) {
+	if (!reused && !to_free.empty()) {
 		to_free.pop_front();
 	}
 }
diff --git a/src/chunk.hpp b/src/chunk.hpp
index 61303aa..e442e4e 100644
--- a/src/chunk.hpp
+++ b/src/chunk.hpp
@@ -101,8 +101,8 @@ public:
 	std::list<Chunk> &Loaded() { return loaded; }
 
 	Chunk *Loaded(const Chunk::Pos &);
-	Chunk *Queued(const Chunk::Pos &);
-	Chunk *Known(const Chunk::Pos &);
+	bool Queued(const Chunk::Pos &);
+	bool Known(const Chunk::Pos &);
 	Chunk &ForceLoad(const Chunk::Pos &);
 
 	void Rebase(const Chunk::Pos &);
@@ -115,7 +115,7 @@ private:
 	const Generator &gen;
 
 	std::list<Chunk> loaded;
-	std::list<Chunk> to_generate;
+	std::list<Chunk::Pos> to_generate;
 	std::list<Chunk> to_free;
 
 	int load_dist;
diff --git a/src/generator.cpp b/src/generator.cpp
index 60708e0..15a15e0 100644
--- a/src/generator.cpp
+++ b/src/generator.cpp
@@ -10,6 +10,7 @@ Generator::Generator(unsigned int seed)
 , typeNoise(seed + 1)
 , stretch(64.0f)
 , solid_threshold(0.8f)
+, space(0)
 , solids() {
 
 }
@@ -28,6 +29,8 @@ void Generator::operator ()(Chunk &chunk) const {
 				if (val > solid_threshold) {
 					int type_val = int((typeNoise(gen_pos) + 1.0f) * solids.size()) % solids.size();
 					chunk.BlockAt(block_pos) = Block(solids[type_val]);
+				} else {
+					chunk.BlockAt(block_pos) = Block(space);
 				}
 			}
 		}
diff --git a/src/generator.hpp b/src/generator.hpp
index a40184b..9dc39cb 100644
--- a/src/generator.hpp
+++ b/src/generator.hpp
@@ -17,6 +17,7 @@ public:
 
 	void operator ()(Chunk &) const;
 
+	void Space(Block::Type t) { space = t; }
 	void Solids(const std::vector<Block::Type> &s) { solids = s; }
 
 private:
@@ -26,6 +27,7 @@ private:
 	float stretch;
 	float solid_threshold;
 
+	Block::Type space;
 	std::vector<Block::Type> solids;
 
 };
diff --git a/src/world.cpp b/src/world.cpp
index f14ac73..248685c 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -27,6 +27,7 @@ World::World()
 	blockType.Add(BlockType{ true, { 0.0f, 0.0f, 1.0f }, &stairShape }); // blue stair
 	blockType.Add(BlockType{ true, { 0.0f, 0.0f, 1.0f }, &slabShape }); // blue slab
 
+	generate.Space(0);
 	generate.Solids({ 1, 4, 7, 10 });
 
 	player.Position({ 4.0f, 4.0f, 4.0f });