X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FBlockType.hpp;h=786c76cffbe3b566cdc048bce40624790c56db7c;hb=5998b18978bd8e7a0c9deb516474634e1d3521c9;hp=caccb8f4b7ec237a014086195c6b065c875e2107;hpb=7c2a8b8285278b8a3077b311d82f05ea0463a96e;p=blank.git

diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp
index caccb8f..786c76c 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"
 
@@ -63,10 +63,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 +74,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;