asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #53300 from Calinou/viewport-tweak-configuration-warning-3.x

Browse source
This commit is contained in:
Rémi Verschelde 2021-10-04 20:31:05 +02:00 committed by GitHub
commit 72a922eb4e
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/Viewport.xml
View file

@ -272,7 +272,7 @@
If set to a value greater than [code]0.0[/code], contrast-adaptive sharpening will be applied to the 3D viewport. This has a low performance cost and can be used to recover some of the sharpness lost from using FXAA. Values around [code]0.5[/code] generally give the best results. See also [member fxaa].
</member>
<member name="size" type="Vector2" setter="set_size" getter="get_size" default="Vector2( 0, 0 )">
The width and height of viewport.
The width and height of viewport. Must be set to a value greater than or equal to 2 pixels on both dimensions. Otherwise, nothing will be displayed.
</member>
<member name="size_override_stretch" type="bool" setter="set_size_override_stretch" getter="is_size_override_stretch_enabled" default="false">
If [code]true[/code], the size override affects stretch as well.

5
scene/main/viewport.cpp
View file

@ -720,6 +720,7 @@ void Viewport::set_size(const Size2 &p_size) {
VS::get_singleton()->viewport_set_size(viewport, size.width, size.height);
_update_stretch_transform();
update_configuration_warning();
emit_signal("size_changed");
}
@ -2935,11 +2936,11 @@ String Viewport::get_configuration_warning() const {
String warning = Node::get_configuration_warning();
if (size.x == 0 || size.y == 0) {
if (size.x <= 1 || size.y <= 1) {
if (warning != String()) {
warning += "\n\n";
}
warning += TTR("Viewport size must be greater than 0 to render anything.");
warning += TTR("The Viewport size must be greater than or equal to 2 pixels on both dimensions to render anything.");
}
return warning;
}