X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;fp=src%2Fworld%2FEntity.hpp;h=2a4ef89093ff848556841669839c95965f7614e3;hb=4727825186798902f68df5b99a6a32f0ef618454;hp=4b24944b42b7648e2634daf00087b65284aea4bc;hpb=4fbf5a3c1b0e530706023f5fc4be2f68d30ea645;p=blank.git

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index 4b24944..2a4ef89 100644
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -63,11 +63,11 @@ public:
 
 	const glm::vec3 &Velocity() const noexcept { return state.velocity; }
 
-	const glm::vec3 &Position() const noexcept { return state.block_pos; }
-	void Position(const glm::ivec3 &, const glm::vec3 &) noexcept;
-	void Position(const glm::vec3 &) noexcept;
+	const ExactLocation::Fine &Position() const noexcept { return state.pos.block; }
+	void Position(const ExactLocation::Coarse &, const ExactLocation::Fine &) noexcept;
+	void Position(const ExactLocation::Fine &) noexcept;
 
-	const glm::ivec3 ChunkCoords() const noexcept { return state.chunk_pos; }
+	const glm::ivec3 ChunkCoords() const noexcept { return state.pos.chunk; }
 
 	glm::vec3 AbsolutePosition() const noexcept {
 		return state.AbsolutePosition();
@@ -92,7 +92,7 @@ public:
 	/// get a transform for this entity's view space relative to reference chunk
 	glm::mat4 ViewTransform(const glm::ivec3 &reference) const noexcept;
 	/// get a ray in entity's face direction originating from center of vision
-	Ray Aim(const Chunk::Pos &chunk_offset) const noexcept;
+	Ray Aim(const ExactLocation::Coarse &chunk_offset) const noexcept;
 
 	/// true if this entity's position will change (significantly) the next update
 	bool Moving() const noexcept { return speed > 0.0f; }