X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.hpp;h=b5c4a29cc66688f9c7a10b0a9150c71122c37718;hb=3072e2cd49ad1614100d1a1c73afe6a4888fb875;hp=461da5623f5874c7fae25e9923359eaa29e4ead5;hpb=eca1fdcc8e34a4918418b2de122c6200aeb7ceaf;p=blank.git

diff --git a/src/world.hpp b/src/world.hpp
index 461da56..b5c4a29 100644
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -4,7 +4,7 @@
 #include "block.hpp"
 #include "chunk.hpp"
 #include "entity.hpp"
-#include "noise.hpp"
+#include "generator.hpp"
 #include "shader.hpp"
 #include "shape.hpp"
 
@@ -19,8 +19,6 @@ class World {
 public:
 	World();
 
-	void Generate(const Chunk::Pos &from, const Chunk::Pos &to);
-
 	bool Intersection(
 		const Ray &,
 		const glm::mat4 &M,
@@ -30,38 +28,28 @@ public:
 		glm::vec3 *normal = nullptr);
 
 	BlockTypeRegistry &BlockTypes() { return blockType; }
-	std::list<Chunk> &LoadedChunks() { return loaded; }
 
-	Entity &Player() { return player; }
+	Entity &Player() { return *player; }
+	Entity &AddEntity() { entities.emplace_back(); return entities.back(); }
 
-	Chunk *ChunkLoaded(const Chunk::Pos &);
-	Chunk *ChunkQueued(const Chunk::Pos &);
-	Chunk *ChunkAvailable(const Chunk::Pos &);
-	Chunk &Next(const Chunk &, const glm::tvec3<int> &dir);
+	Chunk &PlayerChunk();
+	Chunk &Next(const Chunk &to, 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;
-
-	Entity player;
-	Chunk::Pos player_chunk;
+	Generator generate;
+	ChunkLoader chunks;
 
-	std::list<Chunk> loaded;
-	std::list<Chunk> to_generate;
-	std::list<Chunk> to_free;
+	Entity *player;
+	std::list<Entity> entities;
 
 };