maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #45921 from Faless/js/3.x_dpi

Browse source 
[3.2] [HTML5] Detect screen scale and DPI.
This commit is contained in:
Rémi Verschelde 2021-02-12 12:24:36 +01:00 committed by GitHub
parent 986b1a9b18 b3f78687de
commit 9918fd722e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
platform/javascript/godot_js.h
View file

@ -51,6 +51,7 @@ extern int godot_js_os_execute(const char *p_json);
extern void godot_js_os_shell_open(const char *p_uri);
// Display
extern int godot_js_display_screen_dpi_get();
extern double godot_js_display_pixel_ratio_get();
extern void godot_js_display_alert(const char *p_text);
extern int godot_js_display_touchscreen_is_available();

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

@ -405,6 +405,27 @@ const GodotDisplay = {
$GodotDisplay__deps: ['$GodotConfig', '$GodotRuntime', '$GodotDisplayCursor', '$GodotDisplayListeners', '$GodotDisplayDragDrop', '$GodotDisplayGamepads'],
$GodotDisplay: {
window_icon: '',
findDPI: function () {
function testDPI(dpi) {
return window.matchMedia(`(max-resolution: ${dpi}dpi)`).matches;
}
function bisect(low, high, func) {
const mid = parseInt(((high - low) / 2) + low, 10);
if (high - low <= 1) {
return func(high) ? high : low;
}
if (func(mid)) {
return bisect(low, mid, func);
}
return bisect(mid, high, func);
}
try {
const dpi = bisect(0, 800, testDPI);
return dpi >= 96 ? dpi : 96;
} catch (e) {
return 96;
}
},
},
godot_js_display_is_swap_ok_cancel__sig: 'i',
@ -422,6 +443,11 @@ const GodotDisplay = {
window.alert(GodotRuntime.parseString(p_text)); // eslint-disable-line no-alert
},
godot_js_display_screen_dpi_get__sig: 'i',
godot_js_display_screen_dpi_get: function () {
return GodotDisplay.findDPI();
},
godot_js_display_pixel_ratio_get__sig: 'f',
godot_js_display_pixel_ratio_get: function () {
return window.devicePixelRatio || 1;

15
platform/javascript/os_javascript.cpp
View file

@ -159,7 +159,8 @@ Size2 OS_JavaScript::get_screen_size(int p_screen) const {
EmscriptenFullscreenChangeEvent ev;
EMSCRIPTEN_RESULT result = emscripten_get_fullscreen_status(&ev);
ERR_FAIL_COND_V(result != EMSCRIPTEN_RESULT_SUCCESS, Size2());
return Size2(ev.screenWidth, ev.screenHeight);
double scale = godot_js_display_pixel_ratio_get();
return Size2(ev.screenWidth * scale, ev.screenHeight * scale);
}
void OS_JavaScript::set_window_size(const Size2 p_size) {
@ -1014,6 +1015,18 @@ bool OS_JavaScript::main_loop_iterate() {
return Main::iteration();
}
int OS_JavaScript::get_screen_dpi(int p_screen) const {
return godot_js_display_screen_dpi_get();
}
float OS_JavaScript::get_screen_scale(int p_screen) const {
return godot_js_display_pixel_ratio_get();
}
float OS_JavaScript::get_screen_max_scale() const {
return get_screen_scale();
}
void OS_JavaScript::delete_main_loop() {
memdelete(main_loop);

3
platform/javascript/os_javascript.h
View file

@ -134,6 +134,9 @@ public:
virtual void set_window_fullscreen(bool p_enabled);
virtual bool is_window_fullscreen() const;
virtual Size2 get_screen_size(int p_screen = -1) const;
virtual int get_screen_dpi(int p_screen = -1) const;
virtual float get_screen_scale(int p_screen = -1) const;
virtual float get_screen_max_scale() const;
virtual Point2 get_mouse_position() const;
virtual int get_mouse_button_state() const;