X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblock.hpp;h=72954ce596a6b846c2b14e0ac8227064c3c7d792;hb=88620c3c816c47b32a90758f40efe5d02c50bbfa;hp=967cc1fccc69cf192950d0247fc0f9429e8ab88e;hpb=a58c4558e7d4934f4d0ee621520acfe1c8258c93;p=blank.git

diff --git a/src/block.hpp b/src/block.hpp
index 967cc1f..72954ce 100644
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -17,10 +17,35 @@ 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;
+
+	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; }
 
 };
 
@@ -37,12 +62,16 @@ struct BlockType {
 	bool visible;
 
 	struct Faces {
-		bool right;
-		bool left;
-		bool top;
-		bool bottom;
-		bool front;
-		bool back;
+		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(
@@ -53,10 +82,11 @@ struct BlockType {
 
 	static const NullShape DEFAULT_SHAPE;
 
+	bool FaceFilled(const Block &, Block::Face) const;
 
 	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(