X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FChunk.hpp;h=0440f9c7bb8a97aa10a639cefed469b304df0a7b;hb=2ea26d9ca5eaeae65daa0edbbaeada8c1f23670e;hp=e9a075b2168bef5238c3d3562fd0b1b4f0d0d7dd;hpb=551573ecb04969696f916aeb5485658e298a7f6b;p=blank.git

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index e9a075b..0440f9c 100644
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -3,7 +3,6 @@
 
 #include "Block.hpp"
 #include "BlockTypeRegistry.hpp"
-#include "../model/BlockModel.hpp"
 #include "../model/geometry.hpp"
 
 #include <vector>
@@ -142,15 +141,13 @@ public:
 	bool Intersection(
 		const Ray &,
 		const glm::mat4 &M,
-		int &blkid,
-		float &dist,
-		glm::vec3 &normal) const noexcept;
+		WorldCollision &) noexcept;
 
 	bool Intersection(
 		const AABB &box,
 		const glm::mat4 &Mbox,
 		const glm::mat4 &Mchunk,
-		std::vector<WorldCollision> &) const noexcept;
+		std::vector<WorldCollision> &) noexcept;
 
 	void Position(const Pos &pos) noexcept { position = pos; }
 	const Pos &Position() const noexcept { return position; }
@@ -169,18 +166,13 @@ public:
 	bool ShouldUpdateModel() const noexcept { return dirty_model; }
 	bool ShouldUpdateSave() const noexcept { return dirty_save; }
 
-	void CheckUpdate() noexcept;
-	void Draw() noexcept;
-
-private:
-	void Update() noexcept;
+	void Update(BlockModel &) noexcept;
 
 private:
 	const BlockTypeRegistry *types;
 	Chunk *neighbor[Block::FACE_COUNT];
 	Block blocks[size];
 	unsigned char light[size];
-	BlockModel model;
 	Pos position;
 	bool dirty_model;
 	bool dirty_save;