Jut retooling
This commit is contained in:
Jamie 2018-01-07 15:28:10 -08:00
parent 253c731a7a
commit bea95a9ac1

View File

@ -647,11 +647,6 @@ void main()
color += bloom;
//++++++++++++++++++++++++++++++++++
// Levels Control if we tone map to 16-235 , 0 - 255 or usr defined range.
#if (blacknwhitepass == 1)
color = LevelsPass(color);
#endif
// Tonemapping
#if (Tone_map == -1)
color = clamp(color*Exposure, 0.0, 1.0);
@ -677,6 +672,17 @@ void main()
color = ACESFilm(color);
#endif
// Levels Control if we tone map to 16-235 , 0 - 255 or usr defined range.
#if (blacknwhitepass == 1)
color = LevelsPass(color);
#endif
// Color matrix
#if (cmatrix == 1)
color = ColorMatrixPass(color);
#endif
// Post Processing
#if (Tech == 1)
color = TechnicolorPass(color);
@ -684,8 +690,11 @@ void main()
#if (Techine == 1)
color = Technicolor2(color);
#endif
#if (cmatrix == 1)
color = ColorMatrixPass(color);
#if (post_process == 0)
color = BotWVibrance(color);
#endif
#if (post_process == 1)
color = Contrasty(color);
#endif
#if (dpxpass == 1)
color = DPXPass(color);
@ -693,12 +702,6 @@ void main()
#if (Filmicpass == 1)
color = FilmPass(color);
#endif
#if (post_process == 0)
color = BotWVibrance(color);
#endif
#if (post_process == 1)
color = Contrasty(color);
#endif
#if (lggpass == 1)
color = LiftGammaGainPass(color);
#endif