X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;h=b3eb1f4360e57c5f95fd14039cd4669eacd33ee8;hb=7354c74fb8f409336db3a6d70455fbc10232ae64;hp=802ea90642db422063f33cd23c09f09cf8bd5bcd;hpb=0d580658b896dfec07466c31ae4847455724ee95;p=blank.git

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index 802ea90..b3eb1f4 100644
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -3,8 +3,8 @@
 
 #include "Chunk.hpp"
 #include "EntityState.hpp"
+#include "../geometry/primitive.hpp"
 #include "../model/Instance.hpp"
-#include "../model/geometry.hpp"
 
 #include <cstdint>
 #include <string>
@@ -49,7 +49,9 @@ public:
 	void Name(const std::string &n) { name = n; }
 
 	const AABB &Bounds() const noexcept { return bounds; }
-	void Bounds(const AABB &b) noexcept { bounds = b; }
+	// get distance between local origin and farthest vertex
+	float Radius() const noexcept { return radius; }
+	void Bounds(const AABB &b) noexcept { bounds = b; radius = b.OriginRadius(); }
 
 	bool WorldCollidable() const noexcept { return world_collision; }
 	void WorldCollidable(bool b) noexcept { world_collision = b; }
@@ -63,11 +65,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();
@@ -77,6 +79,7 @@ public:
 	}
 
 	/// orientation of local coordinate system
+	void Orientation(const glm::quat &o) noexcept { state.orient = o; }
 	const glm::quat &Orientation() const noexcept { return state.orient; }
 
 	/// orientation of head within local coordinate system, in radians
@@ -92,7 +95,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; }
@@ -135,6 +138,7 @@ private:
 	std::string name;
 
 	AABB bounds;
+	float radius;
 	EntityState state;
 
 	/// chunk to model space