X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fentity.hpp;h=77c7eb57d2e65f330599f752bd30494c4c440ca7;hb=950adaa5bdb9bf758400f2c00df623865b6bff1d;hp=b739ae439bc753e56e0bafb0cbd4865539141271;hpb=b35ce3a6423c554b34b37362c5550bd705e63a1d;p=blank.git

diff --git a/src/entity.hpp b/src/entity.hpp
index b739ae4..77c7eb5 100644
--- a/src/entity.hpp
+++ b/src/entity.hpp
@@ -1,6 +1,8 @@
 #ifndef BLANK_ENTITY_HPP_
 #define BLANK_ENTITY_HPP_
 
+#include "block.hpp"
+#include "chunk.hpp"
 #include "geometry.hpp"
 
 #include <glm/glm.hpp>
@@ -16,24 +18,24 @@ public:
 	const glm::vec3 &Velocity() const { return velocity; }
 	void Velocity(const glm::vec3 &);
 
-	const glm::vec3 &Position() const { return position; }
-	void Position(const glm::vec3 &);
+	const Block::Pos &Position() const { return position; }
+	void Position(const Block::Pos &);
 	void Move(const glm::vec3 &delta);
 
-	const glm::tvec3<int> ChunkCoords() const { return chunk; }
+	const Chunk::Pos ChunkCoords() const { return chunk; }
 
 	const glm::mat4 &Rotation() const { return rotation; }
 	void Rotation(const glm::mat4 &);
 
-	glm::mat4 Transform(const glm::tvec3<int> &chunk_offset) const;
-	Ray Aim(const glm::tvec3<int> &chunk_offset) const;
+	glm::mat4 Transform(const Chunk::Pos &chunk_offset) const;
+	Ray Aim(const Chunk::Pos &chunk_offset) const;
 
 	void Update(int dt);
 
 private:
 	glm::vec3 velocity;
-	glm::vec3 position;
-	glm::tvec3<int> chunk;
+	Block::Pos position;
+	Chunk::Pos chunk;
 
 	glm::mat4 rotation;