From 0ac3e8c19faa23c8445341ffc4f9341c9352eec5 Mon Sep 17 00:00:00 2001 From: i418c Date: Thu, 16 Oct 2014 19:57:11 -0700 Subject: [PATCH 1/3] Fix Freelook on Linux and add speed reset. Should fix issue 7692. Also fixes issue 7147. I have no idea if these changes will affect Mac or Windows users, so please test. --- Source/Core/DolphinWX/Frame.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 4fa5458b9d..a034e39de4 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1150,10 +1150,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event) static float debugSpeed = 1.0f; switch (event.GetKeyCode()) { - case '9': + case '(': debugSpeed /= 2.0f; break; - case '0': + case ')': debugSpeed *= 2.0f; break; case 'W': @@ -1177,6 +1177,9 @@ void CFrame::OnKeyDown(wxKeyEvent& event) case 'R': VertexShaderManager::ResetView(); break; + case 'F': + debugSpeed = 1.0f; + break; default: break; } From 5394967e030178e308daf5ed1b9f21ca0ca8df4b Mon Sep 17 00:00:00 2001 From: i418c Date: Thu, 16 Oct 2014 19:58:15 -0700 Subject: [PATCH 2/3] Update freelook description. --- Source/Core/DolphinWX/VideoConfigDiag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index 5274b1e3ea..88781ea113 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -145,7 +145,7 @@ static wxString dump_efb_desc = wxTRANSLATE("Dump the contents of EFB copies to #if !defined WIN32 && defined HAVE_LIBAV static wxString use_ffv1_desc = wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked."); #endif -static wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked."); +static wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n\nIf unsure, leave this unchecked."); static wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n\nIf unsure, leave this unchecked."); static wxString omp_desc = wxTRANSLATE("Use multiple threads to decode textures.\nMight result in a speedup (especially on CPUs with more than two cores).\n\nIf unsure, leave this unchecked."); static wxString ppshader_desc = wxTRANSLATE("Apply a post-processing effect after finishing a frame.\n\nIf unsure, select (off)."); From 92d4e382676d1e11826ef9e307e9ab094de422db Mon Sep 17 00:00:00 2001 From: i418c Date: Sun, 16 Nov 2014 10:39:54 -0800 Subject: [PATCH 3/3] Changed the hotkeys to 1 and 2. Message in GUI changed to reflect this. --- Source/Core/DolphinWX/Frame.cpp | 4 ++-- Source/Core/DolphinWX/VideoConfigDiag.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index a034e39de4..4984a125e1 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1150,10 +1150,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event) static float debugSpeed = 1.0f; switch (event.GetKeyCode()) { - case '(': + case '1': debugSpeed /= 2.0f; break; - case ')': + case '2': debugSpeed *= 2.0f; break; case 'W': diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index 88781ea113..17b7f441bb 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -145,7 +145,7 @@ static wxString dump_efb_desc = wxTRANSLATE("Dump the contents of EFB copies to #if !defined WIN32 && defined HAVE_LIBAV static wxString use_ffv1_desc = wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked."); #endif -static wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n\nIf unsure, leave this unchecked."); +static wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n\nIf unsure, leave this unchecked."); static wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n\nIf unsure, leave this unchecked."); static wxString omp_desc = wxTRANSLATE("Use multiple threads to decode textures.\nMight result in a speedup (especially on CPUs with more than two cores).\n\nIf unsure, leave this unchecked."); static wxString ppshader_desc = wxTRANSLATE("Apply a post-processing effect after finishing a frame.\n\nIf unsure, select (off).");