limit number of chunks generated per frame

[blank.git] / src / world.hpp

diff --git a/src/world.hpp b/src/world.hpp
index ce44c7c1144352c4c31aedfb0505f86ea5317e05..6f639156e92a2c3f1fb3d029174477dbf567be0c 100644 (file)
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -1,9 +1,11 @@
 #ifndef BLANK_WORLD_HPP_
 #define BLANK_WORLD_HPP_
 
+#include "controller.hpp"
 #include "geometry.hpp"
 #include "model.hpp"
 #include "noise.hpp"
+#include "shader.hpp"
 #include "shape.hpp"
 
 #include <list>
@@ -166,7 +168,7 @@ class World {
 public:
        World();
 
-       void Generate();
+       void Generate(const glm::tvec3<int> &from, const glm::tvec3<int> &to);
 
        bool Intersection(
                const Ray &,
@@ -177,12 +179,18 @@ public:
                glm::vec3 *normal = nullptr);
 
        BlockTypeRegistry &BlockTypes() { return blockType; }
-       std::list<Chunk> &LoadedChunks() { return chunks; }
+       std::list<Chunk> &LoadedChunks() { return loaded; }
+
+       FPSController &Controller() { return player; }
 
        Chunk &Next(const Chunk &, const glm::vec3 &dir);
 
+       void Update(int dt);
+
+       void Render(DirectionalLighting &);
+
 private:
-       Chunk &Generate(const glm::vec3 &);
+       void Generate(Chunk &);
 
 private:
        BlockTypeRegistry blockType;
@@ -193,7 +201,10 @@ private:
        SimplexNoise blockNoise;
        SimplexNoise colorNoise;
 
-       std::list<Chunk> chunks;
+       FPSController player;
+
+       std::list<Chunk> loaded;
+       std::list<Chunk> to_generate;
 
 };