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

diff --git a/src/world/BlockType.hpp b/src/world/BlockType.hpp
index a27b89b..4208d94 100644
--- a/src/world/BlockType.hpp
+++ b/src/world/BlockType.hpp
@@ -2,10 +2,10 @@
 #define BLANK_WORLD_BLOCKTYPE_HPP_
 
 #include "Block.hpp"
-#include "../model/BlockModel.hpp"
-#include "../model/EntityModel.hpp"
-#include "../model/OutlineModel.hpp"
-#include "../model/shapes.hpp"
+#include "../graphics/BlockMesh.hpp"
+#include "../graphics/EntityMesh.hpp"
+#include "../graphics/OutlineMesh.hpp"
+#include "../model/bounds.hpp"
 
 #include <glm/glm.hpp>
 
@@ -16,7 +16,7 @@ namespace blank {
 /// attributes of a type of block
 struct BlockType {
 
-	const Shape *shape;
+	const CollisionBounds *shape;
 	float texture;
 	glm::vec3 hsl_mod;
 	glm::vec3 rgb_mod;
@@ -75,23 +75,23 @@ struct BlockType {
 
 	BlockType() noexcept;
 
-	static const NullShape DEFAULT_SHAPE;
+	static const NullBounds DEFAULT_SHAPE;
 
 	bool FaceFilled(const Block &block, Block::Face face) const noexcept {
 		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;
 
 };