don't add obstructed blocks to meshes

[blank.git] / src / block.hpp

diff --git a/src/block.hpp b/src/block.hpp
index 5d8e7e70c5404f5b3e201b49beb23584860cbf23..967cc1fccc69cf192950d0247fc0f9429e8ab88e 100644 (file)
--- a/src/block.hpp
+++ b/src/block.hpp
@@ -28,26 +28,34 @@ struct Block {
 /// attributes of a type of block
 struct BlockType {
 
+       const Shape *shape;
+       glm::vec3 color;
+       glm::vec3 outline_color;
+
        Block::Type id;
 
        bool visible;
 
-       const Shape *shape;
-       glm::vec3 color;
-       glm::vec3 outline_color;
+       struct Faces {
+               bool right;
+               bool left;
+               bool top;
+               bool bottom;
+               bool front;
+               bool back;
+       } fill;
 
        explicit BlockType(
                bool v = false,
                const glm::vec3 &color = { 1, 1, 1 },
-               const Shape *shape = &DEFAULT_SHAPE,
-               const glm::vec3 &outline_color = { -1, -1, -1 })
-       : id(0), visible(v), shape(shape), color(color), outline_color(outline_color) { }
+               const Shape *shape = &DEFAULT_SHAPE
+       );
 
        static const NullShape DEFAULT_SHAPE;
 
 
        void FillModel(
-               Model &m,
+               Model::Buffer &m,
                const glm::vec3 &pos_offset = { 0, 0, 0 },
                Model::Index idx_offset = 0
        ) const;