diff options
| author | Joshua Rahm <joshua.rahm@colorado.edu> | 2014-03-19 01:05:20 -0600 |
|---|---|---|
| committer | Joshua Rahm <joshua.rahm@colorado.edu> | 2014-03-19 01:05:20 -0600 |
| commit | 1f2c14738f551fc902ba915d84f0515778a7ed4d (patch) | |
| tree | b37689c39b0e31666b77fbfff391b0c074370a5c /shaders/textured.frag | |
| parent | 62fa8f93990f6aedaae8242fdde6bba44e434f5f (diff) | |
| download | earths-ring-1f2c14738f551fc902ba915d84f0515778a7ed4d.tar.gz earths-ring-1f2c14738f551fc902ba915d84f0515778a7ed4d.tar.bz2 earths-ring-1f2c14738f551fc902ba915d84f0515778a7ed4d.zip | |
changed quads to triangles
Diffstat (limited to 'shaders/textured.frag')
| -rw-r--r-- | shaders/textured.frag | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shaders/textured.frag b/shaders/textured.frag index 266bf31..0ba7c48 100644 --- a/shaders/textured.frag +++ b/shaders/textured.frag @@ -126,7 +126,7 @@ void main() { * a function of time to simulate twinkling */ tmpcolor *= mix( vec4(cmp.r*2.0,min(cmp.g,cmp.r)*1.5,min(cmp.b,cmp.r),1.0), - vec4(cmp2.r*2.0,min(cmp2.g,cmp2.r)*1.5,min(cmp2.b,cmp2.r),1.0), (sin(time*cmp2.a+cmp.a)+1.0)/2.0 ) ; + vec4(2.0,2.0,2.0,2.0), sin(time/10.0+cmp.a*27.3) ) ; tmpcolor -= cloudsColor; } |