Skip to content
Snippets Groups Projects
Commit cb7d07e0 authored by Graham Linden's avatar Graham Linden
Browse files

SL-10844, SL-10584

Add Geenz doings to the contribs list.

Fix per-frag atmospherics to use sRGB conversion.

Update ref to new KDU package.
parent 12495d46
No related branches found
No related tags found
No related merge requests found
......@@ -1700,9 +1700,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>d1521becaf21bf7233173722af63f57d</string>
<string>c90551bee423e9b494a46f29403f7f4a</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15257/98440/kdu-7.10.4.513518-darwin64-513518.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/34357/286135/kdu-7.10.7.525514-darwin64-525514.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
......@@ -1712,9 +1712,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>43d7a6a69a54534a736f132e9c81795b</string>
<string>4fcb1fa70d8317f69284be3830df3a29</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15255/98451/kdu-7.10.4.513518-linux-513518.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/34358/286148/kdu-7.10.7.525514-linux-525514.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
......@@ -1724,9 +1724,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>a705a665810a71e7b0114a97ae9a2224</string>
<string>09cd4cdd385448b9c55fad2ced7685e2</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15256/98457/kdu-7.10.4.513518-linux64-513518.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/34356/286142/kdu-7.10.7.525514-linux64-525514.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
......@@ -1736,9 +1736,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>0e5b37a03a3f873d15142473b193ec5f</string>
<string>4da8daa8c254be1eb2e4a942e42cd61c</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15259/98463/kdu-7.10.4.513518-windows-513518.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/34360/286161/kdu-7.10.7.525514-windows-525514.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
......@@ -1748,16 +1748,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>da3b1ea90797b189d80ab5d50fdf05d4</string>
<string>eea37ff2c006dc9542bbaa1bb6799417</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/15260/98469/kdu-7.10.4.513518-windows64-513518.tar.bz2</string>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/34359/286155/kdu-7.10.7.525514-windows64-525514.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>7.A.4.513518</string>
<string>7.A.7.525512</string>
</map>
<key>libhunspell</key>
<map>
......@@ -2670,7 +2670,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>f7013e1f0b6a877090622fd73ec72cbc</string>
<string>2cbec24a9c0a6f63fb7de8714d844dc2</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1114/2576/openjpeg-1.5.1.501102-darwin64-501102.tar.bz2</string>
</map>
......
......@@ -481,6 +481,9 @@ Geenz Spad
STORM-1900
STORM-1905
NORSPEC-229
SL-10842
SL-10843
SL-10844
Gene Frostbite
GeneJ Composer
Geneko Nemeth
......
......@@ -46,6 +46,7 @@ uniform mat3 ssao_effect_mat;
uniform int no_atmo;
uniform float sun_moon_glow_factor;
vec3 srgb_to_linear(vec3 c);
vec3 scaleSoftClipFrag(vec3 light);
vec3 atmosFragLighting(vec3 light, vec3 additive, vec3 atten)
......@@ -151,7 +152,7 @@ void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit,
+ tmpAmbient));
//brightness of surface both sunlight and ambient
sunlit = vec3(sunlight * .5);
sunlit = srgb_to_linear(sunlight.rgb);
amblit = vec3(tmpAmbient * .25);
additive = normalize(additive);
additive *= vec3(1.0 - exp(-temp2.z * distance_multiplier)) * 0.5;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment