X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fblock.cpp;h=442e54f4d591a64115f0d5ec3d0768dba660045b;hb=5998b18978bd8e7a0c9deb516474634e1d3521c9;hp=aabb2b19a9fe47551282f615986a4007deb2726c;hpb=a74e9630e55ca47c23f3ba3c9ccffcaccad394ff;p=blank.git

diff --git a/src/world/block.cpp b/src/world/block.cpp
index aabb2b1..442e54f 100644
--- a/src/world/block.cpp
+++ b/src/world/block.cpp
@@ -77,18 +77,21 @@ BlockType::BlockType(bool v, const glm::vec3 &col, const Shape *s) noexcept
 : shape(s)
 , color(col)
 , outline_color(-1, -1, -1)
+, label("some block")
 , id(0)
 , luminosity(0)
 , visible(v)
 , block_light(false)
+, collision(false)
+, collide_block(false)
 , fill({ false, false, false, false, false, false }) {
 
 }
 
-void BlockType::FillModel(
-	Model::Buffer &buf,
+void BlockType::FillEntityModel(
+	EntityModel::Buffer &buf,
 	const glm::mat4 &transform,
-	Model::Index idx_offset
+	EntityModel::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);
@@ -104,12 +107,12 @@ void BlockType::FillBlockModel(
 }
 
 void BlockType::FillOutlineModel(
-	OutlineModel &model,
+	OutlineModel::Buffer &buf,
 	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);
+	shape->Outline(buf.vertices, buf.indices, pos_offset, idx_offset);
+	buf.colors.insert(buf.colors.end(), shape->OutlineCount(), outline_color);
 }