namespace blank {
-const NullShape BlockType::DEFAULT_SHAPE;
+const NullBounds 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)
-, color(col)
+BlockType::BlockType() noexcept
+: shape(&DEFAULT_SHAPE)
+, texture(0)
+, hsl_mod(0.0f, 1.0f, 1.0f)
+, rgb_mod(1.0f, 1.0f, 1.0f)
, outline_color(-1, -1, -1)
+, label("some block")
, id(0)
, luminosity(0)
-, visible(v)
-, block_light(false)
+, visible(true)
+, block_light(true)
+, collision(true)
+, collide_block(true)
+, generate(false)
+, min_solidity(0.5f)
+, mid_solidity(0.75f)
+, max_solidity(1.0f)
+, min_humidity(-1.0f)
+, mid_humidity(0.0f)
+, max_humidity(1.0f)
+, min_temperature(-1.0f)
+, mid_temperature(0.0f)
+, max_temperature(1.0f)
+, min_richness(-1.0f)
+, mid_richness(0.0f)
+, max_richness(1.0f)
+, commonness(1.0f)
, fill({ false, false, false, false, false, false }) {
}
-void BlockType::FillModel(
- Model::Buffer &buf,
+void BlockType::FillEntityMesh(
+ EntityMesh::Buffer &buf,
const glm::mat4 &transform,
- Model::Index idx_offset
+ EntityMesh::Index idx_offset
) const noexcept {
- shape->Vertices(buf.vertices, buf.normals, buf.indices, transform, idx_offset);
- buf.colors.insert(buf.colors.end(), shape->VertexCount(), color);
+ shape->Vertices(buf, transform, texture, idx_offset);
+ buf.hsl_mods.insert(buf.hsl_mods.end(), shape->VertexCount(), hsl_mod);
+ buf.rgb_mods.insert(buf.rgb_mods.end(), shape->VertexCount(), rgb_mod);
}
-void BlockType::FillBlockModel(
- BlockModel::Buffer &buf,
+void BlockType::FillBlockMesh(
+ BlockMesh::Buffer &buf,
const glm::mat4 &transform,
- BlockModel::Index idx_offset
+ BlockMesh::Index idx_offset
) const noexcept {
- shape->Vertices(buf.vertices, buf.indices, transform, idx_offset);
- buf.colors.insert(buf.colors.end(), shape->VertexCount(), color);
+ shape->Vertices(buf, transform, texture, idx_offset);
+ buf.hsl_mods.insert(buf.hsl_mods.end(), shape->VertexCount(), hsl_mod);
+ buf.rgb_mods.insert(buf.rgb_mods.end(), shape->VertexCount(), rgb_mod);
}
-void BlockType::FillOutlineModel(
- OutlineModel &model,
- const glm::vec3 &pos_offset,
- OutlineModel::Index idx_offset
-) const noexcept {
- shape->Outline(model.vertices, model.indices, pos_offset, idx_offset);
- model.colors.insert(model.colors.end(), shape->OutlineCount(), outline_color);
+void BlockType::FillOutlineMesh(OutlineMesh::Buffer &buf) const noexcept {
+ shape->Outline(buf);
+ buf.colors.insert(buf.colors.end(), shape->OutlineCount(), outline_color);
}
BlockTypeRegistry::BlockTypeRegistry() {
- Add(BlockType());
+ BlockType air;
+ air.visible = false;
+ air.block_light = false;
+ air.collision = false;
+ air.collide_block = false;
+ Add(air);
}
Block::Type BlockTypeRegistry::Add(const BlockType &t) {
{ 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 },