fixed oriented block occlusion check

[blank.git] / src / block.hpp

diff --git a/src/block.hpp b/src/block.hpp
index 1c1dddb10c3e4377f6e5d1b6617be38eedf00674..72954ce596a6b846c2b14e0ac8227064c3c7d792 100644 (file)
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -11,30 +11,82 @@
 
 namespace blank {
 
-/// attributes of a type of block
-struct BlockType {
+/// single 1x1x1 cube
+struct Block {
 
-       int id;
+       using Type = unsigned short;
+       using Pos = glm::vec3;
+
+       enum Face {
+               FACE_UP,
+               FACE_DOWN,
+               FACE_RIGHT,
+               FACE_LEFT,
+               FACE_FRONT,
+               FACE_BACK,
+               FACE_COUNT,
+       };
+       enum Turn {
+               TURN_NONE,
+               TURN_LEFT,
+               TURN_AROUND,
+               TURN_RIGHT,
+               TURN_COUNT,
+       };
+
+       Type type;
+       unsigned char orient;
+
+       constexpr explicit Block(Type type = 0, Face face = FACE_UP, Turn turn = TURN_NONE)
+       : type(type), orient(face * TURN_COUNT + turn) { }
+
+       const glm::mat4 &Transform() const;
+
+       Face GetFace() const { return Face(orient / 4); }
+       void SetFace(Face face) { orient = face * TURN_COUNT + GetTurn(); }
+       Turn GetTurn() const { return Turn(orient % 4); }
+       void SetTurn(Turn turn) { orient = GetFace() * TURN_COUNT + turn; }
+
+};
 
-       bool visible;
+
+/// attributes of a type of block
+struct BlockType {
 
        const Shape *shape;
        glm::vec3 color;
        glm::vec3 outline_color;
 
+       Block::Type id;
+
+       bool visible;
+
+       struct Faces {
+               bool face[Block::FACE_COUNT];
+               Faces &operator =(const Faces &other) {
+                       for (int i = 0; i < Block::FACE_COUNT; ++i) {
+                               face[i] = other.face[i];
+                       }
+                       return *this;
+               }
+               bool operator [](Block::Face f) const {
+                       return face[f];
+               }
+       } fill;
+
        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), shape(shape), color(color), outline_color(outline_color) { }
+               const Shape *shape = &DEFAULT_SHAPE
+       );
 
        static const NullShape DEFAULT_SHAPE;
 
+       bool FaceFilled(const Block &, Block::Face) const;
 
        void FillModel(
-               Model &m,
-               const glm::vec3 &pos_offset = { 0, 0, 0 },
+               Model::Buffer &m,
+               const glm::mat4 &transform = glm::mat4(1.0f),
                Model::Index idx_offset = 0
        ) const;
        void FillOutlineModel(
@@ -52,31 +104,18 @@ public:
        BlockTypeRegistry();
 
 public:
-       int Add(const BlockType &);
+       Block::Type 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]; }
+       BlockType *operator [](Block::Type id) { return &types[id]; }
+       const BlockType *Get(Block::Type id) const { return &types[id]; }
 
 private:
        std::vector<BlockType> types;
 
 };
 
-
-/// single 1x1x1 cube
-struct Block {
-
-       using Pos = glm::vec3;
-
-       int type;
-
-       constexpr explicit Block(int type = 0)
-       : type(type) { }
-
-};
-
 }
 
 #endif