X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FBlockType.hpp;h=bdc4721e96dea3b4762cc219190b4d0c49379ff6;hb=38a4cffc0b6aa58e49d24c06aad7bee14cb6515d;hp=28f814b80d7245adf022f216689822b305c38142;hpb=955fbb45dedb570520fc45d2ce69f420bed2ad08;p=blank.git

diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp
index 28f814b..bdc4721 100644
--- a/src/world/BlockType.hpp
+++ b/src/world/BlockType.hpp
@@ -3,7 +3,7 @@
 
 #include "Block.hpp"
 #include "../model/BlockModel.hpp"
-#include "../model/Model.hpp"
+#include "../model/EntityModel.hpp"
 #include "../model/OutlineModel.hpp"
 #include "../model/shapes.hpp"
 
@@ -17,9 +17,13 @@ namespace blank {
 struct BlockType {
 
 	const Shape *shape;
+	float texture;
 	glm::vec3 color;
 	glm::vec3 outline_color;
 
+	// a string to display to the user
+	std::string label;
+
 	Block::Type id;
 
 	// light level that blocks of this type emit
@@ -60,21 +64,17 @@ struct BlockType {
 		return fill[block.OrientedFace(face)];
 	}
 
-	void FillModel(
-		Model::Buffer &m,
+	void FillEntityModel(
+		EntityModel::Buffer &m,
 		const glm::mat4 &transform = glm::mat4(1.0f),
-		Model::Index idx_offset = 0
+		EntityModel::Index idx_offset = 0
 	) const noexcept;
 	void FillBlockModel(
 		BlockModel::Buffer &m,
 		const glm::mat4 &transform = glm::mat4(1.0f),
 		BlockModel::Index idx_offset = 0
 	) const noexcept;
-	void FillOutlineModel(
-		OutlineModel &m,
-		const glm::vec3 &pos_offset = { 0, 0, 0 },
-		OutlineModel::Index idx_offset = 0
-	) const noexcept;
+	void FillOutlineModel(OutlineModel::Buffer &m) const noexcept;
 
 };