split entity from controller

[blank.git] / src / world.hpp

diff --git a/src/world.hpp b/src/world.hpp
index 9f29ab4ee4ff09b579689765b96872a2eb5f8766..8ef2b21b2b05ee7d7106a8af536e0a2bf36e85b4 100644 (file)
--- a/src/world.hpp
+++ b/src/world.hpp
@@ -1,150 +1,25 @@
 #ifndef BLANK_WORLD_HPP_
 #define BLANK_WORLD_HPP_
 
-#include "model.hpp"
-#include "geometry.hpp"
+#include "block.hpp"
+#include "chunk.hpp"
+#include "entity.hpp"
+#include "noise.hpp"
+#include "shader.hpp"
+#include "shape.hpp"
 
 #include <list>
-#include <vector>
-#include <GL/glew.h>
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
-/// attributes of a type of block
-struct BlockType {
-
-       int id;
-
-       bool visible;
-       glm::vec3 color;
-
-       constexpr explicit BlockType(
-               bool v = false,
-               const glm::vec3 &color = { 1, 1, 1 })
-       : id(-1), visible(v), color(color) { }
-
-       static const BlockType DEFAULT;
-
-
-       void FillVBO(
-               const glm::vec3 &pos,
-               std::vector<glm::vec3> &vertices,
-               std::vector<glm::vec3> &colors,
-               std::vector<glm::vec3> &normals
-       ) const;
-
-       void FillModel(const glm::vec3 &pos, Model &m) const {
-               FillVBO(pos, m.vertices, m.colors, m.normals);
-       }
-
-};
-
-
-class BlockTypeRegistry {
-
-public:
-       BlockTypeRegistry();
-
-public:
-       int Add(const BlockType &);
-
-       BlockType *operator [](int id) { return &types[id]; }
-       const BlockType *Get(int id) const { return &types[id]; }
-
-private:
-       std::vector<BlockType> types;
-
-};
-
-
-/// single 1x1x1 cube
-struct Block {
-
-       const BlockType *type;
-
-       constexpr explicit Block(const BlockType *t = &BlockType::DEFAULT)
-       : type(t) { }
-
-};
-
-
-/// cube of size 16 (256 tiles, 4096 blocks)
-class Chunk {
-
-public:
-       Chunk();
-
-       Chunk(Chunk &&);
-       Chunk &operator =(Chunk &&);
-
-       static constexpr int Width() { return 16; }
-       static constexpr int Height() { return 16; }
-       static constexpr int Depth() { return 16; }
-       static glm::vec3 Extent() { return glm::vec3(Width(), Height(), Depth()); }
-       static constexpr int Size() { return Width() * Height() * Depth(); }
-
-       static constexpr bool InBounds(const glm::vec3 &pos) {
-               return
-                       pos.x >= 0 && pos.x < Width() &&
-                       pos.y >= 0 && pos.y < Height() &&
-                       pos.z >= 0 && pos.z < Depth();
-       }
-       static constexpr int ToIndex(const glm::vec3 &pos) {
-               return pos.x + pos.y * Width() + 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())
-               );
-       }
-
-       void Invalidate() { dirty = true; }
-
-       Block &BlockAt(int index) { return blocks[index]; }
-       const Block &BlockAt(int index) const { return blocks[index]; }
-       Block &BlockAt(const glm::vec3 &pos) { return BlockAt(ToIndex(pos)); }
-       const Block &BlockAt(const glm::vec3 &pos) const { return BlockAt(ToIndex(pos)); }
-
-       bool Intersection(
-               const Ray &,
-               const glm::mat4 &M,
-               int *blkid = nullptr,
-               float *dist = nullptr,
-               glm::vec3 *normal = nullptr) const;
-
-       void Position(const glm::vec3 &);
-       const glm::vec3 &Position() const { return position; }
-       const glm::mat4 &Transform() const { return transform; }
-
-       void Draw();
-
-private:
-       int VertexCount() const;
-       void Update();
-
-private:
-       std::vector<Block> blocks;
-       Model model;
-       glm::vec3 position;
-       glm::mat4 transform;
-       bool dirty;
-
-};
-
-
 class World {
 
 public:
        World();
 
-       void Generate();
+       void Generate(const glm::tvec3<int> &from, const glm::tvec3<int> &to);
 
        bool Intersection(
                const Ray &,
@@ -155,16 +30,32 @@ public:
                glm::vec3 *normal = nullptr);
 
        BlockTypeRegistry &BlockTypes() { return blockType; }
-       std::list<Chunk> &LoadedChunks() { return chunks; }
+       std::list<Chunk> &LoadedChunks() { return loaded; }
+
+       Entity &Player() { 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;
+
+       Entity player;
+
+       std::list<Chunk> loaded;
+       std::list<Chunk> to_generate;
 
 };