X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FChunkLoader.hpp;h=7cc8dfca917cce00ad8234d9f4339126173f2c7f;hb=dbfcb12348b80e2582f710acb1e4ed0011889ba2;hp=b1d0c7b9e1e6272059b70f5f2920cb881c848f41;hpb=b7d09e1e35ef90282c97509e0020b20db3c7ea9f;p=blank.git

diff --git a/src/world/ChunkLoader.hpp b/src/world/ChunkLoader.hpp
index b1d0c7b..7cc8dfc 100644
--- a/src/world/ChunkLoader.hpp
+++ b/src/world/ChunkLoader.hpp
@@ -2,6 +2,7 @@
 #define BLANK_WORLD_CHUNKLOADER_HPP_
 
 #include "Chunk.hpp"
+#include "../app/IntervalTimer.hpp"
 
 #include <list>
 
@@ -10,6 +11,7 @@ namespace blank {
 
 class BlockTypeRegistry;
 class Generator;
+class WorldSave;
 
 class ChunkLoader {
 
@@ -17,38 +19,62 @@ public:
 	struct Config {
 		int load_dist = 6;
 		int unload_dist = 8;
+		int gen_limit = 16;
 	};
 
-	ChunkLoader(const Config &, const BlockTypeRegistry &, const Generator &) noexcept;
+	ChunkLoader(
+		const Config &,
+		const BlockTypeRegistry &,
+		const Generator &,
+		const WorldSave &
+	) noexcept;
 
-	void Generate(const Chunk::Pos &from, const Chunk::Pos &to);
-	void GenerateSurrounding(const Chunk::Pos &);
+	void Queue(const Chunk::Pos &from, const Chunk::Pos &to);
+	void QueueSurrounding(const Chunk::Pos &);
 
 	std::list<Chunk> &Loaded() noexcept { return loaded; }
+	const WorldSave &SaveFile() const noexcept { return save; }
 
 	Chunk *Loaded(const Chunk::Pos &) noexcept;
 	bool Queued(const Chunk::Pos &) noexcept;
 	bool Known(const Chunk::Pos &) noexcept;
 	Chunk &ForceLoad(const Chunk::Pos &);
 
+	bool OutOfRange(const Chunk &c) const noexcept { return OutOfRange(c.Position()); }
+	bool OutOfRange(const Chunk::Pos &) const noexcept;
+
 	void Rebase(const Chunk::Pos &);
-	void Update();
+	void Update(int dt);
+
+	std::size_t ToLoad() const noexcept { return to_load.size(); }
+	// returns true if the chunk was generated
+	bool LoadOne();
+	void LoadN(std::size_t n);
 
 private:
-	Chunk &Generate(const Chunk::Pos &pos);
+	Chunk &Load(const Chunk::Pos &pos);
+	// link given chunk to all loaded neighbors
 	void Insert(Chunk &) noexcept;
-	void Remove(Chunk &) noexcept;
+	// remove a loaded chunk
+	// this unlinks it from its neighbors as well as moves it to the free list
+	// given iterator must point to a chunk from the loaded list
+	// returns an iterator to the chunk following the removed one
+	// in the loaded list (end for the last one)
+	std::list<Chunk>::iterator Remove(std::list<Chunk>::iterator) noexcept;
 
 private:
 	Chunk::Pos base;
 
 	const BlockTypeRegistry &reg;
 	const Generator &gen;
+	const WorldSave &save;
 
 	std::list<Chunk> loaded;
-	std::list<Chunk::Pos> to_generate;
+	std::list<Chunk::Pos> to_load;
 	std::list<Chunk> to_free;
 
+	IntervalTimer gen_timer;
+
 	int load_dist;
 	int unload_dist;