orientable blocks

[blank.git] / src / block.hpp

diff --git a/src/block.hpp b/src/block.hpp
index 967cc1fccc69cf192950d0247fc0f9429e8ab88e..a63cf26b59671cab7468a6372eca2fdc675d18b1 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 Direction {
+               DIR_UP,
+               DIR_DOWN,
+               DIR_LEFT,
+               DIR_RIGHT,
+               DIR_FRONT,
+               DIR_BACK,
+               DIR_COUNT,
+       };
+       enum Rotation {
+               ROT_NONE,
+               ROT_90,
+               ROT_180,
+               ROT_270,
+               ROT_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)
-       : type(type) { }
+       const glm::mat4 &Transform() const;
 
 };
 
@@ -56,7 +76,7 @@ struct BlockType {
 
        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(