reorganized block tables

diff --git a/src/block.cpp b/src/block.cpp
index dea52672359cc61c4756fbf826b90196320b8a2f..b63b82fb22287bfd4c3513c94ce92655e4073ca7 100644 (file)
--- a/src/block.cpp
+++ b/src/block.cpp
@@ -8,42 +8,6 @@
 
 namespace blank {
 
-namespace {
-
-const glm::mat4 block_transforms[Block::FACE_COUNT * Block::TURN_COUNT] = {
-       {  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1, }, // face: up,    turn: none
-       {  0,  0, -1,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1, }, // face: up,    turn: left
-       { -1,  0,  0,  0,  0,  1,  0,  0,  0,  0, -1,  0,  0,  0,  0,  1, }, // face: up,    turn: around
-       {  0,  0,  1,  0,  0,  1,  0,  0, -1,  0,  0,  0,  0,  0,  0,  1, }, // face: up,    turn: right
-       {  1,  0,  0,  0,  0, -1,  0,  0,  0,  0, -1,  0,  0,  0,  0,  1, }, // face: down,  turn: none
-       {  0,  0, -1,  0,  0, -1,  0,  0, -1,  0,  0,  0,  0,  0,  0,  1, }, // face: down,  turn: left
-       { -1,  0,  0,  0,  0, -1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1, }, // face: down,  turn: around
-       {  0,  0,  1,  0,  0, -1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1, }, // face: down,  turn: right
-       {  0, -1,  0,  0,  1,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1, }, // face: right, turn: none
-       {  0, -1,  0,  0,  0,  0, -1,  0,  1,  0,  0,  0,  0,  0,  0,  1, }, // face: right, turn: left
-       {  0, -1,  0,  0, -1,  0,  0,  0,  0,  0, -1,  0,  0,  0,  0,  1, }, // face: right, turn: around
-       {  0, -1,  0,  0,  0,  0,  1,  0, -1,  0,  0,  0,  0,  0,  0,  1, }, // face: right, turn: right
-       {  0,  1,  0,  0, -1,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1, }, // face: left,  turn: none
-       {  0,  1,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  1, }, // face: left,  turn: left
-       {  0,  1,  0,  0,  1,  0,  0,  0,  0,  0, -1,  0,  0,  0,  0,  1, }, // face: left,  turn: around
-       {  0,  1,  0,  0,  0,  0, -1,  0, -1,  0,  0,  0,  0,  0,  0,  1, }, // face: left,  turn: right
-       {  1,  0,  0,  0,  0,  0,  1,  0,  0, -1,  0,  0,  0,  0,  0,  1, }, // face: front, turn: none
-       {  0,  0, -1,  0,  1,  0,  0,  0,  0, -1,  0,  0,  0,  0,  0,  1, }, // face: front, turn: left
-       { -1,  0,  0,  0,  0,  0, -1,  0,  0, -1,  0,  0,  0,  0,  0,  1, }, // face: front, turn: around
-       {  0,  0,  1,  0, -1,  0,  0,  0,  0, -1,  0,  0,  0,  0,  0,  1, }, // face: front, turn: right
-       {  1,  0,  0,  0,  0,  0, -1,  0,  0,  1,  0,  0,  0,  0,  0,  1, }, // face: back,  turn: none
-       {  0,  0, -1,  0, -1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  1, }, // face: back,  turn: left
-       { -1,  0,  0,  0,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  1, }, // face: back,  turn: around
-       {  0,  0,  1,  0,  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  1, }, // face: back,  turn: right
-};
-
-}
-
-const glm::mat4 &Block::Transform() const {
-       return block_transforms[orient];
-}
-
-
 const NullShape BlockType::DEFAULT_SHAPE;
 
 BlockType::BlockType(bool v, const glm::vec3 &col, const Shape *s)
@@ -58,41 +22,6 @@ BlockType::BlockType(bool v, const glm::vec3 &col, const Shape *s)
 
 }
 
