reorganized block tables

[blank.git] / src / block.hpp

diff --git a/src/block.hpp b/src/block.hpp
index 1663c16aa0d4450f0cdc06d9e503d408c0350049..ab34a30d05f6e17370c69b76d3970389555f64c6 100644 (file)
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -17,10 +17,106 @@ struct Block {
        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,
+       };
+
+       static constexpr int ORIENT_COUNT = FACE_COUNT * 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 { return orient2transform[orient]; }
+
+       Face GetFace() const { return Face(orient / TURN_COUNT); }
+       void SetFace(Face face) { orient = face * TURN_COUNT + GetTurn(); }
+       Turn GetTurn() const { return Turn(orient % TURN_COUNT); }
+       void SetTurn(Turn turn) { orient = GetFace() * TURN_COUNT + turn; }
+
+       Face OrientedFace(Face f) const { return orient2face[orient][f]; }
+
+       static Face Opposite(Face f) {
+               return Face(f ^ 1);
+       }
+
+       static glm::tvec3<int> FaceNormal(Face face) {
+               return face2normal[face];
+       }
+
+       static Face NormalFace(const glm::vec3 &norm) {
+               const glm::vec3 anorm(abs(norm));
+               if (anorm.x > anorm.y) {
+                       if (anorm.x > anorm.z) {
+                               return norm.x > 0.0f ? FACE_RIGHT : FACE_LEFT;
+                       } else {
+                               return norm.z > 0.0f ? FACE_FRONT : FACE_BACK;
+                       }
+               } else {
+                       if (anorm.y > anorm.z) {
+                               return norm.y > 0.0f ? FACE_UP : FACE_DOWN;
+                       } else {
+                               return norm.z > 0.0f ? FACE_FRONT : FACE_BACK;
+                       }
+               }
+       }
+
+       struct FaceSet {
+
+               explicit FaceSet(unsigned char v = 0)
+               : value(v) { }
+
+               bool IsSet(Face f) const {
+                       return value & Mask(f);
+               }
+               void Set(Face f) {
+                       value |= Mask(f);
+               }
+               void Unset(Face f) {
+                       value |= ~Mask(f);
+               }
+
+               void Clear() {
+                       value = 0;
+               }
+               void Fill() {
+                       value = Mask(FACE_COUNT) - 1;
+               }
+
+               bool Empty() const {
+                       return value == 0;
+               }
+               bool All() const {
+                       return value == Mask(FACE_COUNT) - 1;
+               }
+
+               unsigned char Mask(Face f) const {
+                       return 1 << f;
+               }
+
+               unsigned char value;
+
+       };
 
-       constexpr explicit Block(Type type = 0)
-       : type(type) { }
+private:
+       static const glm::tvec3<int> face2normal[6];
+       static const glm::mat4 orient2transform[ORIENT_COUNT];
+       static const Face orient2face[ORIENT_COUNT][FACE_COUNT];
 
 };
 
@@ -28,29 +124,52 @@ struct Block {
 /// attributes of a type of block
 struct BlockType {
 
-       Block::Type id;
-
-       bool visible;
-
        const Shape *shape;
        glm::vec3 color;
        glm::vec3 outline_color;
 
+       Block::Type id;
+
+       int luminosity;
+
+       bool visible;
+       bool block_light;
+
+       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(0), 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, Block::Face face) const {
+               return fill[block.OrientedFace(face)];
+       }
 
        void FillModel(
                Model::Buffer &m,
-               const glm::vec3 &pos_offset = { 0, 0, 0 },
+               const glm::mat4 &transform = glm::mat4(1.0f),
                Model::Index idx_offset = 0
        ) const;
+       void FillBlockModel(
+               BlockModel::Buffer &m,
+               const glm::mat4 &transform = glm::mat4(1.0f),
+               BlockModel::Index idx_offset = 0
+       ) const;
        void FillOutlineModel(
                OutlineModel &m,
                const glm::vec3 &pos_offset = { 0, 0, 0 },