diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-22 19:17:24 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-22 19:17:24 -0300 |
| commit | 84d7a559e5198478b1ae23d00dbd966461aadfe7 (patch) | |
| tree | 8480de1917859c12d8c0b081c87190ae07d65244 /platform/javascript/os_javascript.h | |
| parent | 9d571d8eacb07e1b96de049feca976b3309cd21d (diff) | |
| parent | ed3c73408b3b0ddf234ddcc5349fe85831e3ebba (diff) | |
| download | redot-engine-84d7a559e5198478b1ae23d00dbd966461aadfe7.tar.gz | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'platform/javascript/os_javascript.h')
| -rw-r--r-- | platform/javascript/os_javascript.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 61eecd8f32..ec3a6cf911 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -41,6 +41,7 @@ #include "audio_server_javascript.h" #include "audio_driver_javascript.h" #include "main/input_default.h" +#include "emscripten/html5.h" typedef void (*GFXInitFunc)(void *ud,bool gl2,int w, int h, bool fs); typedef int (*OpenURIFunc)(const String&); @@ -90,6 +91,8 @@ private: static void _close_notification_funcs(const String& p_file,int p_flags); + void process_joysticks(); + public: // functions used by main to initialize/deintialize the OS @@ -163,6 +166,11 @@ public: void process_accelerometer(const Vector3& p_accelerometer); void process_touch(int p_what,int p_pointer, const Vector<TouchPos>& p_points); void push_input(const InputEvent& p_ev); + + virtual bool is_joy_known(int p_device); + virtual String get_joy_guid(int p_device) const; + bool joy_connection_changed(int p_type, const EmscriptenGamepadEvent *p_event); + OS_JavaScript(GFXInitFunc p_gfx_init_func,void*p_gfx_init_ud, OpenURIFunc p_open_uri_func, GetDataDirFunc p_get_data_dir_func,GetLocaleFunc p_get_locale_func); ~OS_JavaScript(); |