X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FChunk.hpp;h=a75d8e202ddb3e5544fb0f7cc25e3b44c2a650f5;hb=695918769a616db82dbebb987ea91f3204dee8a9;hp=d986874445cc09829a87f6646df94585303d53f0;hpb=c592d2d6e230851bd7ed74d98f9046469f4086fd;p=blank.git

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index d986874..a75d8e2 100644
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -6,6 +6,7 @@
 #include "../model/BlockModel.hpp"
 #include "../model/geometry.hpp"
 
+#include <vector>
 #include <glm/glm.hpp>
 #include <glm/gtx/transform.hpp>
 
@@ -13,6 +14,7 @@
 namespace blank {
 
 class BlockType;
+class WorldCollision;
 
 /// cube of size 16 (256 tiles, 4096 blocks)
 class Chunk {
@@ -100,7 +102,6 @@ public:
 	const Chunk &GetNeighbor(Block::Face f) const noexcept { return *neighbor[f]; }
 	void ClearNeighbors() noexcept;
 	void Unlink() noexcept;
-	void Relink() noexcept;
 
 	// check which faces of a block at given index are obstructed (and therefore invisible)
 	Block::FaceSet Obstructed(const Pos &) const noexcept;
@@ -143,6 +144,12 @@ public:
 		float &dist,
 		glm::vec3 &normal) const noexcept;
 
+	bool Intersection(
+		const AABB &box,
+		const glm::mat4 &Mbox,
+		const glm::mat4 &Mchunk,
+		std::vector<WorldCollision> &) const noexcept;
+
 	void Position(const Pos &pos) noexcept { position = pos; }
 	const Pos &Position() const noexcept { return position; }
 	glm::mat4 Transform(const Pos &offset) const noexcept {
@@ -158,8 +165,8 @@ private:
 private:
 	const BlockTypeRegistry *types;
 	Chunk *neighbor[Block::FACE_COUNT];
-	Block blocks[16 * 16 * 16];
-	unsigned char light[16 * 16 * 16];
+	Block blocks[size];
+	unsigned char light[size];
 	BlockModel model;
 	Pos position;
 	bool dirty;