diff options
| author | George Marques | 2016-09-03 19:25:43 -0300 |
|---|---|---|
| committer | George Marques | 2016-09-03 19:28:49 -0300 |
| commit | e21702f76403845e915f3226f3c142d0dec8cb71 (patch) | |
| tree | cdb10b21a53da32237e035ae1091f43e64edbe84 /main/input_default.cpp | |
| parent | 2f0e2a78b5caaf659e078c549682e3d1347f7066 (diff) | |
| download | godot-e21702f76403845e915f3226f3c142d0dec8cb71.tar.gz godot-e21702f76403845e915f3226f3c142d0dec8cb71.tar.zst godot-e21702f76403845e915f3226f3c142d0dec8cb71.zip | |
Implement missing WinRT functions
- Fix buildsystem for WinRT/UWP platform.
- Add audio driver and joystick mapping for WinRT.
- Enable thread class for WinRT.
- Refactor MSVC compiler architecture detection to methods.py, so it can
be used by Windows and WinRT.
Diffstat (limited to 'main/input_default.cpp')
| -rw-r--r-- | main/input_default.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index f93a142c5..5bd277044 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -660,6 +660,10 @@ static const char *s_ControllerMappings [] = "303534632d303563342d576972656c65,PS4 Controller USB/Win,leftx:a0,lefty:a1,dpdown:b15,rightstick:b11,rightshoulder:b5,rightx:a2,start:b9,righty:a5,lefttrigger:a3,x:b0,dpup:b14,dpleft:b16,dpright:b17,back:b8,leftstick:b10,leftshoulder:b4,y:b3,a:b1,righttrigger:b7,b:b2,", "c2a94d6963726f736f66742058626f78,Wireless X360 Controller,leftx:a0,lefty:a1,dpdown:b14,rightstick:b10,rightshoulder:b5,rightx:a3,start:b7,righty:a4,dpleft:b11,lefttrigger:a2,x:b2,dpup:b13,back:b6,leftstick:b9,leftshoulder:b4,y:b3,a:b0,dpright:b12,righttrigger:a5,b:b1,", #endif + + #ifdef WINRT_ENABLED + "__WINRT_GAMEPAD__,Xbox Controller,a:b2,b:b3,x:b4,y:b5,start:b0,back:b1,leftstick:b12,rightstick:b13,leftshoulder:b10,rightshoulder:b11,dpup:b6,dpdown:b7,dpleft:b8,dpright:b9,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,", + #endif NULL }; |
