diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-17 14:36:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-17 14:36:00 +0100 |
| commit | a6f3e1345c4496d4513afbfee35b245f9d53e7d9 (patch) | |
| tree | 64e629c9aeae78da6187245ced3de797196cf3bd /platform | |
| parent | 0aefec24548edbb96e4991ede4465473e0c225e1 (diff) | |
| parent | 435f86cf879965305e15da4f3e9b971b15464b68 (diff) | |
Merge pull request #35237 from akien-mga/emscripten-1.39.5-timestamp-removal
HTML5: Address removal of 'timestamp' in Emscripten 1.39.5
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 3 | ||||
| -rw-r--r-- | platform/javascript/os_javascript.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 5562b059f4..592def8011 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -301,6 +301,7 @@ EM_BOOL OS_JavaScript::mouse_button_callback(int p_event_type, const EmscriptenM ev->set_position(correct_canvas_position(p_event->canvasX, p_event->canvasY)); ev->set_global_position(ev->get_position()); dom2godot_mod(p_event, ev); + switch (p_event->button) { case DOM_BUTTON_LEFT: ev->set_button_index(BUTTON_LEFT); break; case DOM_BUTTON_MIDDLE: ev->set_button_index(BUTTON_MIDDLE); break; @@ -312,7 +313,7 @@ EM_BOOL OS_JavaScript::mouse_button_callback(int p_event_type, const EmscriptenM if (ev->is_pressed()) { - uint64_t diff = p_event->timestamp - os->last_click_ms; + double diff = emscripten_get_now() - os->last_click_ms; if (ev->get_button_index() == os->last_click_button_index) { diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index a5696f8aae..2d1c765e76 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -55,7 +55,7 @@ class OS_JavaScript : public OS_Unix { Point2 touches[32]; Point2i last_click_pos; - uint64_t last_click_ms; + double last_click_ms; int last_click_button_index; MainLoop *main_loop; |