X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FBlockType.hpp;h=5fab9318dd2c44b5bd7066d048ca142b4dcc99eb;hb=eba29c8ad489194cd1e3cd64b5f23424ad4384ef;hp=a27b89bfd30016c66fcf677d64c23a3e51b78693;hpb=957b1df87d9a692c517a269221da81227100240e;p=blank.git

diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp
index a27b89b..5fab931 100644
--- a/src/world/BlockType.hpp
+++ b/src/world/BlockType.hpp
@@ -2,9 +2,9 @@
 #define BLANK_WORLD_BLOCKTYPE_HPP_
 
 #include "Block.hpp"
-#include "../model/BlockModel.hpp"
-#include "../model/EntityModel.hpp"
-#include "../model/OutlineModel.hpp"
+#include "../graphics/BlockMesh.hpp"
+#include "../graphics/EntityMesh.hpp"
+#include "../graphics/OutlineMesh.hpp"
 #include "../model/shapes.hpp"
 
 #include <glm/glm.hpp>
@@ -81,17 +81,17 @@ struct BlockType {
 		return fill[block.OrientedFace(face)];
 	}
 
-	void FillEntityModel(
-		EntityModel::Buffer &m,
+	void FillEntityMesh(
+		EntityMesh::Buffer &m,
 		const glm::mat4 &transform = glm::mat4(1.0f),
-		EntityModel::Index idx_offset = 0
+		EntityMesh::Index idx_offset = 0
 	) const noexcept;
-	void FillBlockModel(
-		BlockModel::Buffer &m,
+	void FillBlockMesh(
+		BlockMesh::Buffer &m,
 		const glm::mat4 &transform = glm::mat4(1.0f),
-		BlockModel::Index idx_offset = 0
+		BlockMesh::Index idx_offset = 0
 	) const noexcept;
-	void FillOutlineModel(OutlineModel::Buffer &m) const noexcept;
+	void FillOutlineMesh(OutlineMesh::Buffer &m) const noexcept;
 
 };