X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcontroller.hpp;h=c13a14ec5c8043fe5e1c6d92006bb33b327a2490;hb=1b022dd17364c9e3344afd86572f2ead14973cde;hp=8b2cd4eb89d0fcd9761b50ff49553241086566a4;hpb=81531352f0af10ef357e82595098fa596795f000;p=blank.git

diff --git a/src/controller.hpp b/src/controller.hpp
index 8b2cd4e..c13a14e 100644
--- a/src/controller.hpp
+++ b/src/controller.hpp
@@ -1,6 +1,9 @@
 #ifndef BLANK_CONTROLLER_HPP_
 #define BLANK_CONTROLLER_HPP_
 
+#include "entity.hpp"
+#include "geometry.hpp"
+
 #include <glm/glm.hpp>
 
 
@@ -9,28 +12,28 @@ namespace blank {
 class FPSController {
 
 public:
-	FPSController();
-	~FPSController();
+	explicit FPSController(Entity &);
 
-	glm::mat4 Transform() const;
+	Ray Aim() const { return entity.Aim(entity.ChunkCoords()); }
 
-	void Velocity(glm::vec3 vel) { velocity = vel; }
-	void Position(glm::vec3 pos) { position = pos; }
-	void Move(glm::vec3 delta) { position += delta; }
+	const glm::vec3 &Velocity() const { return velocity; }
+	void Velocity(const glm::vec3 &vel) { velocity = vel; }
 
 	// all angles in radians (full circle = 2π)
 	float Pitch() const { return pitch; }
-	void Pitch(float p) { pitch = p; }
-	void RotatePitch(float delta) { pitch += delta; }
+	void Pitch(float p);
+	void RotatePitch(float delta);
 	float Yaw() const { return yaw; }
-	void Yaw(float y) { yaw = y; }
-	void RotateYaw(float delta) { yaw += delta; }
+	void Yaw(float y);
+	void RotateYaw(float delta);
 
 	void Update(int dt);
 
 private:
+	Entity &entity;
+
 	glm::vec3 velocity;
-	glm::vec3 position;
+
 	float pitch;
 	float yaw;