maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge 8ef26808bf into c5a99a2056

Browse source
This commit is contained in:
Hugo Locurcio 2021-11-10 18:00:07 +01:00 committed by GitHub
parent c5a99a2056 8ef26808bf
commit 847b388430
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/Environment.xml
View file

@ -245,7 +245,7 @@
<member name="tonemap_mode" type="int" setter="set_tonemapper" getter="get_tonemapper" enum="Environment.ToneMapper" default="0">
The tonemapping mode to use. Tonemapping is the process that "converts" HDR values to be suitable for rendering on a LDR display. (Godot doesn't support rendering on HDR displays yet.)
</member>
<member name="tonemap_white" type="float" setter="set_tonemap_white" getter="get_tonemap_white" default="1.0">
<member name="tonemap_white" type="float" setter="set_tonemap_white" getter="get_tonemap_white" default="6.0">
The white reference value for tonemapping. Only effective if the [member tonemap_mode] isn't set to [constant TONE_MAPPER_LINEAR].
</member>
<member name="volumetric_fog_albedo" type="Color" setter="set_volumetric_fog_albedo" getter="get_volumetric_fog_albedo" default="Color(1, 1, 1, 1)">

32
editor/plugins/node_3d_editor_plugin.cpp
View file

@ -7116,11 +7116,11 @@ void Node3DEditor::_load_default_preview_settings() {
environ_sky_color->set_pick_color(Color::hex(0x91b2ceff));
environ_ground_color->set_pick_color(Color::hex(0x1f1f21ff));
environ_energy->set_value(1.0);
environ_glow_button->set_pressed(true);
environ_tonemap_button->set_pressed(true);
environ_glow_button->set_pressed(false);
environ_ao_button->set_pressed(false);
environ_gi_button->set_pressed(false);
sun_max_distance->set_value(250);
sun_max_distance->set_value(100);
sun_color->set_pick_color(Color(1, 1, 1));
sun_energy->set_value(1.0);
@ -7768,23 +7768,27 @@ void fragment() {
HBoxContainer *fx_vb = memnew(HBoxContainer);
fx_vb->set_h_size_flags(SIZE_EXPAND_FILL);
environ_ao_button = memnew(Button);
environ_ao_button->set_text(TTR("AO"));
environ_ao_button->set_toggle_mode(true);
environ_ao_button->connect("pressed", callable_mp(this, &Node3DEditor::_preview_settings_changed), varray(), CONNECT_DEFERRED);
fx_vb->add_child(environ_ao_button);
environ_glow_button = memnew(Button);
environ_glow_button->set_text(TTR("Glow"));
environ_glow_button->set_toggle_mode(true);
environ_glow_button->connect("pressed", callable_mp(this, &Node3DEditor::_preview_settings_changed), varray(), CONNECT_DEFERRED);
fx_vb->add_child(environ_glow_button);
environ_tonemap_button = memnew(Button);
environ_tonemap_button->set_text(TTR("Tonemap"));
environ_tonemap_button->set_text(TTR("Filmic Tonemap"));
environ_tonemap_button->set_tooltip(TTR("Uses filmic tonemapping instead of linear tonemapping. This avoids blowing out highlights.\nLow performance cost."));
environ_tonemap_button->set_toggle_mode(true);
environ_tonemap_button->connect("pressed", callable_mp(this, &Node3DEditor::_preview_settings_changed), varray(), CONNECT_DEFERRED);
fx_vb->add_child(environ_tonemap_button);
environ_glow_button = memnew(Button);
environ_glow_button->set_text(TTR("Glow"));
environ_glow_button->set_tooltip(TTR("Makes bright pixels \"bleed\" out, simulating real world vision.\nModerate performance cost."));
environ_glow_button->set_toggle_mode(true);
environ_glow_button->connect("pressed", callable_mp(this, &Node3DEditor::_preview_settings_changed), varray(), CONNECT_DEFERRED);
fx_vb->add_child(environ_glow_button);
environ_ao_button = memnew(Button);
environ_ao_button->set_text(TTR("SSAO"));
environ_ao_button->set_tooltip(TTR("Enables screen-space ambient occlusion, which helps objects stand out from each other.\nModerate performance cost."));
environ_ao_button->set_toggle_mode(true);
environ_ao_button->connect("pressed", callable_mp(this, &Node3DEditor::_preview_settings_changed), varray(), CONNECT_DEFERRED);
fx_vb->add_child(environ_ao_button);
environ_gi_button = memnew(Button);
environ_gi_button->set_text(TTR("GI"));
environ_gi_button->set_text(TTR("SDFGI"));
environ_gi_button->set_tooltip(TTR("Provides semi-real-time global illumination for the scene using signed distance field global illumination.\nStatic objects must have their GI Mode set to Baked or Dynamic for them to contribute to SDFGI.\nHigh performance cost."));
environ_gi_button->set_toggle_mode(true);
environ_gi_button->connect("pressed", callable_mp(this, &Node3DEditor::_preview_settings_changed), varray(), CONNECT_DEFERRED);
fx_vb->add_child(environ_gi_button);

2
scene/resources/environment.h
View file

@ -114,7 +114,7 @@ private:
// Tonemap
ToneMapper tone_mapper = TONE_MAPPER_LINEAR;
float tonemap_exposure = 1.0;
float tonemap_white = 1.0;
float tonemap_white = 6.0;
bool tonemap_auto_exposure_enabled = false;
float tonemap_auto_exposure_min = 0.05;
float tonemap_auto_exposure_max = 8.0;