X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fblock.hpp;h=0d7d75a5dc8e68460f2413354763e3fbef2e4abf;hb=d2d3cb877984b97fafb97254f5005cbf4bcf47a6;hp=3ccd74f71937f523473536910d1a28d4cfaf964b;hpb=1b022dd17364c9e3344afd86572f2ead14973cde;p=blank.git diff --git a/src/block.hpp b/src/block.hpp index 3ccd74f..0d7d75a 100644 --- a/src/block.hpp +++ b/src/block.hpp @@ -47,6 +47,25 @@ struct Block { Turn GetTurn() const { return Turn(orient % 4); } void SetTurn(Turn turn) { orient = GetFace() * TURN_COUNT + turn; } + static glm::tvec3 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 }; + } + } + }; @@ -59,16 +78,22 @@ struct BlockType { Block::Type id; + int luminosity; + bool visible; + bool block_light; - // 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 +104,7 @@ struct BlockType { static const NullShape DEFAULT_SHAPE; + bool FaceFilled(const Block &, Block::Face) const; void FillModel( Model::Buffer &m,