X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FBlockType.hpp;h=95a960566b02fc57975ced99b13633166b643875;hb=7bb75960dbf9bfdee9ac865384aca81791b3da5c;hp=caccb8f4b7ec237a014086195c6b065c875e2107;hpb=55dbd6b35a39888f245e247d2e140f141f918178;p=blank.git

diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp
index caccb8f..95a9605 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,6 +17,7 @@ namespace blank {
 struct BlockType {
 
 	const Shape *shape;
+	float texture;
 	glm::vec3 color;
 	glm::vec3 outline_color;
 
@@ -63,10 +64,10 @@ 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,
@@ -74,7 +75,7 @@ struct BlockType {
 		BlockModel::Index idx_offset = 0
 	) const noexcept;
 	void FillOutlineModel(
-		OutlineModel &m,
+		OutlineModel::Buffer &m,
 		const glm::vec3 &pos_offset = { 0, 0, 0 },
 		OutlineModel::Index idx_offset = 0
 	) const noexcept;