-namespace {
-
-const Block::Face face_map[Block::FACE_COUNT * Block::TURN_COUNT][Block::FACE_COUNT] = {
-       { Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_RIGHT, Block::FACE_LEFT,  Block::FACE_FRONT, Block::FACE_BACK,  }, // face: up,    turn: none
-       { Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_FRONT, Block::FACE_BACK,  Block::FACE_LEFT,  Block::FACE_RIGHT, }, // face: up,    turn: left
-       { Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_LEFT,  Block::FACE_RIGHT, Block::FACE_BACK,  Block::FACE_FRONT, }, // face: up,    turn: around
-       { Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_BACK,  Block::FACE_FRONT, Block::FACE_RIGHT, Block::FACE_LEFT,  }, // face: up,    turn: right
-       { Block::FACE_DOWN,  Block::FACE_UP,    Block::FACE_RIGHT, Block::FACE_LEFT,  Block::FACE_BACK,  Block::FACE_FRONT, }, // face: down,  turn: none
-       { Block::FACE_DOWN,  Block::FACE_UP,    Block::FACE_BACK,  Block::FACE_FRONT, Block::FACE_LEFT,  Block::FACE_RIGHT, }, // face: down,  turn: left
-       { Block::FACE_DOWN,  Block::FACE_UP,    Block::FACE_LEFT,  Block::FACE_RIGHT, Block::FACE_FRONT, Block::FACE_BACK,  }, // face: down,  turn: around
-       { Block::FACE_DOWN,  Block::FACE_UP,    Block::FACE_FRONT, Block::FACE_BACK,  Block::FACE_RIGHT, Block::FACE_LEFT,  }, // face: down,  turn: right
-       { Block::FACE_LEFT,  Block::FACE_RIGHT, Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_FRONT, Block::FACE_BACK,  }, // face: right, turn: none
-       { Block::FACE_LEFT,  Block::FACE_RIGHT, Block::FACE_FRONT, Block::FACE_BACK,  Block::FACE_DOWN,  Block::FACE_UP,    }, // face: right, turn: left
-       { Block::FACE_LEFT,  Block::FACE_RIGHT, Block::FACE_DOWN,  Block::FACE_UP,    Block::FACE_BACK,  Block::FACE_FRONT, }, // face: right, turn: around
-       { Block::FACE_LEFT,  Block::FACE_RIGHT, Block::FACE_BACK,  Block::FACE_FRONT, Block::FACE_UP,    Block::FACE_DOWN,  }, // face: right, turn: right
-       { Block::FACE_RIGHT, Block::FACE_LEFT,  Block::FACE_DOWN,  Block::FACE_UP,    Block::FACE_FRONT, Block::FACE_BACK,  }, // face: left,  turn: none
-       { Block::FACE_RIGHT, Block::FACE_LEFT,  Block::FACE_FRONT, Block::FACE_BACK,  Block::FACE_UP,    Block::FACE_DOWN,  }, // face: left,  turn: left
-       { Block::FACE_RIGHT, Block::FACE_LEFT,  Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_BACK,  Block::FACE_FRONT, }, // face: left,  turn: around
-       { Block::FACE_RIGHT, Block::FACE_LEFT,  Block::FACE_BACK,  Block::FACE_FRONT, Block::FACE_DOWN,  Block::FACE_UP,    }, // face: left,  turn: right
-       { Block::FACE_BACK,  Block::FACE_FRONT, Block::FACE_RIGHT, Block::FACE_LEFT,  Block::FACE_UP,    Block::FACE_DOWN,  }, // face: front, turn: none
-       { Block::FACE_BACK,  Block::FACE_FRONT, Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_LEFT,  Block::FACE_RIGHT, }, // face: front, turn: left
-       { Block::FACE_BACK,  Block::FACE_FRONT, Block::FACE_LEFT,  Block::FACE_RIGHT, Block::FACE_DOWN,  Block::FACE_UP,    }, // face: front, turn: around
-       { Block::FACE_BACK,  Block::FACE_FRONT, Block::FACE_DOWN,  Block::FACE_UP,    Block::FACE_RIGHT, Block::FACE_LEFT,  }, // face: front, turn: right
-       { Block::FACE_FRONT, Block::FACE_BACK,  Block::FACE_RIGHT, Block::FACE_LEFT,  Block::FACE_DOWN,  Block::FACE_UP,    }, // face: back,  turn: none
-       { Block::FACE_FRONT, Block::FACE_BACK,  Block::FACE_DOWN,  Block::FACE_UP,    Block::FACE_LEFT,  Block::FACE_RIGHT, }, // face: back,  turn: left
-       { Block::FACE_FRONT, Block::FACE_BACK,  Block::FACE_LEFT,  Block::FACE_RIGHT, Block::FACE_UP,    Block::FACE_DOWN,  }, // face: back,  turn: around
-       { Block::FACE_FRONT, Block::FACE_BACK,  Block::FACE_UP,    Block::FACE_DOWN,  Block::FACE_RIGHT, Block::FACE_LEFT,  }, // face: back,  turn: right
-};
-
-}
-
-bool BlockType::FaceFilled(const Block &block, Block::Face face) const {
-       return fill[face_map[block.orient][face]];
-}
-
 void BlockType::FillModel(
        Model::Buffer &buf,
        const glm::mat4 &transform,
@@ -132,4 +61,68 @@ Block::Type BlockTypeRegistry::Add(const BlockType &t) {
        return id;
 }
 
+
+const glm::mat4 Block::orient2transform[ORIENT_COUNT] = {
+       {  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1, }, // face: up,    turn: none
+       {  0,  0, -1,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1, }, // face: up,    turn: left
+       { -1,  0,  0,  0,  0,  1,  0,  0,  0,  0, -1,  0,  0,  0,  0,  1, }, // face: up,    turn: around
+       {  0,  0,  1,  0,  0,  1,  0,  0, -1,  0,  0,  0,  0,  0,  0,  1, }, // face: up,    turn: right
+       {  1,  0,  0,  0,  0, -1,  0,  0,  0,  0, -1,  0,  0,  0,  0,  1, }, // face: down,  turn: none
+       {  0,  0, -1,  0,  0, -1,  0,  0, -1,  0,  0,  0,  0,  0,  0,  1, }, // face: down,  turn: left
+       { -1,  0,  0,  0,  0, -1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1, }, // face: down,  turn: around
+       {  0,  0,  1,  0,  0, -1,  0,  0,  1,  0,  0,  0,  0,  0,  0,  1, }, // face: down,  turn: right
+       {  0, -1,  0,  0,  1,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1, }, // face: right, turn: none
+       {  0, -1,  0,  0,  0,  0, -1,  0,  1,  0,  0,  0,  0,  0,  0,  1, }, // face: right, turn: left
+       {  0, -1,  0,  0, -1,  0,  0,  0,  0,  0, -1,  0,  0,  0,  0,  1, }, // face: right, turn: around
+       {  0, -1,  0,  0,  0,  0,  1,  0, -1,  0,  0,  0,  0,  0,  0,  1, }, // face: right, turn: right
+       {  0,  1,  0,  0, -1,  0,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1, }, // face: left,  turn: none
+       {  0,  1,  0,  0,  0,  0,  1,  0,  1,  0,  0,  0,  0,  0,  0,  1, }, // face: left,  turn: left
+       {  0,  1,  0,  0,  1,  0,  0,  0,  0,  0, -1,  0,  0,  0,  0,  1, }, // face: left,  turn: around
+       {  0,  1,  0,  0,  0,  0, -1,  0, -1,  0,  0,  0,  0,  0,  0,  1, }, // face: left,  turn: right
+       {  1,  0,  0,  0,  0,  0,  1,  0,  0, -1,  0,  0,  0,  0,  0,  1, }, // face: front, turn: none
+       {  0,  0, -1,  0,  1,  0,  0,  0,  0, -1,  0,  0,  0,  0,  0,  1, }, // face: front, turn: left
+       { -1,  0,  0,  0,  0,  0, -1,  0,  0, -1,  0,  0,  0,  0,  0,  1, }, // face: front, turn: around
+       {  0,  0,  1,  0, -1,  0,  0,  0,  0, -1,  0,  0,  0,  0,  0,  1, }, // face: front, turn: right
+       {  1,  0,  0,  0,  0,  0, -1,  0,  0,  1,  0,  0,  0,  0,  0,  1, }, // face: back,  turn: none
+       {  0,  0, -1,  0, -1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  1, }, // face: back,  turn: left
+       { -1,  0,  0,  0,  0,  0,  1,  0,  0,  1,  0,  0,  0,  0,  0,  1, }, // face: back,  turn: around
+       {  0,  0,  1,  0,  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  0,  1, }, // face: back,  turn: right
+};
+
+const glm::tvec3<int> Block::face2normal[FACE_COUNT] = {
+       {  0,  1,  0 },
+       {  0, -1,  0 },
+       {  1,  0,  0 },
+       { -1,  0,  0 },
+       {  0,  0,  1 },
+       {  0,  0, -1 },
+};
+
+const Block::Face Block::orient2face[ORIENT_COUNT][FACE_COUNT] = {
+       { FACE_UP,    FACE_DOWN,  FACE_RIGHT, FACE_LEFT,  FACE_FRONT, FACE_BACK,  }, // face: up,    turn: none
+       { FACE_UP,    FACE_DOWN,  FACE_FRONT, FACE_BACK,  FACE_LEFT,  FACE_RIGHT, }, // face: up,    turn: left
+       { FACE_UP,    FACE_DOWN,  FACE_LEFT,  FACE_RIGHT, FACE_BACK,  FACE_FRONT, }, // face: up,    turn: around
+       { FACE_UP,    FACE_DOWN,  FACE_BACK,  FACE_FRONT, FACE_RIGHT, FACE_LEFT,  }, // face: up,    turn: right
+       { FACE_DOWN,  FACE_UP,    FACE_RIGHT, FACE_LEFT,  FACE_BACK,  FACE_FRONT, }, // face: down,  turn: none
+       { FACE_DOWN,  FACE_UP,    FACE_BACK,  FACE_FRONT, FACE_LEFT,  FACE_RIGHT, }, // face: down,  turn: left
+       { FACE_DOWN,  FACE_UP,    FACE_LEFT,  FACE_RIGHT, FACE_FRONT, FACE_BACK,  }, // face: down,  turn: around
+       { FACE_DOWN,  FACE_UP,    FACE_FRONT, FACE_BACK,  FACE_RIGHT, FACE_LEFT,  }, // face: down,  turn: right
+       { FACE_LEFT,  FACE_RIGHT, FACE_UP,    FACE_DOWN,  FACE_FRONT, FACE_BACK,  }, // face: right, turn: none
+       { FACE_LEFT,  FACE_RIGHT, FACE_FRONT, FACE_BACK,  FACE_DOWN,  FACE_UP,    }, // face: right, turn: left
+       { FACE_LEFT,  FACE_RIGHT, FACE_DOWN,  FACE_UP,    FACE_BACK,  FACE_FRONT, }, // face: right, turn: around
+       { FACE_LEFT,  FACE_RIGHT, FACE_BACK,  FACE_FRONT, FACE_UP,    FACE_DOWN,  }, // face: right, turn: right
+       { FACE_RIGHT, FACE_LEFT,  FACE_DOWN,  FACE_UP,    FACE_FRONT, FACE_BACK,  }, // face: left,  turn: none
+       { FACE_RIGHT, FACE_LEFT,  FACE_FRONT, FACE_BACK,  FACE_UP,    FACE_DOWN,  }, // face: left,  turn: left
+       { FACE_RIGHT, FACE_LEFT,  FACE_UP,    FACE_DOWN,  FACE_BACK,  FACE_FRONT, }, // face: left,  turn: around
+       { FACE_RIGHT, FACE_LEFT,  FACE_BACK,  FACE_FRONT, FACE_DOWN,  FACE_UP,    }, // face: left,  turn: right
+       { FACE_BACK,  FACE_FRONT, FACE_RIGHT, FACE_LEFT,  FACE_UP,    FACE_DOWN,  }, // face: front, turn: none
+       { FACE_BACK,  FACE_FRONT, FACE_UP,    FACE_DOWN,  FACE_LEFT,  FACE_RIGHT, }, // face: front, turn: left
+       { FACE_BACK,  FACE_FRONT, FACE_LEFT,  FACE_RIGHT, FACE_DOWN,  FACE_UP,    }, // face: front, turn: around
+       { FACE_BACK,  FACE_FRONT, FACE_DOWN,  FACE_UP,    FACE_RIGHT, FACE_LEFT,  }, // face: front, turn: right
+       { FACE_FRONT, FACE_BACK,  FACE_RIGHT, FACE_LEFT,  FACE_DOWN,  FACE_UP,    }, // face: back,  turn: none
+       { FACE_FRONT, FACE_BACK,  FACE_DOWN,  FACE_UP,    FACE_LEFT,  FACE_RIGHT, }, // face: back,  turn: left
+       { FACE_FRONT, FACE_BACK,  FACE_LEFT,  FACE_RIGHT, FACE_UP,    FACE_DOWN,  }, // face: back,  turn: around
+       { FACE_FRONT, FACE_BACK,  FACE_UP,    FACE_DOWN,  FACE_RIGHT, FACE_LEFT,  }, // face: back,  turn: right
+};
+
 }

