asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[HTML5] Implement Pointer Lock API in JS library.

Browse source 
Removes more emscripten HTML5 library dependencies.
This commit is contained in:
Fabio Alessandrelli 2021-09-12 18:13:54 +02:00
parent 89c6aaa96d
commit c54f5b90e6
3 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
platform/javascript/godot_js.h
View file

@ -81,6 +81,8 @@ extern void godot_js_display_cursor_set_shape(const char *p_cursor);
extern int godot_js_display_cursor_is_hidden(); extern int godot_js_display_cursor_is_hidden();
extern void godot_js_display_cursor_set_custom_shape(const char *p_shape, const uint8_t *p_ptr, int p_len, int p_hotspot_x, int p_hotspot_y); extern void godot_js_display_cursor_set_custom_shape(const char *p_shape, const uint8_t *p_ptr, int p_len, int p_hotspot_x, int p_hotspot_y);
extern void godot_js_display_cursor_set_visible(int p_visible); extern void godot_js_display_cursor_set_visible(int p_visible);
extern void godot_js_display_cursor_lock_set(int p_lock);
extern int godot_js_display_cursor_is_locked();
// Display gamepad // Display gamepad
extern void godot_js_display_gamepad_cb(void (*p_on_change)(int p_index, int p_connected, const char *p_id, const char *p_guid)); extern void godot_js_display_gamepad_cb(void (*p_on_change)(int p_index, int p_connected, const char *p_id, const char *p_guid));

28
platform/javascript/js/libs/library_godot_display.js
View file

@ -376,6 +376,20 @@ const GodotDisplayCursor = {
delete GodotDisplayCursor.cursors[key]; delete GodotDisplayCursor.cursors[key];
}); });
}, },
lockPointer: function () {
const canvas = GodotConfig.canvas;
if (canvas.requestPointerLock) {
canvas.requestPointerLock();
}
},
releasePointer: function () {
if (document.exitPointerLock) {
document.exitPointerLock();
}
},
isPointerLocked: function () {
return document.pointerLockElement === GodotConfig.canvas;
},
}, },
}; };
mergeInto(LibraryManager.library, GodotDisplayCursor); mergeInto(LibraryManager.library, GodotDisplayCursor);
@ -850,6 +864,20 @@ const GodotDisplay = {
} }
}, },
godot_js_display_cursor_lock_set__sig: 'vi',
godot_js_display_cursor_lock_set: function (p_lock) {
if (p_lock) {
GodotDisplayCursor.lockPointer();
} else {
GodotDisplayCursor.releasePointer();
}
},
godot_js_display_cursor_is_locked__sig: 'i',
godot_js_display_cursor_is_locked: function () {
return GodotDisplayCursor.isPointerLocked() ? 1 : 0;
},
/* /*
* Listeners * Listeners
*/ */

19
platform/javascript/os_javascript.cpp
View file

@ -493,27 +493,26 @@ void OS_JavaScript::set_mouse_mode(OS::MouseMode p_mode) {
if (p_mode == MOUSE_MODE_VISIBLE) { if (p_mode == MOUSE_MODE_VISIBLE) {
godot_js_display_cursor_set_visible(1); godot_js_display_cursor_set_visible(1);
emscripten_exit_pointerlock(); godot_js_display_cursor_lock_set(false);
} else if (p_mode == MOUSE_MODE_HIDDEN) { } else if (p_mode == MOUSE_MODE_HIDDEN) {
godot_js_display_cursor_set_visible(0); godot_js_display_cursor_set_visible(0);
emscripten_exit_pointerlock(); godot_js_display_cursor_lock_set(false);
} else if (p_mode == MOUSE_MODE_CAPTURED) { } else if (p_mode == MOUSE_MODE_CAPTURED) {
godot_js_display_cursor_set_visible(1); godot_js_display_cursor_set_visible(1);
EMSCRIPTEN_RESULT result = emscripten_request_pointerlock(canvas_id, false); godot_js_display_cursor_lock_set(true);
ERR_FAIL_COND_MSG(result == EMSCRIPTEN_RESULT_FAILED_NOT_DEFERRED, "MOUSE_MODE_CAPTURED can only be entered from within an appropriate input callback.");
ERR_FAIL_COND_MSG(result != EMSCRIPTEN_RESULT_SUCCESS, "MOUSE_MODE_CAPTURED can only be entered from within an appropriate input callback.");
} }
} }
OS::MouseMode OS_JavaScript::get_mouse_mode() const { OS::MouseMode OS_JavaScript::get_mouse_mode() const {
if (godot_js_display_cursor_is_hidden()) if (godot_js_display_cursor_is_hidden()) {
return MOUSE_MODE_HIDDEN; return MOUSE_MODE_HIDDEN;
}
EmscriptenPointerlockChangeEvent ev; if (godot_js_display_cursor_is_locked()) {
emscripten_get_pointerlock_status(&ev); return MOUSE_MODE_CAPTURED;
return (ev.isActive && String::utf8(ev.id) == String::utf8(&canvas_id[1])) ? MOUSE_MODE_CAPTURED : MOUSE_MODE_VISIBLE; }
return MOUSE_MODE_VISIBLE;
} }
// Wheel // Wheel