From a99b6b2063c9259ef09bd1cc1289087460575d68 Mon Sep 17 00:00:00 2001 From: "L. Krause" Date: Fri, 21 Apr 2017 05:01:31 +0200 Subject: Reimplement HTML5 mouse input without GLUT Fixes inverted scrolling on Chromium --- platform/javascript/os_javascript.h | 1 - 1 file changed, 1 deletion(-) (limited to 'platform/javascript/os_javascript.h') diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index ea906c560f..5d86640d95 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -58,7 +58,6 @@ public: private: Vector touch; Point2 last_mouse; - int last_button_mask; GFXInitFunc gfx_init_func; void *gfx_init_ud; -- cgit v1.2.3 From 86f5ac3d749a6d46d029a7f48e4fb190d51643c4 Mon Sep 17 00:00:00 2001 From: "L. Krause" Date: Mon, 24 Apr 2017 21:41:39 +0200 Subject: Implement HTML5 touch events --- platform/javascript/os_javascript.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'platform/javascript/os_javascript.h') diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 5d86640d95..0c956ecba6 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -49,15 +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 touch; - Point2 last_mouse; + GFXInitFunc gfx_init_func; void *gfx_init_ud; @@ -165,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 &p_points); void push_input(const InputEvent &p_ev); virtual bool is_joy_known(int p_device); -- cgit v1.2.3