godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rémi Verschelde
2022-07-03 02:41:26 +02:00
committed by GitHub
parent 86229d0b03 f64d5f4095
commit 3d19f21576
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 {