X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblock.hpp;h=ab34a30d05f6e17370c69b76d3970389555f64c6;hb=6e59f3102d6d64355d5a30b708a326327b089aaf;hp=3af80a854f29cc8945201b6af8d9babfd855c60a;hpb=35c09fc00094a3d390732fd533b2bd03413d90c7;p=blank.git

diff --git a/src/block.hpp b/src/block.hpp
index 3af80a8..ab34a30 100644
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -34,40 +34,29 @@ struct Block {
 		TURN_COUNT,
 	};
 
+	static constexpr int ORIENT_COUNT = FACE_COUNT * 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) { }
 
-	const glm::mat4 &Transform() const;
+	const glm::mat4 &Transform() const { return orient2transform[orient]; }
 
 	Face GetFace() const { return Face(orient / TURN_COUNT); }
 	void SetFace(Face face) { orient = face * TURN_COUNT + GetTurn(); }
 	Turn GetTurn() const { return Turn(orient % TURN_COUNT); }
 	void SetTurn(Turn turn) { orient = GetFace() * TURN_COUNT + turn; }
 
+	Face OrientedFace(Face f) const { return orient2face[orient][f]; }
+
 	static Face Opposite(Face f) {
 		return Face(f ^ 1);
 	}
 
 	static glm::tvec3<int> FaceNormal(Face face) {
-		switch (face) {
-			case FACE_UP:
-				return { 0, 1, 0 };
-			case FACE_DOWN:
-				return { 0, -1, 0 };
-			case FACE_RIGHT:
-				return { 1, 0, 0 };
-			case FACE_LEFT:
-				return { -1, 0, 0 };
-			case FACE_FRONT:
-				return { 0, 0, 1 };
-			case FACE_BACK:
-				return { 0, 0, -1 };
-			default:
-				return { 0, 0, 0 };
-		}
+		return face2normal[face];
 	}
 
 	static Face NormalFace(const glm::vec3 &norm) {
@@ -124,6 +113,11 @@ struct Block {
 
 	};
 
+private:
+	static const glm::tvec3<int> face2normal[6];
+	static const glm::mat4 orient2transform[ORIENT_COUNT];
+	static const Face orient2face[ORIENT_COUNT][FACE_COUNT];
+
 };
 
 
@@ -162,7 +156,9 @@ struct BlockType {
 
 	static const NullShape DEFAULT_SHAPE;
 
-	bool FaceFilled(const Block &, Block::Face) const;
+	bool FaceFilled(const Block &block, Block::Face face) const {
+		return fill[block.OrientedFace(face)];
+	}
 
 	void FillModel(
 		Model::Buffer &m,