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

Fix a font oversampling warning being printed when it shouldn't

This commit is contained in:
Hugo Locurcio 2019-01-31 19:49:10 +01:00
parent 463123a661
commit 355d65aa8d
No known key found for this signature in database
GPG Key ID: 39E8F8BE30B0A49C
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/main/scene_tree.cpp
View File

@ -1154,13 +1154,14 @@ void SceneTree::_update_root_rect() {
float viewport_aspect = desired_res.aspect(); float viewport_aspect = desired_res.aspect();
float video_mode_aspect = video_mode.aspect(); float video_mode_aspect = video_mode.aspect();
if (use_font_oversampling && stretch_aspect == STRETCH_ASPECT_IGNORE) {
WARN_PRINT("Font oversampling only works with the resize modes 'Keep Width', 'Keep Height', and 'Expand'.");
}
if (stretch_aspect == STRETCH_ASPECT_IGNORE || ABS(viewport_aspect - video_mode_aspect) < CMP_EPSILON) { if (stretch_aspect == STRETCH_ASPECT_IGNORE || ABS(viewport_aspect - video_mode_aspect) < CMP_EPSILON) {
//same aspect or ignore aspect //same aspect or ignore aspect
viewport_size = desired_res; viewport_size = desired_res;
screen_size = video_mode; screen_size = video_mode;
if (use_font_oversampling) {
WARN_PRINT("Font oversampling only works with the following resize modes 'Keep Width', 'Keep Height', and 'Expand'.")
}
} else if (viewport_aspect < video_mode_aspect) { } else if (viewport_aspect < video_mode_aspect) {
// screen ratio is smaller vertically // screen ratio is smaller vertically