simplified block face stuff

[blank.git] / src / block.hpp

diff --git a/src/block.hpp b/src/block.hpp
index 56f9eace671193c3a9376a0912a9e7b822893b12..4fcee4cac2f0c2a6e7be58d095e6ee16c982870e 100644 (file)
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -42,11 +42,15 @@ struct Block {
 
        const glm::mat4 &Transform() const;
 
-       Face GetFace() const { return Face(orient / 4); }
+       Face GetFace() const { return Face(orient / TURN_COUNT); }
        void SetFace(Face face) { orient = face * TURN_COUNT + GetTurn(); }
-       Turn GetTurn() const { return Turn(orient % 4); }
+       Turn GetTurn() const { return Turn(orient % TURN_COUNT); }
        void SetTurn(Turn turn) { orient = GetFace() * TURN_COUNT + turn; }
 
+       static Face Opposite(Face f) {
+               return Face(f ^ 1);
+       }
+
        static glm::tvec3<int> FaceNormal(Face face) {
                switch (face) {
                        case FACE_UP: