diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-26 19:28:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 19:28:17 +0200 |
| commit | 4759be3c4bcd0964480a428b17a9680401d6d9b1 (patch) | |
| tree | ed579fefbe5fb3e4a6e774deefc419807922707c /platform/javascript/os_javascript.h | |
| parent | 02c041904f7ced28cd2a006c09725fd9fd60520f (diff) | |
| parent | 86f5ac3d749a6d46d029a7f48e4fb190d51643c4 (diff) | |
| download | redot-engine-4759be3c4bcd0964480a428b17a9680401d6d9b1.tar.gz | |
Merge pull request #8547 from eska014/html5-pointer-input
HTML5: Add (multi-)touch events, fix inverted scrolling
Diffstat (limited to 'platform/javascript/os_javascript.h')
| -rw-r--r-- | platform/javascript/os_javascript.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index ea906c560f..0c956ecba6 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -49,16 +49,7 @@ typedef void (*GFXInitFunc)(void *ud, bool gl2, int w, int h, bool fs); typedef String (*GetDataDirFunc)(); class OS_JavaScript : public OS_Unix { -public: - struct TouchPos { - int id; - Point2 pos; - }; - -private: - Vector<TouchPos> touch; - Point2 last_mouse; - int last_button_mask; + GFXInitFunc gfx_init_func; void *gfx_init_ud; @@ -166,7 +157,6 @@ public: virtual String get_resource_dir() const; 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); |