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

diff --git a/src/world.hpp b/src/world.hpp
index 60ec6f4..ccd743d 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -3,12 +3,11 @@
 
 #include "block.hpp"
 #include "chunk.hpp"
-#include "controller.hpp"
-#include "noise.hpp"
+#include "entity.hpp"
+#include "generator.hpp"
 #include "shader.hpp"
 #include "shape.hpp"
 
-#include <list>
 #include <glm/glm.hpp>
 
 
@@ -19,8 +18,6 @@ class World {
 public:
 	World();
 
-	void Generate(const glm::tvec3<int> &from, const glm::tvec3<int> &to);
-
 	bool Intersection(
 		const Ray &,
 		const glm::mat4 &M,
@@ -30,32 +27,25 @@ public:
 		glm::vec3 *normal = nullptr);
 
 	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 &Next(const Chunk &to, const glm::tvec3<int> &dir);
 
 	void Update(int dt);
 
 	void Render(DirectionalLighting &);
 
-private:
-	void Generate(Chunk &);
-
 private:
 	BlockTypeRegistry blockType;
 	CuboidShape blockShape;
 	StairShape stairShape;
 	CuboidShape slabShape;
 
-	SimplexNoise blockNoise;
-	SimplexNoise colorNoise;
-
-	FPSController player;
+	Generator generate;
+	ChunkLoader chunks;
 
-	std::list<Chunk> loaded;
-	std::list<Chunk> to_generate;
+	Entity player;
 
 };