X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FChunk.hpp;h=7b84b6e9cd89a0aff3d4d9f1068bc8cb72b6c3f2;hb=12744a2f68b3c9496076d6d7b6fb3581ff78472a;hp=8d6816c29b8f526527bbb8fb07688f74132c340c;hpb=6f94235a5b7c140852703e60c8a74760b8b61d99;p=blank.git

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 8d6816c..7b84b6e 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 {
@@ -71,6 +73,10 @@ public:
 	}
 	glm::mat4 ToTransform(const Pos &pos, int idx) const noexcept;
 
+	Block::Pos ToSceneCoords(const Pos &base, const Block::Pos &pos) const noexcept {
+		return Block::Pos((position - base) * Extent()) + pos;
+	}
+
 	static bool IsBorder(const Pos &pos) noexcept {
 		return
 			pos.x == 0 ||
@@ -100,7 +106,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;
@@ -126,7 +131,7 @@ public:
 	int GetLight(const Pos &pos) const noexcept { return GetLight(ToIndex(pos)); }
 	int GetLight(const Block::Pos &pos) const noexcept { return GetLight(ToIndex(pos)); }
 
-	float GetVertexLight(const Pos &, const BlockModel::Position &, const Model::Normal &) const noexcept;
+	float GetVertexLight(const Pos &, const BlockModel::Position &, const EntityModel::Normal &) const noexcept;
 
 	bool Intersection(
 		const Ray &ray,
@@ -143,6 +148,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 {