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

Merge pull request #52137 from Ansraer/3.x-2d-scale-factor

Browse Source
This commit is contained in:
Rémi Verschelde
2021-10-05 19:12:19 +02:00
committed by GitHub
parent d35fccb651 d44aa61735
commit 77f52bdf99
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/SceneTree.xml
View File

@@ -217,9 +217,9 @@
<argument index="0" name="mode" type="int" enum="SceneTree.StretchMode" /> <argument index="0" name="mode" type="int" enum="SceneTree.StretchMode" />
<argument index="1" name="aspect" type="int" enum="SceneTree.StretchAspect" /> <argument index="1" name="aspect" type="int" enum="SceneTree.StretchAspect" />
<argument index="2" name="minsize" type="Vector2" /> <argument index="2" name="minsize" type="Vector2" />
<argument index="3" name="shrink" type="float" default="1" /> <argument index="3" name="scale" type="float" default="1" />
<description> <description>
Configures screen stretching to the given [enum StretchMode], [enum StretchAspect], minimum size and [code]shrink[/code] ratio. Configures screen stretching to the given [enum StretchMode], [enum StretchAspect], minimum size and [code]scale[/code].
</description> </description>
</method> </method>
</methods> </methods>

7
main/main.cpp
View File

@@ -1862,7 +1862,8 @@ bool Main::start() {
String stretch_mode = GLOBAL_DEF("display/window/stretch/mode", "disabled"); String stretch_mode = GLOBAL_DEF("display/window/stretch/mode", "disabled");
String stretch_aspect = GLOBAL_DEF("display/window/stretch/aspect", "ignore"); String stretch_aspect = GLOBAL_DEF("display/window/stretch/aspect", "ignore");
Size2i stretch_size = Size2(GLOBAL_DEF("display/window/size/width", 0), GLOBAL_DEF("display/window/size/height", 0)); Size2i stretch_size = Size2(GLOBAL_DEF("display/window/size/width", 0), GLOBAL_DEF("display/window/size/height", 0));
real_t stretch_shrink = GLOBAL_DEF("display/window/stretch/shrink", 1.0); // out of compatability reasons stretch_scale is called shrink when exposed to the user.
real_t stretch_scale = GLOBAL_DEF("display/window/stretch/shrink", 1.0);
SceneTree::StretchMode sml_sm = SceneTree::STRETCH_MODE_DISABLED; SceneTree::StretchMode sml_sm = SceneTree::STRETCH_MODE_DISABLED;
if (stretch_mode == "2d") { if (stretch_mode == "2d") {
@@ -1882,7 +1883,7 @@ bool Main::start() {
sml_aspect = SceneTree::STRETCH_ASPECT_EXPAND; sml_aspect = SceneTree::STRETCH_ASPECT_EXPAND;
} }
sml->set_screen_stretch(sml_sm, sml_aspect, stretch_size, stretch_shrink); sml->set_screen_stretch(sml_sm, sml_aspect, stretch_size, stretch_scale);
sml->set_auto_accept_quit(GLOBAL_DEF("application/config/auto_accept_quit", true)); sml->set_auto_accept_quit(GLOBAL_DEF("application/config/auto_accept_quit", true));
sml->set_quit_on_go_back(GLOBAL_DEF("application/config/quit_on_go_back", true)); sml->set_quit_on_go_back(GLOBAL_DEF("application/config/quit_on_go_back", true));
@@ -1927,7 +1928,7 @@ bool Main::start() {
GLOBAL_DEF("display/window/stretch/aspect", "ignore"); GLOBAL_DEF("display/window/stretch/aspect", "ignore");
ProjectSettings::get_singleton()->set_custom_property_info("display/window/stretch/aspect", PropertyInfo(Variant::STRING, "display/window/stretch/aspect", PROPERTY_HINT_ENUM, "ignore,keep,keep_width,keep_height,expand")); ProjectSettings::get_singleton()->set_custom_property_info("display/window/stretch/aspect", PropertyInfo(Variant::STRING, "display/window/stretch/aspect", PROPERTY_HINT_ENUM, "ignore,keep,keep_width,keep_height,expand"));
GLOBAL_DEF("display/window/stretch/shrink", 1.0); GLOBAL_DEF("display/window/stretch/shrink", 1.0);
ProjectSettings::get_singleton()->set_custom_property_info("display/window/stretch/shrink", PropertyInfo(Variant::REAL, "display/window/stretch/shrink", PROPERTY_HINT_RANGE, "1.0,8.0,0.1")); ProjectSettings::get_singleton()->set_custom_property_info("display/window/stretch/shrink", PropertyInfo(Variant::REAL, "display/window/stretch/shrink", PROPERTY_HINT_RANGE, "0.1,8,0.01,or_greater"));
sml->set_auto_accept_quit(GLOBAL_DEF("application/config/auto_accept_quit", true)); sml->set_auto_accept_quit(GLOBAL_DEF("application/config/auto_accept_quit", true));
sml->set_quit_on_go_back(GLOBAL_DEF("application/config/quit_on_go_back", true)); sml->set_quit_on_go_back(GLOBAL_DEF("application/config/quit_on_go_back", true));
GLOBAL_DEF("gui/common/snap_controls_to_pixels", true); GLOBAL_DEF("gui/common/snap_controls_to_pixels", true);

25
scene/main/scene_tree.cpp
View File

@@ -1106,11 +1106,11 @@ int SceneTree::get_node_count() const {
void SceneTree::_update_root_rect() { void SceneTree::_update_root_rect() {
if (stretch_mode == STRETCH_MODE_DISABLED) { if (stretch_mode == STRETCH_MODE_DISABLED) {
_update_font_oversampling(1.0); _update_font_oversampling(stretch_scale);
root->set_size((last_screen_size / stretch_shrink).floor()); root->set_size(last_screen_size.floor());
root->set_attach_to_screen_rect(Rect2(Point2(), last_screen_size)); root->set_attach_to_screen_rect(Rect2(Point2(), last_screen_size));
root->set_size_override_stretch(false); root->set_size_override_stretch(true);
root->set_size_override(false, Size2()); root->set_size_override(true, (last_screen_size / stretch_scale).floor());
root->update_canvas_items(); root->update_canvas_items();
return; //user will take care return; //user will take care
} }
@@ -1185,20 +1185,19 @@ void SceneTree::_update_root_rect() {
switch (stretch_mode) { switch (stretch_mode) {
case STRETCH_MODE_DISABLED: { case STRETCH_MODE_DISABLED: {
// Already handled above // Already handled above
_update_font_oversampling(1.0);
} break; } break;
case STRETCH_MODE_2D: { case STRETCH_MODE_2D: {
_update_font_oversampling(screen_size.x / viewport_size.x); //screen / viewport radio drives oversampling _update_font_oversampling((screen_size.x / viewport_size.x) * stretch_scale); //screen / viewport ratio drives oversampling
root->set_size((screen_size / stretch_shrink).floor()); root->set_size(screen_size.floor());
root->set_attach_to_screen_rect(Rect2(margin, screen_size)); root->set_attach_to_screen_rect(Rect2(margin, screen_size));
root->set_size_override_stretch(true); root->set_size_override_stretch(true);
root->set_size_override(true, (viewport_size / stretch_shrink).floor()); root->set_size_override(true, (viewport_size / stretch_scale).floor());
root->update_canvas_items(); //force them to update just in case root->update_canvas_items(); //force them to update just in case
} break; } break;
case STRETCH_MODE_VIEWPORT: { case STRETCH_MODE_VIEWPORT: {
_update_font_oversampling(1.0); _update_font_oversampling(1.0);
root->set_size((viewport_size / stretch_shrink).floor()); root->set_size((viewport_size / stretch_scale).floor());
root->set_attach_to_screen_rect(Rect2(margin, screen_size)); root->set_attach_to_screen_rect(Rect2(margin, screen_size));
root->set_size_override_stretch(false); root->set_size_override_stretch(false);
root->set_size_override(false, Size2()); root->set_size_override(false, Size2());
@@ -1212,11 +1211,11 @@ void SceneTree::_update_root_rect() {
} }
} }
void SceneTree::set_screen_stretch(StretchMode p_mode, StretchAspect p_aspect, const Size2 &p_minsize, real_t p_shrink) { void SceneTree::set_screen_stretch(StretchMode p_mode, StretchAspect p_aspect, const Size2 &p_minsize, real_t p_scale) {
stretch_mode = p_mode; stretch_mode = p_mode;
stretch_aspect = p_aspect; stretch_aspect = p_aspect;
stretch_min = p_minsize; stretch_min = p_minsize;
stretch_shrink = p_shrink; stretch_scale = p_scale;
_update_root_rect(); _update_root_rect();
} }
@@ -1826,7 +1825,7 @@ void SceneTree::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_frame"), &SceneTree::get_frame); ClassDB::bind_method(D_METHOD("get_frame"), &SceneTree::get_frame);
ClassDB::bind_method(D_METHOD("quit", "exit_code"), &SceneTree::quit, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("quit", "exit_code"), &SceneTree::quit, DEFVAL(-1));
ClassDB::bind_method(D_METHOD("set_screen_stretch", "mode", "aspect", "minsize", "shrink"), &SceneTree::set_screen_stretch, DEFVAL(1)); ClassDB::bind_method(D_METHOD("set_screen_stretch", "mode", "aspect", "minsize", "scale"), &SceneTree::set_screen_stretch, DEFVAL(1));
ClassDB::bind_method(D_METHOD("queue_delete", "obj"), &SceneTree::queue_delete); ClassDB::bind_method(D_METHOD("queue_delete", "obj"), &SceneTree::queue_delete);
@@ -2111,7 +2110,7 @@ SceneTree::SceneTree() {
stretch_mode = STRETCH_MODE_DISABLED; stretch_mode = STRETCH_MODE_DISABLED;
stretch_aspect = STRETCH_ASPECT_IGNORE; stretch_aspect = STRETCH_ASPECT_IGNORE;
stretch_shrink = 1; stretch_scale = 1.0;
last_screen_size = Size2(OS::get_singleton()->get_window_size().width, OS::get_singleton()->get_window_size().height); last_screen_size = Size2(OS::get_singleton()->get_window_size().width, OS::get_singleton()->get_window_size().height);
_update_root_rect(); _update_root_rect();

4
scene/main/scene_tree.h
View File

@@ -146,7 +146,7 @@ private:
StretchMode stretch_mode; StretchMode stretch_mode;
StretchAspect stretch_aspect; StretchAspect stretch_aspect;
Size2i stretch_min; Size2i stretch_min;
real_t stretch_shrink; real_t stretch_scale;
void _update_font_oversampling(float p_ratio); void _update_font_oversampling(float p_ratio);
void _update_root_rect(); void _update_root_rect();
@@ -362,7 +362,7 @@ public:
void get_nodes_in_group(const StringName &p_group, List<Node *> *p_list); void get_nodes_in_group(const StringName &p_group, List<Node *> *p_list);
bool has_group(const StringName &p_identifier) const; bool has_group(const StringName &p_identifier) const;
void set_screen_stretch(StretchMode p_mode, StretchAspect p_aspect, const Size2 &p_minsize, real_t p_shrink = 1); void set_screen_stretch(StretchMode p_mode, StretchAspect p_aspect, const Size2 &p_minsize, real_t p_scale = 1.0);
void set_use_font_oversampling(bool p_oversampling); void set_use_font_oversampling(bool p_oversampling);
bool is_using_font_oversampling() const; bool is_using_font_oversampling() const;