limit number of chunks generated per frame

[blank.git] / src / world.hpp

diff --git a/src/world.hpp b/src/world.hpp
index 9fb07798c3f976569d4052cb916dc359d702adca..6f639156e92a2c3f1fb3d029174477dbf567be0c 100644 (file)
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -1,8 +1,12 @@
 #ifndef BLANK_WORLD_HPP_
 #define BLANK_WORLD_HPP_
 
-#include "model.hpp"
+#include "controller.hpp"
 #include "geometry.hpp"
+#include "model.hpp"
+#include "noise.hpp"
+#include "shader.hpp"
+#include "shape.hpp"
 
 #include <list>
 #include <vector>
@@ -18,16 +22,20 @@ struct BlockType {
        int id;
 
        bool visible;
+
+       const Shape *shape;
        glm::vec3 color;
        glm::vec3 outline_color;
 
-       constexpr explicit BlockType(
+       explicit BlockType(
                bool v = false,
                const glm::vec3 &color = { 1, 1, 1 },
+               const Shape *shape = &DEFAULT_SHAPE,
                const glm::vec3 &outline_color = { -1, -1, -1 })
-       : id(-1), visible(v), color(color), outline_color(outline_color) { }
+       : id(-1), visible(v), shape(shape), color(color), outline_color(outline_color) { }
 
        static const BlockType DEFAULT;
+       static const NullShape DEFAULT_SHAPE;
 
 
        void FillVBO(
@@ -64,6 +72,8 @@ public:
 public:
        int Add(const BlockType &);
 
+       size_t Size() const { return types.size(); }
+
        BlockType *operator [](int id) { return &types[id]; }
        const BlockType *Get(int id) const { return &types[id]; }
 
@@ -106,16 +116,16 @@ public:
                        pos.z >= 0 && pos.z < Depth();
        }
        static constexpr int ToIndex(const glm::vec3 &pos) {
-               return pos.x + pos.y * Width() + pos.z * Width() * Height();
+               return int(pos.x) + int(pos.y) * Width() + int(pos.z) * Width() * Height();
        }
        static constexpr bool InBounds(int idx) {
                return idx >= 0 && idx < Size();
        }
        static glm::vec3 ToCoords(int idx) {
                return glm::vec3(
-                       idx % Width(),
-                       (idx / Width()) % Height(),
-                       idx / (Width() * Height())
+                       0.5f + idx % Width(),
+                       0.5f + (idx / Width()) % Height(),
+                       0.5f + idx / (Width() * Height())
                );
        }
 
@@ -158,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 &,
@@ -169,16 +179,32 @@ 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;
-       std::list<Chunk> chunks;
+       CuboidShape blockShape;
+       StairShape stairShape;
+       CuboidShape slabShape;
+
+       SimplexNoise blockNoise;
+       SimplexNoise colorNoise;
+
+       FPSController player;
+
+       std::list<Chunk> loaded;
+       std::list<Chunk> to_generate;
 
 };