X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.hpp;h=4823c47b0c8c0ec804f62f10c5d83f4e5c2dbd04;hb=e70967c971f77a4ac0f5c074e6eb94bdd0e2b7ab;hp=60ec6f4dbeca36c1b7364f4834ad3cec54a3e3b7;hpb=804bde3fc09e4317eef629861638a68bfad3e343;p=blank.git

diff --git a/src/world.hpp b/src/world.hpp
index 60ec6f4..4823c47 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -3,8 +3,8 @@
 
 #include "block.hpp"
 #include "chunk.hpp"
-#include "controller.hpp"
-#include "noise.hpp"
+#include "entity.hpp"
+#include "generator.hpp"
 #include "shader.hpp"
 #include "shape.hpp"
 
@@ -19,7 +19,7 @@ class World {
 public:
 	World();
 
-	void Generate(const glm::tvec3<int> &from, const glm::tvec3<int> &to);
+	void Generate(const Chunk::Pos &from, const Chunk::Pos &to);
 
 	bool Intersection(
 		const Ray &,
@@ -32,30 +32,32 @@ public:
 	BlockTypeRegistry &BlockTypes() { return blockType; }
 	std::list<Chunk> &LoadedChunks() { return loaded; }
 
-	FPSController &Controller() { return player; }
+	Entity &Player() { return player; }
 
-	Chunk &Next(const Chunk &, const glm::vec3 &dir);
+	Chunk *ChunkLoaded(const Chunk::Pos &);
+	Chunk *ChunkQueued(const Chunk::Pos &);
+	Chunk *ChunkAvailable(const Chunk::Pos &);
+	Chunk &Next(const Chunk &, const glm::tvec3<int> &dir);
 
 	void Update(int dt);
+	void CheckChunkGeneration();
 
 	void Render(DirectionalLighting &);
 
-private:
-	void Generate(Chunk &);
-
 private:
 	BlockTypeRegistry blockType;
 	CuboidShape blockShape;
 	StairShape stairShape;
 	CuboidShape slabShape;
 
-	SimplexNoise blockNoise;
-	SimplexNoise colorNoise;
+	Generator generate;
 
-	FPSController player;
+	Entity player;
+	Chunk::Pos player_chunk;
 
 	std::list<Chunk> loaded;
 	std::list<Chunk> to_generate;
+	std::list<Chunk> to_free;
 
 };