X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcontroller.hpp;h=c13a14ec5c8043fe5e1c6d92006bb33b327a2490;hb=950adaa5bdb9bf758400f2c00df623865b6bff1d;hp=853eeff3bd244603727866d03df28f0f858621b7;hpb=753be639d7d04f9f7415db9fc2721485c531f0a1;p=blank.git

diff --git a/src/controller.hpp b/src/controller.hpp
index 853eeff..c13a14e 100644
--- a/src/controller.hpp
+++ b/src/controller.hpp
@@ -1,9 +1,9 @@
 #ifndef BLANK_CONTROLLER_HPP_
 #define BLANK_CONTROLLER_HPP_
 
+#include "entity.hpp"
 #include "geometry.hpp"
 
-#include <SDL.h>
 #include <glm/glm.hpp>
 
 
@@ -12,15 +12,12 @@ namespace blank {
 class FPSController {
 
 public:
-	FPSController();
+	explicit FPSController(Entity &);
 
-	const glm::mat4 &Transform() const;
-	Ray Aim() const;
+	Ray Aim() const { return entity.Aim(entity.ChunkCoords()); }
 
-	void Velocity(glm::vec3 vel) { velocity = vel; dirty = true; }
-	void OrientationVelocity(const glm::vec3 &vel);
-	void Position(glm::vec3 pos) { position = pos; dirty = true; }
-	void Move(glm::vec3 delta) { Position(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; }
@@ -30,26 +27,16 @@ public:
 	void Yaw(float y);
 	void RotateYaw(float delta);
 
-	void HandleKeyboard(const SDL_KeyboardEvent &);
-	void HandleMouse(const SDL_MouseMotionEvent &);
-
 	void Update(int dt);
 
 private:
+	Entity &entity;
+
 	glm::vec3 velocity;
-	glm::vec3 position;
+
 	float pitch;
 	float yaw;
 
-	mutable glm::mat4 transform;
-	mutable bool dirty;
-
-	float move_velocity;
-	float pitch_sensitivity;
-	float yaw_sensitivity;
-
-	bool front, back, left, right, up, down;
-
 };
 
 }