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

diff --git a/src/world/Chunk.hpp b/src/world/Chunk.hpp
index a75d8e2..f4f0bf0 100644
--- a/src/world/Chunk.hpp
+++ b/src/world/Chunk.hpp
@@ -20,7 +20,7 @@ class WorldCollision;
 class Chunk {
 
 public:
-	using Pos = glm::tvec3<int>;
+	using Pos = glm::ivec3;
 
 public:
 	explicit Chunk(const BlockTypeRegistry &) noexcept;
@@ -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 ||
@@ -127,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,