X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.hpp;h=461da5623f5874c7fae25e9923359eaa29e4ead5;hb=82426ae2997d2b21703d2d5afb631a84736e975f;hp=6b6aaf09c9d260492a3125313a0f32eac2112314;hpb=addf4eb6485a36d40096d87196ed786e6e16ab6d;p=blank.git

diff --git a/src/world.hpp b/src/world.hpp
index 6b6aaf0..461da56 100644
--- a/src/world.hpp
+++ b/src/world.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 &,
@@ -34,10 +34,10 @@ public:
 
 	Entity &Player() { return player; }
 
-	Chunk *ChunkLoaded(const glm::tvec3<int> &);
-	Chunk *ChunkQueued(const glm::tvec3<int> &);
-	Chunk *ChunkAvailable(const glm::tvec3<int> &);
-	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();
@@ -57,10 +57,11 @@ private:
 	SimplexNoise colorNoise;
 
 	Entity player;
-	glm::tvec3<int> player_chunk;
+	Chunk::Pos player_chunk;
 
 	std::list<Chunk> loaded;
 	std::list<Chunk> to_generate;
+	std::list<Chunk> to_free;
 
 };