X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblock.hpp;h=84efa4894b0dd9146d6f22b1c1b8e11dd7cffec0;hb=e53a0e2e711a7d8bd9b0ddacd1360aa14370643f;hp=a63cf26b59671cab7468a6372eca2fdc675d18b1;hpb=b4995967309bf5570161db2287e27b84ca94ab9a;p=blank.git

diff --git a/src/block.hpp b/src/block.hpp
index a63cf26..84efa48 100644
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -17,30 +17,121 @@ 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,
 	};
 
+	static constexpr int ORIENT_COUNT = FACE_COUNT * 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) noexcept
+	: type(type), orient(face * TURN_COUNT + turn) { }
+
+	const glm::mat4 &Transform() const noexcept { return orient2transform[orient]; }
+
+	Face GetFace() const noexcept { return Face(orient / TURN_COUNT); }
+	void SetFace(Face face) noexcept { orient = face * TURN_COUNT + GetTurn(); }
+	Turn GetTurn() const noexcept { return Turn(orient % TURN_COUNT); }
+	void SetTurn(Turn turn) noexcept { orient = GetFace() * TURN_COUNT + turn; }
+
+	Face OrientedFace(Face f) const noexcept { return orient2face[orient][f]; }
+
+	static Face Opposite(Face f) noexcept {
+		return Face(f ^ 1);
+	}
+
+	static int Axis(Face f) noexcept {
+		switch (f) {
+			case FACE_UP:
+			case FACE_DOWN:
+				return 1;
+			default:
+			case FACE_RIGHT:
+			case FACE_LEFT:
+				return 0;
+			case FACE_FRONT:
+			case FACE_BACK:
+				return 2;
+		}
+	}
+
+	static glm::tvec3<int> FaceNormal(Face face) noexcept {
+		return face2normal[face];
+	}
+
+	static Face NormalFace(const glm::vec3 &norm) noexcept {
+		const glm::vec3 anorm(abs(norm));
+		if (anorm.x > anorm.y) {
+			if (anorm.x > anorm.z) {
+				return norm.x > 0.0f ? FACE_RIGHT : FACE_LEFT;
+			} else {
+				return norm.z > 0.0f ? FACE_FRONT : FACE_BACK;
+			}
+		} else {
+			if (anorm.y > anorm.z) {
+				return norm.y > 0.0f ? FACE_UP : FACE_DOWN;
+			} else {
+				return norm.z > 0.0f ? FACE_FRONT : FACE_BACK;
+			}
+		}
+	}
+
+	struct FaceSet {
+
+		explicit FaceSet(unsigned char v = 0)
+		: value(v) { }
+
+		bool IsSet(Face f) const {
+			return value & Mask(f);
+		}
+		void Set(Face f) {
+			value |= Mask(f);
+		}
+		void Unset(Face f) {
+			value |= ~Mask(f);
+		}
+
+		void Clear() {
+			value = 0;
+		}
+		void Fill() {
+			value = Mask(FACE_COUNT) - 1;
+		}
+
+		bool Empty() const {
+			return value == 0;
+		}
+		bool All() const {
+			return value == Mask(FACE_COUNT) - 1;
+		}
+
+		unsigned char Mask(Face f) const {
+			return 1 << f;
+		}
+
+		unsigned char value;
+
+	};
 
-	const glm::mat4 &Transform() const;
+private:
+	static const glm::tvec3<int> face2normal[6];
+	static const glm::mat4 orient2transform[ORIENT_COUNT];
+	static const Face orient2face[ORIENT_COUNT][FACE_COUNT];
 
 };
 
@@ -54,36 +145,51 @@ struct BlockType {
 
 	Block::Type id;
 
+	int luminosity;
+
 	bool visible;
+	bool block_light;
 
 	struct Faces {
-		bool right;
-		bool left;
-		bool top;
-		bool bottom;
-		bool front;
-		bool back;
+		bool face[Block::FACE_COUNT];
+		Faces &operator =(const Faces &other) noexcept {
+			for (int i = 0; i < Block::FACE_COUNT; ++i) {
+				face[i] = other.face[i];
+			}
+			return *this;
+		}
+		bool operator [](Block::Face f) const noexcept {
+			return face[f];
+		}
 	} fill;
 
 	explicit BlockType(
 		bool v = false,
 		const glm::vec3 &color = { 1, 1, 1 },
 		const Shape *shape = &DEFAULT_SHAPE
-	);
+	) noexcept;
 
 	static const NullShape DEFAULT_SHAPE;
 
+	bool FaceFilled(const Block &block, Block::Face face) const noexcept {
+		return fill[block.OrientedFace(face)];
+	}
 
 	void FillModel(
 		Model::Buffer &m,
 		const glm::mat4 &transform = glm::mat4(1.0f),
 		Model::Index idx_offset = 0
-	) const;
+	) const noexcept;
+	void FillBlockModel(
+		BlockModel::Buffer &m,
+		const glm::mat4 &transform = glm::mat4(1.0f),
+		BlockModel::Index idx_offset = 0
+	) const noexcept;
 	void FillOutlineModel(
 		OutlineModel &m,
 		const glm::vec3 &pos_offset = { 0, 0, 0 },
 		OutlineModel::Index idx_offset = 0
-	) const;
+	) const noexcept;
 
 };
 
@@ -96,10 +202,10 @@ public:
 public:
 	Block::Type Add(const BlockType &);
 
-	size_t Size() const { return types.size(); }
+	size_t Size() const noexcept { return types.size(); }
 
-	BlockType *operator [](Block::Type id) { return &types[id]; }
-	const BlockType *Get(Block::Type id) const { return &types[id]; }
+	BlockType &operator [](Block::Type id) { return types[id]; }
+	const BlockType &Get(Block::Type id) const { return types[id]; }
 
 private:
 	std::vector<BlockType> types;