diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-29 08:52:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 08:52:13 +0100 |
| commit | 6a83c8e8edffb84f5c30f4f1ecd705ee213aff4d (patch) | |
| tree | 4ac2cf8dbef66d7c62d9233571f1a8f2d391e680 /platform/javascript | |
| parent | 15a7b4a7502ce3b0b51fa1acb3edc52851600fa4 (diff) | |
| parent | 640d8cc5d2749bbe29a6a85d076a7bdf264d146b (diff) | |
Merge pull request #13382 from eska014/html5-fix-mousemotion-relative
Fix inverted relative mouse motion in HTML5 export
Diffstat (limited to 'platform/javascript')
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index d5c675d9e0..3b02bfd862 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -201,7 +201,7 @@ static EM_BOOL _mousemove_callback(int event_type, const EmscriptenMouseEvent *m ev->set_position(pos); ev->set_global_position(ev->get_position()); - ev->set_relative(_input->get_mouse_position() - ev->get_position()); + ev->set_relative(ev->get_position() - _input->get_mouse_position()); _input->set_mouse_position(ev->get_position()); ev->set_speed(_input->get_last_mouse_speed()); @@ -336,7 +336,7 @@ static EM_BOOL _touchmove_callback(int event_type, const EmscriptenTouchEvent *t ev_mouse->set_position(Point2(first_touch.canvasX, first_touch.canvasY)); ev_mouse->set_global_position(ev_mouse->get_position()); - ev_mouse->set_relative(_input->get_mouse_position() - ev_mouse->get_position()); + ev_mouse->set_relative(ev_mouse->get_position() - _input->get_mouse_position()); _input->set_mouse_position(ev_mouse->get_position()); ev_mouse->set_speed(_input->get_last_mouse_speed()); |