use precalculated matrices for block orientation

[blank.git] / src / block.hpp

diff --git a/src/block.hpp b/src/block.hpp
index 1663c16aa0d4450f0cdc06d9e503d408c0350049..3777e6d77b6169d345ca73592d4f7b54182c765c 100644 (file)
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -17,10 +17,30 @@ 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,
+       };
+
        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) { }
 
-       constexpr explicit Block(Type type = 0)
-       : type(type) { }
+       const glm::mat4 &Transform() const;
 
 };
 
@@ -28,27 +48,35 @@ struct Block {
 /// attributes of a type of block
 struct BlockType {
 
+       const Shape *shape;
+       glm::vec3 color;
+       glm::vec3 outline_color;
+
        Block::Type id;
 
        bool visible;
 
-       const Shape *shape;
-       glm::vec3 color;
-       glm::vec3 outline_color;
+       struct Faces {
+               bool right;
+               bool left;
+               bool top;
+               bool bottom;
+               bool front;
+               bool back;
+       } 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;
 
 
        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 FillOutlineModel(