X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FEntity.hpp;h=4f0d3c435f58e709a4c33dba335453f03b75d81b;hb=33b37e7242e4cbfa76e4a0d6e5bb54223b541162;hp=dcfb4189a3199a210c2056768fcd34eb8176d16a;hpb=cf5ce8220483bb062740eeaedde6474928fd5e0e;p=blank.git

diff --git a/src/world/Entity.hpp b/src/world/Entity.hpp
index dcfb418..4f0d3c4 100644
--- a/src/world/Entity.hpp
+++ b/src/world/Entity.hpp
@@ -3,7 +3,7 @@
 
 #include "Chunk.hpp"
 #include "EntityState.hpp"
-#include "../model/CompositeInstance.hpp"
+#include "../model/Instance.hpp"
 #include "../model/geometry.hpp"
 
 #include <cstdint>
@@ -22,8 +22,8 @@ class Entity {
 public:
 	Entity() noexcept;
 
-	CompositeInstance &GetModel() noexcept { return model; }
-	const CompositeInstance &GetModel() const noexcept { return model; }
+	Instance &GetModel() noexcept { return model; }
+	const Instance &GetModel() const noexcept { return model; }
 
 	std::uint32_t ID() const noexcept { return id; }
 	void ID(std::uint32_t i) noexcept { id = i; }
@@ -37,6 +37,10 @@ public:
 	bool WorldCollidable() const noexcept { return world_collision; }
 	void WorldCollidable(bool b) noexcept { world_collision = b; }
 
+	/// desired velocity in local coordinate system
+	const glm::vec3 &TargetVelocity() const noexcept { return tgt_vel; }
+	void TargetVelocity(const glm::vec3 &v) noexcept { tgt_vel = v; }
+
 	const glm::vec3 &Velocity() const noexcept { return state.velocity; }
 	void Velocity(const glm::vec3 &v) noexcept { state.velocity = v; }
 
@@ -53,16 +57,21 @@ public:
 		return state.Diff(other.state);
 	}
 
-	/// direction is rotation axis, magnitude is speed in rad/ms
-	const glm::vec3 &AngularVelocity() const noexcept { return state.ang_vel; }
-	void AngularVelocity(const glm::vec3 &v) noexcept { state.ang_vel = v; }
-
+	/// orientation of local coordinate system
 	const glm::quat &Orientation() const noexcept { return state.orient; }
 	void Orientation(const glm::quat &o) noexcept { state.orient = o; }
 
-	glm::mat4 Transform(const glm::ivec3 &reference) const noexcept {
-		return state.Transform(reference);
-	}
+	/// orientation of head within local coordinate system, in radians
+	float Pitch() const noexcept { return state.pitch; }
+	float Yaw() const noexcept { return state.yaw; }
+	void TurnHead(float delta_pitch, float delta_yaw) noexcept;
+	void SetHead(float pitch, float yaw) noexcept;
+
+	/// get a transform for this entity's coordinate space
+	glm::mat4 Transform(const glm::ivec3 &reference) const noexcept;
+	/// get a transform for this entity's view space
+	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;
 
 	void SetState(const EntityState &s) noexcept { state = s; }
@@ -76,20 +85,22 @@ public:
 	bool Dead() const noexcept { return dead; }
 	bool CanRemove() const noexcept { return dead && ref_count <= 0; }
 
-	void Update(int dt) noexcept;
-
 	void Render(const glm::mat4 &M, DirectionalLighting &prog) noexcept {
 		if (model) model.Render(M, prog);
 	}
 
 private:
-	CompositeInstance model;
+	void UpdateModel() noexcept;
+
+private:
+	Instance model;
 
 	std::uint32_t id;
 	std::string name;
 
 	AABB bounds;
 	EntityState state;
+	glm::vec3 tgt_vel;
 
 	int ref_count;