diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-19 18:06:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-19 18:06:22 +0100 |
commit | c6d2768a192eedf9a7903e8fd7b3f6ffa771db11 (patch) | |
tree | 1eec5fa98ea5164061f72582c6a70986af35d97e /platform/javascript/display_server_javascript.h | |
parent | 4a127fd2cc16fa426805bf4e08346a1610bf7ce9 (diff) | |
parent | 46fdba5f8b09e2c52247ab28047f578e32414f1a (diff) | |
download | redot-engine-c6d2768a192eedf9a7903e8fd7b3f6ffa771db11.tar.gz |
Merge pull request #54500 from Faless/js/4.x_webgl
Diffstat (limited to 'platform/javascript/display_server_javascript.h')
-rw-r--r-- | platform/javascript/display_server_javascript.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/javascript/display_server_javascript.h b/platform/javascript/display_server_javascript.h index 80ce772a79..843bb61984 100644 --- a/platform/javascript/display_server_javascript.h +++ b/platform/javascript/display_server_javascript.h @@ -51,6 +51,10 @@ private: }; JSKeyEvent key_event; +#ifdef GLES3_ENABLED + EMSCRIPTEN_WEBGL_CONTEXT_HANDLE webgl_ctx = 0; +#endif + WindowMode window_mode = WINDOW_MODE_WINDOWED; ObjectID window_attached_instance_id = {}; @@ -72,8 +76,6 @@ private: bool swap_cancel_ok = false; // utilities - static void focus_canvas(); - static bool is_canvas_focused(); static void dom2godot_mod(Ref<InputEventWithModifiers> ev, int p_mod); static const char *godot2dom_cursor(DisplayServer::CursorShape p_shape); @@ -121,6 +123,7 @@ public: // mouse virtual void mouse_set_mode(MouseMode p_mode) override; virtual MouseMode mouse_get_mode() const override; + virtual Point2i mouse_get_position() const override; // touch virtual bool screen_is_touchscreen(int p_screen = SCREEN_OF_MAIN_WINDOW) const override; |