godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Merge pull request #40755 from Faless/js/fix_and_cancel_swap

Browse Source 
Cancel/OK swap on HTML5 platform, small fixes.
This commit is contained in:
Rémi Verschelde
2020-07-27 14:32:48 +02:00
committed by GitHub
parent 3e87022ecc 0b286a287c
commit 6e577a5b80
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/javascript/display_server_javascript.cpp
View File

@@ -829,6 +829,19 @@ DisplayServer *DisplayServerJavaScript::create_func(const String &p_rendering_dr
} }
DisplayServerJavaScript::DisplayServerJavaScript(const String &p_rendering_driver, WindowMode p_mode, uint32_t p_flags, const Vector2i &p_resolution, Error &r_error) { DisplayServerJavaScript::DisplayServerJavaScript(const String &p_rendering_driver, WindowMode p_mode, uint32_t p_flags, const Vector2i &p_resolution, Error &r_error) {
r_error = OK; // Always succeeds for now.
/* clang-format off */
swap_cancel_ok = EM_ASM_INT({
const win = (['Windows', 'Win64', 'Win32', 'WinCE']);
const plat = navigator.platform || "";
if (win.indexOf(plat) !== -1) {
return 1;
}
return 0;
}) == 1;
/* clang-format on */
RasterizerDummy::make_current(); // TODO GLES2 in Godot 4.0... or webgpu? RasterizerDummy::make_current(); // TODO GLES2 in Godot 4.0... or webgpu?
#if 0 #if 0
EmscriptenWebGLContextAttributes attributes; EmscriptenWebGLContextAttributes attributes;
@@ -1181,6 +1194,10 @@ int DisplayServerJavaScript::get_current_video_driver() const {
return 1; return 1;
} }
bool DisplayServerJavaScript::get_swap_cancel_ok() {
return swap_cancel_ok;
}
void DisplayServerJavaScript::swap_buffers() { void DisplayServerJavaScript::swap_buffers() {
//emscripten_webgl_commit_frame(); //emscripten_webgl_commit_frame();
} }

3
platform/javascript/display_server_javascript.h
View File

@@ -56,6 +56,8 @@ class DisplayServerJavaScript : public DisplayServer {
int last_width = 0; int last_width = 0;
int last_height = 0; int last_height = 0;
bool swap_cancel_ok = false;
// utilities // utilities
static Point2 compute_position_in_canvas(int p_x, int p_y); static Point2 compute_position_in_canvas(int p_x, int p_y);
static void focus_canvas(); static void focus_canvas();
@@ -195,6 +197,7 @@ public:
virtual void set_icon(const Ref<Image> &p_icon); virtual void set_icon(const Ref<Image> &p_icon);
// others // others
virtual bool get_swap_cancel_ok();
virtual void swap_buffers(); virtual void swap_buffers();
static void register_javascript_driver(); static void register_javascript_driver();

1
platform/javascript/javascript_main.cpp
View File

@@ -34,6 +34,7 @@
#include "platform/javascript/os_javascript.h" #include "platform/javascript/os_javascript.h"
#include <emscripten/emscripten.h> #include <emscripten/emscripten.h>
#include <stdlib.h>
static OS_JavaScript *os = nullptr; static OS_JavaScript *os = nullptr;
static uint64_t target_ticks = 0; static uint64_t target_ticks = 0;