aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Rahm <joshua.rahm@colorado.edu>2013-12-11 02:41:27 -0700
committerJoshua Rahm <joshua.rahm@colorado.edu>2013-12-11 02:41:27 -0700
commit95f770725f8dbd4c78abc9e82af65572f32d6d1f (patch)
tree62235ec045204148e40dba721018f2dde9632293
parent678a0d1e4c97349ae2d29b4bdda8d670ce2490cf (diff)
parent0be708be662395f1ff68889db8d06713b253bef0 (diff)
downloadSonsOfSol-95f770725f8dbd4c78abc9e82af65572f32d6d1f.tar.gz
SonsOfSol-95f770725f8dbd4c78abc9e82af65572f32d6d1f.tar.bz2
SonsOfSol-95f770725f8dbd4c78abc9e82af65572f32d6d1f.zip
Merge branch 'master' of github.com:joshuarahm/SonsOfSol
-rw-r--r--shaders/earth_fallback.fp12
1 files changed, 6 insertions, 6 deletions
diff --git a/shaders/earth_fallback.fp b/shaders/earth_fallback.fp
index 872d45b..f5f8289 100644
--- a/shaders/earth_fallback.fp
+++ b/shaders/earth_fallback.fp
@@ -16,13 +16,13 @@ void main()
vec4 color = texture2D(tex,gl_TexCoord[0].xy);
- float bluef2 = (1.0f / (1.0f + exp(c * 20.0f))) * light;
- float redf2 = (1.0f / (1.0f + exp(c * 20.0f))) * pow(light,2.0) * light;
+ float bluef2 = (1.0f / (1.0f + exp(c * 15.0f))) * light;
+ float redf2 = (1.0f / (1.0f + exp(c * 15.0f))) * pow(light,2.0) * light;
float greenf2 = redf2;
/* Each color has its own drop off rate */
- float bluef = pow(light, 3.0) ;
+ float bluef = pow(light, 4.0) ;
float greenf = pow(light, 2.0) ;
float redf = pow(light, 1.0) ;
@@ -31,8 +31,8 @@ void main()
if( redf < 0.0 ) redf = 0.0 ;
gl_FragColor = vec4(
- redf*color[0] + 1000.0*redf2,
- greenf*color[1] + 1000.0*greenf2,
- bluef*color[2] + 1000.0*bluef2,
+ redf*color[0] + 10.0*redf2,
+ greenf*color[1] + 10.0*greenf2,
+ bluef*color[2] + 10.0*bluef2,
1.0 );
}