X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2Fui.cpp;h=838b1ee8e94168fd02c163803f123383b559c701;hb=dc9e991ce52da5d89722e1b5f3862988afaa41cc;hp=c45b34b13213cf85dc6317e46e63fecae0abfa2d;hpb=4fbf5a3c1b0e530706023f5fc4be2f68d30ea645;p=blank.git

diff --git a/src/ui/ui.cpp b/src/ui/ui.cpp
index c45b34b..838b1ee 100644
--- a/src/ui/ui.cpp
+++ b/src/ui/ui.cpp
@@ -97,10 +97,10 @@ void PlayerController::Invalidate() noexcept {
 void PlayerController::UpdatePlayer() noexcept {
 	if (dirty) {
 		Ray aim = player.Aim();
-		if (!world.Intersection(aim, glm::mat4(1.0f), player.GetEntity().ChunkCoords(), aim_world)) {
+		if (!world.Intersection(aim, player.GetEntity().ChunkCoords(), aim_world)) {
 			aim_world = WorldCollision();
 		}
-		if (!world.Intersection(aim, glm::mat4(1.0f), player.GetEntity(), aim_entity)) {
+		if (!world.Intersection(aim, player.GetEntity(), aim_entity)) {
 			aim_entity = EntityCollision();
 		}
 		if (aim_world && aim_entity) {
@@ -597,20 +597,19 @@ void Interface::HandlePress(const SDL_KeyboardEvent &event) {
 			break;
 
 		case Keymap::TOGGLE_AUDIO:
-			config.audio.enabled = !config.audio.enabled;
-			client_ctrl.SetAudio(config.audio.enabled);
+			client_ctrl.SetAudio(!config.audio.enabled);
 			break;
 		case Keymap::TOGGLE_VIDEO:
-			config.video.world = !config.video.world;
-			client_ctrl.SetVideo(config.video.world);
+			client_ctrl.SetVideo(!config.video.world);
 			break;
 		case Keymap::TOGGLE_HUD:
-			config.video.hud = !config.video.hud;
-			client_ctrl.SetHUD(config.video.hud);
+			client_ctrl.SetHUD(!config.video.hud);
 			break;
 		case Keymap::TOGGLE_DEBUG:
-			config.video.debug = !config.video.debug;
-			client_ctrl.SetDebug(config.video.debug);
+			client_ctrl.SetDebug(!config.video.debug);
+			break;
+		case Keymap::CAMERA_NEXT:
+			client_ctrl.NextCamera();
 			break;
 
 		default:
@@ -780,7 +779,6 @@ void Keymap::LoadDefault() {
 	Map(SDL_SCANCODE_0, INV_10);
 
 	Map(SDL_SCANCODE_INSERT, SECONDARY);
-	Map(SDL_SCANCODE_RETURN, SECONDARY);
 	Map(SDL_SCANCODE_MENU, TERTIARY);
 	Map(SDL_SCANCODE_DELETE, PRIMARY);
 	Map(SDL_SCANCODE_BACKSPACE, PRIMARY);
@@ -789,6 +787,7 @@ void Keymap::LoadDefault() {
 	Map(SDL_SCANCODE_F2, TOGGLE_VIDEO);
 	Map(SDL_SCANCODE_F3, TOGGLE_DEBUG);
 	Map(SDL_SCANCODE_F4, TOGGLE_AUDIO);
+	Map(SDL_SCANCODE_F5, CAMERA_NEXT);
 
 	Map(SDL_SCANCODE_ESCAPE, EXIT);
 }
@@ -874,6 +873,7 @@ std::map<std::string, Keymap::Action> action_map = {
 	{ "toggle_video", Keymap::TOGGLE_VIDEO },
 	{ "toggle_hud", Keymap::TOGGLE_HUD },
 	{ "toggle_debug", Keymap::TOGGLE_DEBUG },
+	{ "camera_next", Keymap::CAMERA_NEXT },
 
 	{ "exit", Keymap::EXIT },
 };