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() << ')';
}
BlockType::BlockType(bool v, const glm::vec3 &col, const Shape *s) noexcept
: shape(s)
+, texture(0)
, color(col)
, outline_color(-1, -1, -1)
, label("some block")
const glm::mat4 &transform,
EntityModel::Index idx_offset
) const noexcept {
- shape->Vertices(buf.vertices, buf.normals, buf.indices, transform, idx_offset);
+ shape->Vertices(buf, transform, texture, idx_offset);
buf.colors.insert(buf.colors.end(), shape->VertexCount(), color);
}
const glm::mat4 &transform,
BlockModel::Index idx_offset
) const noexcept {
- shape->Vertices(buf.vertices, buf.indices, transform, idx_offset);
+ shape->Vertices(buf, transform, texture, idx_offset);
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.vertices, buf.indices, 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);
}
{ 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, }, // face: back, turn: right
};
-const glm::tvec3<int> Block::face2normal[FACE_COUNT] = {
+const glm::ivec3 Block::face2normal[FACE_COUNT] = {
{ 0, 1, 0 },
{ 0, -1, 0 },
{ 1, 0, 0 },