X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FChunk.hpp;h=f4f0bf006300d0c68b40e88b6aed65210ce29e96;hb=7bb75960dbf9bfdee9ac865384aca81791b3da5c;hp=8a2ded64e53970ee5929ce9aa336d90f41981d45;hpb=c04ea5a6f67d446ea29aa2e88dc4c666956d7732;p=blank.git

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 8a2ded6..f4f0bf0 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,12 +14,13 @@
 namespace blank {
 
 class BlockType;
+class WorldCollision;
 
 /// cube of size 16 (256 tiles, 4096 blocks)
 class Chunk {
 
 public:
-	using Pos = glm::tvec3<int>;
+	using Pos = glm::ivec3;
 
 public:
 	explicit Chunk(const BlockTypeRegistry &) noexcept;
@@ -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,
@@ -146,7 +151,8 @@ public:
 	bool Intersection(
 		const AABB &box,
 		const glm::mat4 &Mbox,
-		const glm::mat4 &Mchunk) const noexcept;
+		const glm::mat4 &Mchunk,
+		std::vector<WorldCollision> &) const noexcept;
 
 	void Position(const Pos &pos) noexcept { position = pos; }
 	const Pos &Position() const noexcept { return position; }