allow face/turn selection of placed blocks

[blank.git] / src / block.hpp

diff --git a/src/block.hpp b/src/block.hpp
index a63cf26b59671cab7468a6372eca2fdc675d18b1..a142a96256e285e3acfca5b6848e04df00e4ebc0 100644 (file)
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -17,31 +17,36 @@ struct Block {
        using Type = unsigned short;
        using Pos = glm::vec3;
 
-       enum Direction {
-               DIR_UP,
-               DIR_DOWN,
-               DIR_LEFT,
-               DIR_RIGHT,
-               DIR_FRONT,
-               DIR_BACK,
-               DIR_COUNT,
+       enum Face {
+               FACE_UP,
+               FACE_DOWN,
+               FACE_RIGHT,
+               FACE_LEFT,
+               FACE_FRONT,
+               FACE_BACK,
+               FACE_COUNT,
        };
-       enum Rotation {
-               ROT_NONE,
-               ROT_90,
-               ROT_180,
-               ROT_270,
-               ROT_COUNT,
+       enum Turn {
+               TURN_NONE,
+               TURN_LEFT,
+               TURN_AROUND,
+               TURN_RIGHT,
+               TURN_COUNT,
        };
 
        Type type;
        unsigned char orient;
 
-       constexpr explicit Block(Type type = 0, Direction dir = DIR_UP, Rotation rot = ROT_NONE)
-       : type(type), orient(dir * ROT_COUNT + rot) { }
+       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; }
+
 };
 
 
@@ -57,10 +62,10 @@ struct BlockType {
        bool visible;
 
        struct Faces {
+               bool up;
+               bool down;
                bool right;
                bool left;
-               bool top;
-               bool bottom;
                bool front;
                bool back;
        } fill;