|
|
@@ -163,6 +163,37 @@ vec3 tonemap_aces(vec3 color, float white) {
|
|
|
return clamp(color_tonemapped / white_tonemapped, vec3(0.0f), vec3(1.0f));
|
|
|
}
|
|
|
|
|
|
+// Adapted from https://github.com/TheRealMJP/BakingLab/blob/master/BakingLab/ACES.hlsl
|
|
|
+// (MIT License).
|
|
|
+vec3 tonemap_aces_fitted(vec3 color, float white) {
|
|
|
+ const float exposure_bias = 1.8f;
|
|
|
+ const float A = 0.0245786f;
|
|
|
+ const float B = 0.000090537f;
|
|
|
+ const float C = 0.983729f;
|
|
|
+ const float D = 0.432951f;
|
|
|
+ const float E = 0.238081f;
|
|
|
+
|
|
|
+ // Exposure bias baked into transform to save shader instructions. Equivalent to `color *= exposure_bias`
|
|
|
+ const mat3 rgb_to_rrt = mat3(
|
|
|
+ vec3(0.59719f * exposure_bias, 0.35458f * exposure_bias, 0.04823f * exposure_bias),
|
|
|
+ vec3(0.07600f * exposure_bias, 0.90834f * exposure_bias, 0.01566f * exposure_bias),
|
|
|
+ vec3(0.02840f * exposure_bias, 0.13383f * exposure_bias, 0.83777f * exposure_bias));
|
|
|
+
|
|
|
+ const mat3 odt_to_rgb = mat3(
|
|
|
+ vec3(1.60475f, -0.53108f, -0.07367f),
|
|
|
+ vec3(-0.10208f, 1.10813f, -0.00605f),
|
|
|
+ vec3(-0.00327f, -0.07276f, 1.07602f));
|
|
|
+
|
|
|
+ color *= rgb_to_rrt;
|
|
|
+ vec3 color_tonemapped = (color * (color + A) - B) / (color * (C * color + D) + E);
|
|
|
+ color_tonemapped *= odt_to_rgb;
|
|
|
+
|
|
|
+ white *= exposure_bias;
|
|
|
+ float white_tonemapped = (white * (white + A) - B) / (white * (C * white + D) + E);
|
|
|
+
|
|
|
+ return clamp(color_tonemapped / white_tonemapped, vec3(0.0f), vec3(1.0f));
|
|
|
+}
|
|
|
+
|
|
|
vec3 tonemap_reinhard(vec3 color, float white) {
|
|
|
return clamp((white * color + color) / (color * white + white), vec3(0.0f), vec3(1.0f));
|
|
|
}
|
|
|
@@ -174,6 +205,12 @@ vec3 linear_to_srgb(vec3 color) { // convert linear rgb to srgb, assumes clamped
|
|
|
|
|
|
// inputs are LINEAR, If Linear tonemapping is selected no transform is performed else outputs are clamped [0, 1] color
|
|
|
vec3 apply_tonemapping(vec3 color, float white) {
|
|
|
+ // Ensure color values are positive.
|
|
|
+ // They can be negative in the case of negative lights, which leads to undesired behavior.
|
|
|
+#if defined(USE_REINHARD_TONEMAPPER) || defined(USE_FILMIC_TONEMAPPER) || defined(USE_ACES_TONEMAPPER) || defined(USE_ACES_FITTED_TONEMAPPER)
|
|
|
+ color = max(vec3(0.0f), color);
|
|
|
+#endif
|
|
|
+
|
|
|
#ifdef USE_REINHARD_TONEMAPPER
|
|
|
return tonemap_reinhard(color, white);
|
|
|
#endif
|
|
|
@@ -186,6 +223,10 @@ vec3 apply_tonemapping(vec3 color, float white) {
|
|
|
return tonemap_aces(color, white);
|
|
|
#endif
|
|
|
|
|
|
+#ifdef USE_ACES_FITTED_TONEMAPPER
|
|
|
+ return tonemap_aces_fitted(color, white);
|
|
|
+#endif
|
|
|
+
|
|
|
return color; // no other selected -> linear: no color transform applied
|
|
|
}
|
|
|
|
|
|
@@ -401,9 +442,7 @@ void main() {
|
|
|
#endif
|
|
|
|
|
|
// Early Tonemap & SRGB Conversion; note that Linear tonemapping does not clamp to [0, 1]; some operations below expect a [0, 1] range and will clamp
|
|
|
- // Ensure color values are positive.
|
|
|
- // They can be negative in the case of negative lights, which leads to undesired behavior.
|
|
|
- color = apply_tonemapping(max(vec3(0.0), color), white);
|
|
|
+ color = apply_tonemapping(color, white);
|
|
|
|
|
|
#ifdef KEEP_3D_LINEAR
|
|
|
// leave color as is (-> don't convert to SRGB)
|
Rémi Verschelde