mirror of
https://github.com/luanti-org/luanti.git
synced 2025-09-15 18:57:08 +00:00
Merge remote-tracking branch 'upstream/master' into Visuals-Vol-2
This commit is contained in:
commit
fa212d19f7
572 changed files with 71629 additions and 67352 deletions
|
@ -44,8 +44,6 @@ centroid varying float nightRatio;
|
|||
varying float perspective_factor;
|
||||
#endif
|
||||
|
||||
varying float area_enable_parallax;
|
||||
|
||||
varying highp vec3 eyeVec;
|
||||
varying vec3 sunTint;
|
||||
varying float nightFactor;
|
||||
|
|
|
@ -70,7 +70,7 @@ vec4 applyBloom(vec4 color, vec2 uv)
|
|||
equation used: ((x * (A * x + C * B) + D * E) / (x * (A * x + B) + D * F)) - E / F
|
||||
*/
|
||||
|
||||
// see https://github.com/minetest/minetest/pull/14688
|
||||
// highp for GLES, see <https://github.com/luanti-org/luanti/pull/14688>
|
||||
highp vec3 uncharted2Tonemap(highp vec3 x)
|
||||
{
|
||||
return ((x * (0.22 * x + 0.03) + 0.002) / (x * (0.22 * x + 0.3) + 0.06)) - 0.03333;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue