fixed oriented block occlusion check

[blank.git] / src / block.hpp

diff --git a/src/block.hpp b/src/block.hpp
index 23c3979feba4ecd36d9867512901b81229a10fef..72954ce596a6b846c2b14e0ac8227064c3c7d792 100644 (file)
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -42,6 +42,11 @@ struct Block {
 
        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; }
+
 };
 
 
@@ -57,12 +62,16 @@ struct BlockType {
        bool visible;
 
        struct Faces {
-               bool up;
-               bool down;
-               bool right;
-               bool left;
-               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(
@@ -73,6 +82,7 @@ struct BlockType {
 
        static const NullShape DEFAULT_SHAPE;
 
+       bool FaceFilled(const Block &, Block::Face) const;
 
        void FillModel(
                Model::Buffer &m,