diff --git a/src/block.hpp b/src/block.hpp
index 3af80a854f29cc8945201b6af8d9babfd855c60a..ab34a30d05f6e17370c69b76d3970389555f64c6 100644 (file)
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -34,40 +34,29 @@ struct Block {
                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;
+       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) {
-               switch (face) {
-                       case FACE_UP:
-                               return { 0, 1, 0 };
-                       case FACE_DOWN:
-                               return { 0, -1, 0 };
-                       case FACE_RIGHT:
-                               return { 1, 0, 0 };
-                       case FACE_LEFT:
-                               return { -1, 0, 0 };
-                       case FACE_FRONT:
-                               return { 0, 0, 1 };
-                       case FACE_BACK:
-                               return { 0, 0, -1 };
-                       default:
-                               return { 0, 0, 0 };
-               }
+               return face2normal[face];
        }
 
        static Face NormalFace(const glm::vec3 &norm) {
@@ -124,6 +113,11 @@ struct Block {
 
        };
 
+private:
+       static const glm::tvec3<int> face2normal[6];
+       static const glm::mat4 orient2transform[ORIENT_COUNT];
+       static const Face orient2face[ORIENT_COUNT][FACE_COUNT];
+
 };
 
 
@@ -162,7 +156,9 @@ struct BlockType {
 
        static const NullShape DEFAULT_SHAPE;
 
-       bool FaceFilled(const Block &, Block::Face) const;
+       bool FaceFilled(const Block &block, Block::Face face) const {
+               return fill[block.OrientedFace(face)];
+       }
 
        void FillModel(
                Model::Buffer &m,