first attempt at world generation

[blank.git] / src / world.hpp

diff --git a/src/world.hpp b/src/world.hpp
index 9f29ab4ee4ff09b579689765b96872a2eb5f8766..ce44c7c1144352c4c31aedfb0505f86ea5317e05 100644 (file)
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -1,8 +1,10 @@
 #ifndef BLANK_WORLD_HPP_
 #define BLANK_WORLD_HPP_
 
-#include "model.hpp"
 #include "geometry.hpp"
+#include "model.hpp"
+#include "noise.hpp"
+#include "shape.hpp"
 
 #include <list>
 #include <vector>
@@ -18,14 +20,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 })
-       : id(-1), visible(v), color(color) { }
+               const glm::vec3 &color = { 1, 1, 1 },
+               const Shape *shape = &DEFAULT_SHAPE,
+               const glm::vec3 &outline_color = { -1, -1, -1 })
+       : id(-1), visible(v), shape(shape), color(color), outline_color(outline_color) { }
 
        static const BlockType DEFAULT;
+       static const NullShape DEFAULT_SHAPE;
 
 
        void FillVBO(
@@ -37,6 +45,18 @@ struct BlockType {
 
        void FillModel(const glm::vec3 &pos, Model &m) const {
                FillVBO(pos, m.vertices, m.colors, m.normals);
+               m.Invalidate();
+       }
+
+
+       void FillOutlineVBO(
+               std::vector<glm::vec3> &vertices,
+               std::vector<glm::vec3> &colors
+       ) const;
+
+       void FillOutlineModel(OutlineModel &m) const {
+               FillOutlineVBO(m.vertices, m.colors);
+               m.Invalidate();
        }
 
 };
@@ -50,6 +70,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]; }
 
@@ -92,16 +114,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())
                );
        }
 
@@ -164,6 +186,13 @@ private:
 
 private:
        BlockTypeRegistry blockType;
+       CuboidShape blockShape;
+       StairShape stairShape;
+       CuboidShape slabShape;
+
+       SimplexNoise blockNoise;
+       SimplexNoise colorNoise;
+
        std::list<Chunk> chunks;
 
 };