X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FChunk.hpp;h=7b84b6e9cd89a0aff3d4d9f1068bc8cb72b6c3f2;hb=aefc5482b27e3d259b6c9f3f1e4cdd9ef2e6a8d2;hp=02f146e12de2870793bf35f0a3275d8480b07e90;hpb=32909aa3224ec0ed5656721178eb6ad31cd047df;p=blank.git

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index 02f146e..7b84b6e 100644
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -73,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 ||
@@ -102,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;
@@ -128,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,