X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcontroller.cpp;h=b996f9e37a04c80301a5776c288b5af09202b38e;hb=9c2baccb84195b7a2858c2b967c94d15cd31836b;hp=a1d3a9871aa204a3ce2bc3f52e63b43850acf429;hpb=eca1fdcc8e34a4918418b2de122c6200aeb7ceaf;p=blank.git

diff --git a/src/controller.cpp b/src/controller.cpp
index a1d3a98..b996f9e 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -9,16 +9,7 @@ namespace blank {
 FPSController::FPSController(Entity &entity)
 : entity(entity)
 , pitch(0)
-, yaw(0)
-, move_velocity(0.005f)
-, pitch_sensitivity(-0.0025f)
-, yaw_sensitivity(-0.001f)
-, front(false)
-, back(false)
-, left(false)
-, right(false)
-, up(false)
-, down(false) {
+, yaw(0) {
 
 }
 
@@ -50,56 +41,9 @@ void FPSController::RotateYaw(float delta) {
 }
 
 
-void FPSController::HandleKeyboard(const SDL_KeyboardEvent &event) {
-	switch (event.keysym.sym) {
-		case SDLK_w:
-			front = event.state == SDL_PRESSED;
-			break;
-		case SDLK_s:
-			back = event.state == SDL_PRESSED;
-			break;
-		case SDLK_a:
-			left = event.state == SDL_PRESSED;
-			break;
-		case SDLK_d:
-			right = event.state == SDL_PRESSED;
-			break;
-		case SDLK_q:
-		case SDLK_SPACE:
-			up = event.state == SDL_PRESSED;
-			break;
-		case SDLK_e:
-		case SDLK_LSHIFT:
-			down = event.state == SDL_PRESSED;
-			break;
-	}
-}
-
-void FPSController::HandleMouse(const SDL_MouseMotionEvent &event) {
-	RotateYaw(event.xrel * yaw_sensitivity);
-	RotatePitch(event.yrel * pitch_sensitivity);
-}
-
-
 void FPSController::Update(int dt) {
-	glm::vec3 vel;
-	if (right && !left) {
-		vel.x = move_velocity;
-	} else if (left && !right) {
-		vel.x = -move_velocity;
-	}
-	if (up && !down) {
-		vel.y = move_velocity;
-	} else if (down && !up) {
-		vel.y = -move_velocity;
-	}
-	if (back && !front) {
-		vel.z = move_velocity;
-	} else if (front && !back) {
-		vel.z = -move_velocity;
-	}
 	entity.Rotation(glm::eulerAngleYX(yaw, pitch));
-	entity.Velocity(glm::rotateY(vel, yaw));
+	entity.Velocity(glm::rotateY(velocity, yaw));
 }
 
 }