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

Merge pull request #49967 from Calinou/viewport-2d-hdr-print-warning

This commit is contained in:
Rémi Verschelde 2022-07-03 02:41:26 +02:00 committed by GitHub
parent 86229d0b03 f64d5f4095
commit 3d19f21576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/classes/Viewport.xml
View File

@ -291,6 +291,7 @@
</member>
<member name="usage" type="int" setter="set_usage" getter="get_usage" enum="Viewport.Usage" default="2">
The rendering mode of viewport.
[b]Note:[/b] If set to [constant USAGE_2D] or [constant USAGE_2D_NO_SAMPLING], [member hdr] will have no effect when enabled since HDR is not supported for 2D.
</member>
<member name="use_32_bpc_depth" type="bool" setter="set_use_32_bpc_depth" getter="get_use_32_bpc_depth" default="false">
If [code]true[/code], allocates the viewport's framebuffer with full floating-point precision (32-bit) instead of half floating-point precision (16-bit). Only effective when [member hdr] is also enabled.

19
scene/main/viewport.cpp
View File

@ -3022,11 +3022,6 @@ Control *Viewport::get_modal_stack_top() const {
}
String Viewport::get_configuration_warning() const {
/*if (get_parent() && !Object::cast_to<Control>(get_parent()) && !render_target) {
return TTR("This viewport is not set as render target. If you intend for it to display its contents directly to the screen, make it a child of a Control so it can obtain a size. Otherwise, make it a RenderTarget and assign its internal texture to some node for display.");
}*/
String warning = Node::get_configuration_warning();
if (size.x <= 1 || size.y <= 1) {
@ -3035,6 +3030,14 @@ String Viewport::get_configuration_warning() const {
}
warning += TTR("The Viewport size must be greater than or equal to 2 pixels on both dimensions to render anything.");
}
if (hdr && (usage == USAGE_2D || usage == USAGE_2D_NO_SAMPLING)) {
if (warning != String()) {
warning += "\n\n";
}
warning += TTR("This Viewport has HDR enabled, but its Usage is set to 2D or 2D No-Sampling.\nHDR is only supported in Viewports that have their Usage set to 3D or 3D No-Effects.\nHDR will be disabled for this Viewport.");
}
return warning;
}
@ -3101,6 +3104,7 @@ void Viewport::set_hdr(bool p_hdr) {
hdr = p_hdr;
VS::get_singleton()->viewport_set_hdr(viewport, p_hdr);
update_configuration_warning();
}
bool Viewport::get_hdr() const {
@ -3121,8 +3125,13 @@ bool Viewport::is_using_32_bpc_depth() const {
}
void Viewport::set_usage(Usage p_usage) {
if (usage == p_usage) {
return;
}
usage = p_usage;
VS::get_singleton()->viewport_set_usage(viewport, VS::ViewportUsage(p_usage));
update_configuration_warning();
}
Viewport::Usage Viewport::get_usage() const {