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

Merge pull request #53299 from Calinou/viewport-tweak-configuration-warning

Browse Source
This commit is contained in:
Rémi Verschelde 2022-08-25 21:44:31 +02:00 committed by GitHub
commit 060d0ce882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/SubViewport.xml
View File

@ -25,7 +25,7 @@
The update mode when the sub-viewport is used as a render target. The update mode when the sub-viewport is used as a render target.
</member> </member>
<member name="size" type="Vector2i" setter="set_size" getter="get_size" default="Vector2i(512, 512)"> <member name="size" type="Vector2i" setter="set_size" getter="get_size" default="Vector2i(512, 512)">
The width and height of the sub-viewport. The width and height of the sub-viewport. Must be set to a value greater than or equal to 2 pixels on both dimensions. Otherwise, nothing will be displayed.
</member> </member>
<member name="size_2d_override" type="Vector2i" setter="set_size_2d_override" getter="get_size_2d_override" default="Vector2i(0, 0)"> <member name="size_2d_override" type="Vector2i" setter="set_size_2d_override" getter="get_size_2d_override" default="Vector2i(0, 0)">
The 2D size override of the sub-viewport. If either the width or height is [code]0[/code], the override is disabled. The 2D size override of the sub-viewport. If either the width or height is [code]0[/code], the override is disabled.

5
scene/main/viewport.cpp
View File

@ -798,6 +798,7 @@ void Viewport::_set_size(const Size2i &p_size, const Size2i &p_size_2d_override,
RS::get_singleton()->viewport_set_size(viewport, 0, 0); RS::get_singleton()->viewport_set_size(viewport, 0, 0);
} }
_update_global_transform(); _update_global_transform();
update_configuration_warnings();
update_canvas_items(); update_canvas_items();
@ -2853,8 +2854,8 @@ Variant Viewport::gui_get_drag_data() const {
TypedArray<String> Viewport::get_configuration_warnings() const { TypedArray<String> Viewport::get_configuration_warnings() const {
TypedArray<String> warnings = Node::get_configuration_warnings(); TypedArray<String> warnings = Node::get_configuration_warnings();
if (size.x == 0 || size.y == 0) { if (size.x <= 1 || size.y <= 1) {
warnings.push_back(RTR("Viewport size must be greater than 0 to render anything.")); warnings.push_back(RTR("The Viewport size must be greater than or equal to 2 pixels on both dimensions to render anything."));
} }
return warnings; return warnings;
} }