summaryrefslogtreecommitdiff
path: root/platform/osx/os_osx.h
diff options
context:
space:
mode:
authorAndreas Haas <liu.gam3@gmail.com>2016-09-06 00:47:54 +0200
committerAndreas Haas <liu.gam3@gmail.com>2016-09-06 00:47:54 +0200
commit8c886b9d7a22bfacf25a5f3303c25c099abf55f9 (patch)
tree93a3c18aa9fc4bc42d08e00f4c8910e4cdcee285 /platform/osx/os_osx.h
parent6f7b2d277fc068264b72b0a39d464da03807c628 (diff)
osx: Support gamepad input.
Fixes #3881 Vibration support is not optimal yet as it doesn't try to emulate the "weak" and "strong" motor strength, but just takes the parameter with the highest value for the vibration gain.
Diffstat (limited to 'platform/osx/os_osx.h')
-rw-r--r--platform/osx/os_osx.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 8f89695a68..e23ae49a35 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -31,6 +31,7 @@
#include "os/input.h"
+#include "joystick_osx.h"
#include "drivers/unix/os_unix.h"
#include "main/input_default.h"
#include "servers/visual_server.h"
@@ -76,6 +77,7 @@ public:
SpatialSound2DServerSW *spatial_sound_2d_server;
InputDefault *input;
+ JoystickOSX *joystick_osx;
/* objc */
@@ -203,6 +205,7 @@ public:
virtual void set_window_maximized(bool p_enabled);
virtual bool is_window_maximized() const;
virtual void request_attention();
+ virtual String get_joy_guid(int p_device) const;
void run();