X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fblock.cpp;h=09acfef9efcc01a2504c63459736fec9df5bd056;hb=dd1849e2313c37fe60fe385ef460f53c3628b447;hp=aa91e7953a67238e1501d989ff5f397ec756bcca;hpb=7bb75960dbf9bfdee9ac865384aca81791b3da5c;p=blank.git diff --git a/src/world/block.cpp b/src/world/block.cpp index aa91e79..09acfef 100644 --- a/src/world/block.cpp +++ b/src/world/block.cpp @@ -14,10 +14,6 @@ namespace blank { const NullShape BlockType::DEFAULT_SHAPE; -bool operator ==(const Block &a, const Block &b) { - return a.type == b.type && a.orient == b.orient; -} - std::ostream &operator <<(std::ostream &out, const Block &block) { return out << "Block(" << block.type << ", " << block.GetFace() << ", " << block.GetTurn() << ')'; } @@ -107,12 +103,8 @@ void BlockType::FillBlockModel( buf.colors.insert(buf.colors.end(), shape->VertexCount(), color); } -void BlockType::FillOutlineModel( - OutlineModel::Buffer &buf, - const glm::vec3 &pos_offset, - OutlineModel::Index idx_offset -) const noexcept { - shape->Outline(buf, pos_offset, idx_offset); +void BlockType::FillOutlineModel(OutlineModel::Buffer &buf) const noexcept { + shape->Outline(buf); buf.colors.insert(buf.colors.end(), shape->OutlineCount(), outline_color); }