drawable entity with angular velocity

[blank.git] / src / block.hpp

diff --git a/src/block.hpp b/src/block.hpp
index 3ccd74f71937f523473536910d1a28d4cfaf964b..72954ce596a6b846c2b14e0ac8227064c3c7d792 100644 (file)
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -61,14 +61,17 @@ struct BlockType {
 
        bool visible;
 
-       // FIXME: fill faces don't respect block orientation
        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(
@@ -79,6 +82,7 @@ struct BlockType {
 
        static const NullShape DEFAULT_SHAPE;
 
+       bool FaceFilled(const Block &, Block::Face) const;
 
        void FillModel(
                Model::Buffer &m,