diff options
| author | clayjohn <claynjohn@gmail.com> | 2019-10-01 07:55:04 -0700 |
|---|---|---|
| committer | clayjohn <claynjohn@gmail.com> | 2019-10-01 07:55:04 -0700 |
| commit | afaa68628a809194e1d200521294d966eb07595c (patch) | |
| tree | 8e67201c3752451d93dd1969d7458d0eea34b485 | |
| parent | 871a9d5d56ead0b640618762cd945be0fb2cff97 (diff) | |
| download | redot-engine-afaa68628a809194e1d200521294d966eb07595c.tar.gz | |
updated defaults and documentation for GLES2 glow
| -rw-r--r-- | doc/classes/Environment.xml | 7 | ||||
| -rw-r--r-- | drivers/gles2/rasterizer_scene_gles2.h | 6 | ||||
| -rw-r--r-- | scene/resources/environment.cpp | 5 |
3 files changed, 7 insertions, 11 deletions
diff --git a/doc/classes/Environment.xml b/doc/classes/Environment.xml index 9a943aba51..2b44eb81b1 100644 --- a/doc/classes/Environment.xml +++ b/doc/classes/Environment.xml @@ -177,6 +177,7 @@ Enables fog's light transmission. If enabled, lets reflections light to be transmitted by the fog. </member> <member name="glow_bicubic_upscale" type="bool" setter="set_glow_bicubic_upscale" getter="is_glow_bicubic_upscale_enabled" default="false"> + Smooths out blockiness created by sampling higher levels. </member> <member name="glow_blend_mode" type="int" setter="set_glow_blend_mode" getter="get_glow_blend_mode" enum="Environment.GlowBlendMode" default="2"> Glow blending mode. @@ -193,10 +194,10 @@ Bleed scale of the HDR glow. </member> <member name="glow_hdr_threshold" type="float" setter="set_glow_hdr_bleed_threshold" getter="get_glow_hdr_bleed_threshold" default="1.0"> - Bleed threshold of the HDR glow. + Bleed threshold of the HDR glow. In GLES2, this needs to be below 1.0 in order for glow to be visible, a default value of 0.9 works well. </member> <member name="glow_intensity" type="float" setter="set_glow_intensity" getter="get_glow_intensity" default="0.8"> - Glow intensity. + Glow intensity. In GLES2, this should be increased to 1.5 by default to compensate for not using HDR. </member> <member name="glow_levels/1" type="bool" setter="set_glow_level" getter="is_glow_level_enabled" default="false"> First level of glow (most local). @@ -220,7 +221,7 @@ Seventh level of glow (most global). </member> <member name="glow_strength" type="float" setter="set_glow_strength" getter="get_glow_strength" default="1.0"> - Glow strength. + Glow strength. In GLES2, this should be increased to 1.3 by default to compensate for not using HDR. </member> <member name="ss_reflections_depth_tolerance" type="float" setter="set_ssr_depth_tolerance" getter="get_ssr_depth_tolerance" default="0.2"> </member> diff --git a/drivers/gles2/rasterizer_scene_gles2.h b/drivers/gles2/rasterizer_scene_gles2.h index 366a9020fc..7babcfeed1 100644 --- a/drivers/gles2/rasterizer_scene_gles2.h +++ b/drivers/gles2/rasterizer_scene_gles2.h @@ -420,11 +420,11 @@ public: canvas_max_layer(0), glow_enabled(false), glow_levels((1 << 2) | (1 << 4)), - glow_intensity(1.5), - glow_strength(1.3), + glow_intensity(0.8), + glow_strength(1.0), glow_bloom(0.0), glow_blend_mode(VS::GLOW_BLEND_MODE_SOFTLIGHT), - glow_hdr_bleed_threshold(0.9), + glow_hdr_bleed_threshold(1.0), glow_hdr_bleed_scale(2.0), glow_hdr_luminance_cap(12.0), glow_bicubic_upscale(false), diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp index 2817ec4eb0..bc96b5e9f3 100644 --- a/scene/resources/environment.cpp +++ b/scene/resources/environment.cpp @@ -1374,11 +1374,6 @@ Environment::Environment() : glow_hdr_luminance_cap = 12.0; glow_hdr_bleed_scale = 2.0; glow_bicubic_upscale = false; - if (VisualServer::get_singleton()->is_low_end()) { - glow_hdr_bleed_threshold = 0.9; - glow_intensity = 1.5; - glow_strength = 1.3; - } dof_blur_far_enabled = false; dof_blur_far_distance = 10; |