summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Src/EmuWindow.cpp
diff options
context:
space:
mode:
authordegasus <wickmarkus@web.de>2013-11-29 06:09:54 +0100
committerdegasus <wickmarkus@web.de>2013-11-29 06:09:54 +0100
commit69137cff4c58fbdfcb2b67ad51d2d68cc8ca0cbc (patch)
tree8e83fdf2c8b92dd4cfde01bb4c48b84ca4605d47 /Source/Core/VideoCommon/Src/EmuWindow.cpp
parent95aeedec19db25f7de3bd37cc7281f6f70e0ab58 (diff)
Merge X11+D3D FreeLook feature into DolphinWX
This removes the redundant code and also implements this feature for OSX and Wayland. But so it's dropped for non-wx builds... imo DolphinWX still isn't the best place for this, but now it's in the same file as all other hotkeys. Maybe they'll be moved to InputCommon sometimes at once ...
Diffstat (limited to 'Source/Core/VideoCommon/Src/EmuWindow.cpp')
-rw-r--r--Source/Core/VideoCommon/Src/EmuWindow.cpp53
1 files changed, 0 insertions, 53 deletions
diff --git a/Source/Core/VideoCommon/Src/EmuWindow.cpp b/Source/Core/VideoCommon/Src/EmuWindow.cpp
index 9b8cde5178..7bb675789e 100644
--- a/Source/Core/VideoCommon/Src/EmuWindow.cpp
+++ b/Source/Core/VideoCommon/Src/EmuWindow.cpp
@@ -7,7 +7,6 @@
#include "VideoConfig.h"
#include "EmuWindow.h"
#include "Fifo.h"
-#include "VertexShaderManager.h"
#include "VideoBackendBase.h"
#include "Core.h"
#include "Host.h"
@@ -41,60 +40,8 @@ HWND GetParentWnd()
return m_hParent;
}
-void FreeLookInput( UINT iMsg, WPARAM wParam )
-{
- static bool mouseLookEnabled = false;
- static bool mouseMoveEnabled = false;
- static float lastMouse[2];
- POINT point;
-
- switch(iMsg)
- {
- case WM_MOUSEMOVE:
- if (mouseLookEnabled)
- {
- GetCursorPos(&point);
- VertexShaderManager::RotateView((point.x - lastMouse[0]) / 200.0f, (point.y - lastMouse[1]) / 200.0f);
- lastMouse[0] = (float)point.x;
- lastMouse[1] = (float)point.y;
- }
-
- if (mouseMoveEnabled)
- {
- GetCursorPos(&point);
- VertexShaderManager::TranslateView((point.x - lastMouse[0]) / 50.0f, (point.y - lastMouse[1]) / 50.0f);
- lastMouse[0] = (float)point.x;
- lastMouse[1] = (float)point.y;
- }
- break;
-
- case WM_RBUTTONDOWN:
- GetCursorPos(&point);
- lastMouse[0] = (float)point.x;
- lastMouse[1] = (float)point.y;
- mouseLookEnabled= true;
- break;
- case WM_MBUTTONDOWN:
- GetCursorPos(&point);
- lastMouse[0] = (float)point.x;
- lastMouse[1] = (float)point.y;
- mouseMoveEnabled= true;
- break;
- case WM_RBUTTONUP:
- mouseLookEnabled = false;
- break;
- case WM_MBUTTONUP:
- mouseMoveEnabled = false;
- break;
- }
-}
-
-
LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
{
- if (g_ActiveConfig.bFreeLook)
- FreeLookInput( iMsg, wParam );
-
switch( iMsg )
{
case WM_PAINT: