Environment brightness, contrast, saturation restore with 3d LUT.

[fire]

Co-authored-by: CptPotato
Co-authored-by: QbieShay

Restored brightness, contrast, saturation adjustments.

Bugsquad edit: This closes #41257.

See also godotengine/godot-proposals#1382

[fire]

Ready for review.

[fire]

Test project for future iFire.

Env Adjustments Game Project.zip

IWLTBAP_LUT_Arapaho_for_SmallHD_GradeTrade.zip

[fire]

Setting the Color correction [now] sets the screen grey and still doesn't work. Revised with Reduz's comments.

[fire]

Will rebase.

[Darkinggq]

LUT 3D 16x1 will future replace the old 8x8 ?

[fire]

Go ahead. On Nov 22, 2020, at 12:52 AM, Clay John <notifications@github.com> wrote:  @clayjohn commented on this pull request. In servers/rendering/rasterizer_rd/shaders/tonemap.glsl:

@@ -23,7 +23,8 @@ layout(location = 0) in vec2 uv_interp;

layout(set = 0, binding = 0) uniform sampler2D source_color; layout(set = 1, binding = 0) uniform sampler2D source_auto_exposure; layout(set = 2, binding = 0) uniform sampler2D source_glow; -layout(set = 3, binding = 0) uniform sampler3D color_correction; +layout(set = 3, binding = 0) uniform sampler2D color_correction_1d; +layout(set = 4, binding = 0) uniform sampler3D color_correction_3d; Mobile devices can only have 4 uniform sets. The easiest way for this to work is to use a new shader version as we discussed on IRC. A shader version is created by adding an ifdef statement. If you want I can make a PR to your branch, just let me know. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or unsubscribe.

[fire]

Used ClayJohn's revision.

void Environment::set_adjustment_color_correction(Ref<Texture> p_color_correction) {
	adjustment_color_correction = p_color_correction;
	Ref<GradientTexture> grad_tex = p_color_correction;
	if (grad_tex.is_valid()) {
		if (!grad_tex->is_connected(CoreStringNames::get_singleton()->changed, callable_mp(this, &Environment::_update_adjustment))) {
			grad_tex->connect(CoreStringNames::get_singleton()->changed, callable_mp(this, &Environment::_update_adjustment));
			if (grad_tex->get_gradient().is_valid() && !grad_tex->get_gradient()->is_connected(CoreStringNames::get_singleton()->changed, callable_mp(this, &Environment::_update_adjustment))) {
				grad_tex->get_gradient()->connect(CoreStringNames::get_singleton()->changed, callable_mp(this, &Environment::_update_adjustment));
			}
		}
	}
	Ref<Texture2D> adjustment_texture_2d = adjustment_color_correction;
	if (adjustment_texture_2d.is_valid()) {
		use_1d_color_correction = true;
	} else {
		use_1d_color_correction = false;
	}
	_update_adjustment();
}

Also restored hard-coded gradient texture updating support. Probably want to make a note that if there's no hard coding, an editor restart is needed.

[clayjohn]

Woohoo! Great work!

[reduz]

Looks ok to me

[akien-mga]

Note that the "Co-authored-by:" fields for @CptPotato and @QbieShay don't seem to work, I think you need to include their email (check their recently used name + email in git log).

[fire]

@akien-mga Done.

[akien-mga]

Thanks!