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

[2.1] Add expand stretch/ascpect - no more black bars

Browse Source
This commit is contained in:
Yakov Borevich 2017-08-09 10:53:38 +03:00
parent 303893144b
commit 3401ca6803
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/main.cpp
View File

@ -1223,6 +1223,8 @@ bool Main::start() {
sml_aspect = SceneTree::STRETCH_ASPECT_KEEP_WIDTH; sml_aspect = SceneTree::STRETCH_ASPECT_KEEP_WIDTH;
else if (stretch_aspect == "keep_height") else if (stretch_aspect == "keep_height")
sml_aspect = SceneTree::STRETCH_ASPECT_KEEP_HEIGHT; sml_aspect = SceneTree::STRETCH_ASPECT_KEEP_HEIGHT;
else if (stretch_aspect == "expand")
sml_aspect = SceneTree::STRETCH_ASPECT_EXPAND;
sml->set_screen_stretch(sml_sm, sml_aspect, stretch_size); sml->set_screen_stretch(sml_sm, sml_aspect, stretch_size);
@ -1235,7 +1237,7 @@ bool Main::start() {
GLOBAL_DEF("display/stretch_mode", "disabled"); GLOBAL_DEF("display/stretch_mode", "disabled");
Globals::get_singleton()->set_custom_property_info("display/stretch_mode", PropertyInfo(Variant::STRING, "display/stretch_mode", PROPERTY_HINT_ENUM, "disabled,2d,viewport")); Globals::get_singleton()->set_custom_property_info("display/stretch_mode", PropertyInfo(Variant::STRING, "display/stretch_mode", PROPERTY_HINT_ENUM, "disabled,2d,viewport"));
GLOBAL_DEF("display/stretch_aspect", "ignore"); GLOBAL_DEF("display/stretch_aspect", "ignore");
Globals::get_singleton()->set_custom_property_info("display/stretch_aspect", PropertyInfo(Variant::STRING, "display/stretch_aspect", PROPERTY_HINT_ENUM, "ignore,keep,keep_width,keep_height")); Globals::get_singleton()->set_custom_property_info("display/stretch_aspect", PropertyInfo(Variant::STRING, "display/stretch_aspect", PROPERTY_HINT_ENUM, "ignore,keep,keep_width,keep_height,expand"));
sml->set_auto_accept_quit(GLOBAL_DEF("application/auto_accept_quit", true)); sml->set_auto_accept_quit(GLOBAL_DEF("application/auto_accept_quit", true));
} }

9
scene/main/scene_main_loop.cpp
View File

@ -1027,7 +1027,7 @@ void SceneTree::_update_root_rect() {
} else if (viewport_aspect < video_mode_aspect) { } else if (viewport_aspect < video_mode_aspect) {
// screen ratio is smaller vertically // screen ratio is smaller vertically
if (stretch_aspect == STRETCH_ASPECT_KEEP_HEIGHT) { if (stretch_aspect == STRETCH_ASPECT_KEEP_HEIGHT || stretch_aspect == STRETCH_ASPECT_EXPAND) {
//will stretch horizontally //will stretch horizontally
viewport_size.x = desired_res.y * video_mode_aspect; viewport_size.x = desired_res.y * video_mode_aspect;
@ -1042,7 +1042,7 @@ void SceneTree::_update_root_rect() {
} }
} else { } else {
//screen ratio is smaller horizontally //screen ratio is smaller horizontally
if (stretch_aspect == STRETCH_ASPECT_KEEP_WIDTH) { if (stretch_aspect == STRETCH_ASPECT_KEEP_WIDTH || stretch_aspect == STRETCH_ASPECT_EXPAND) {
//will stretch horizontally //will stretch horizontally
viewport_size.x = desired_res.x; viewport_size.x = desired_res.x;
@ -1063,12 +1063,11 @@ void SceneTree::_update_root_rect() {
Size2 margin; Size2 margin;
Size2 offset; Size2 offset;
//black bars and margin //black bars and margin
if (screen_size.x < video_mode.x) { if (stretch_aspect != STRETCH_ASPECT_EXPAND && screen_size.x < video_mode.x) {
margin.x = Math::round((video_mode.x - screen_size.x) / 2.0); margin.x = Math::round((video_mode.x - screen_size.x) / 2.0);
VisualServer::get_singleton()->black_bars_set_margins(margin.x, 0, margin.x, 0); VisualServer::get_singleton()->black_bars_set_margins(margin.x, 0, margin.x, 0);
offset.x = Math::round(margin.x * viewport_size.y / screen_size.y); offset.x = Math::round(margin.x * viewport_size.y / screen_size.y);
} else if (screen_size.y < video_mode.y) { } else if (stretch_aspect != STRETCH_ASPECT_EXPAND && screen_size.y < video_mode.y) {
margin.y = Math::round((video_mode.y - screen_size.y) / 2.0); margin.y = Math::round((video_mode.y - screen_size.y) / 2.0);
VisualServer::get_singleton()->black_bars_set_margins(0, margin.y, 0, margin.y); VisualServer::get_singleton()->black_bars_set_margins(0, margin.y, 0, margin.y);
offset.y = Math::round(margin.y * viewport_size.x / screen_size.x); offset.y = Math::round(margin.y * viewport_size.x / screen_size.x);

1
scene/main/scene_main_loop.h
View File

@ -66,6 +66,7 @@ public:
STRETCH_ASPECT_KEEP, STRETCH_ASPECT_KEEP,
STRETCH_ASPECT_KEEP_WIDTH, STRETCH_ASPECT_KEEP_WIDTH,
STRETCH_ASPECT_KEEP_HEIGHT, STRETCH_ASPECT_KEEP_HEIGHT,
STRETCH_ASPECT_EXPAND,
}; };
private: private: