godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35237 from akien-mga/emscripten-1.39.5-timestamp-removal 

HTML5: Address removal of 'timestamp' in Emscripten 1.39.5
This commit is contained in:
Rémi Verschelde 2020-01-17 14:36:00 +01:00 committed by GitHub
parent 0aefec2454 435f86cf87
commit a6f3e1345c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/javascript/os_javascript.cpp
View File

@ -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) {

2
platform/javascript/os_javascript.h
View File

@ -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;