X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fblock.cpp;h=aa91e7953a67238e1501d989ff5f397ec756bcca;hb=39df551265bff648c1ac166043bb4b046122cc8d;hp=78aa9d8a30bdfe765983332247fc6bfddae92f7e;hpb=955fbb45dedb570520fc45d2ce69f420bed2ad08;p=blank.git

diff --git a/src/world/block.cpp b/src/world/block.cpp
index 78aa9d8..aa91e79 100644
--- a/src/world/block.cpp
+++ b/src/world/block.cpp
@@ -75,8 +75,10 @@ std::ostream &operator <<(std::ostream &out, const Block::Turn &turn) {
 
 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")
 , id(0)
 , luminosity(0)
 , visible(v)
@@ -87,12 +89,12 @@ BlockType::BlockType(bool v, const glm::vec3 &col, const Shape *s) noexcept
 
 }
 
-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);
+	shape->Vertices(buf, transform, texture, idx_offset);
 	buf.colors.insert(buf.colors.end(), shape->VertexCount(), color);
 }
 
@@ -101,17 +103,17 @@ void BlockType::FillBlockModel(
 	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 &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, pos_offset, idx_offset);
+	buf.colors.insert(buf.colors.end(), shape->OutlineCount(), outline_color);
 }
 
 
@@ -154,7 +156,7 @@ const glm::mat4 Block::orient2transform[ORIENT_COUNT] = {
 	{  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 },