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

diff --git a/src/world/block.cpp b/src/world/block.cpp
index 442e54f..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() << ')';
 }
@@ -75,6 +71,7 @@ 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")
@@ -93,7 +90,7 @@ void BlockType::FillEntityModel(
 	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);
 }
 
@@ -102,16 +99,12 @@ 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::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);
 }
 
@@ -155,7 +148,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 },