diff options
| author | weiss <weiss@84d2e878-0bd5-11dd-ad15-13eda11d74c5> | 2008-07-19 14:16:06 +0000 |
|---|---|---|
| committer | weiss <weiss@84d2e878-0bd5-11dd-ad15-13eda11d74c5> | 2008-07-19 14:16:06 +0000 |
| commit | 23705de21cacd60e0dabe53a73454bcd28f8afad (patch) | |
| tree | ad6d3f4bec83ecefc06ec6577b4670899905fcb8 /data | |
| parent | fb8b31d3026c9f96acdde8fef9e81d41b9a62215 (diff) | |
Put the 'recharge ripple' in the right place
git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@143 84d2e878-0bd5-11dd-ad15-13eda11d74c5
Diffstat (limited to 'data')
| -rw-r--r-- | data/shaders/swirlytron.frag | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/shaders/swirlytron.frag b/data/shaders/swirlytron.frag index d2d6ca7..81c80c3 100644 --- a/data/shaders/swirlytron.frag +++ b/data/shaders/swirlytron.frag @@ -12,7 +12,7 @@ varying vec2 coords; varying vec2 incoords; uniform float time; -uniform bool landed; +uniform bool rechargeripple; void main() { @@ -26,12 +26,12 @@ void main() { colour.g = 0.0; colour.b = 1.0 * cos(2*f*3.141*r - (time/250.0) ); - if ( landed ) { + if ( rechargeripple ) { r = pow(abs(incoords.x), 2.0) + pow(abs(incoords.y), 2.0); f = 1.0; - colour.r += 1.0 * cos(2*f*3.141*r + (time/250.0) ); - colour.g += 1.0 * cos(2*f*3.141*r + (time/250.0) ); - colour.b += 0.0; + colour.r += 0.8 * cos(2*f*3.141*r + (time/250.0) ); + colour.g += 0.3 * cos(2*f*3.141*r + (time/250.0) ); + colour.b += 0.1; } gl_FragColor = vec4(colour.r, colour.g, colour.b, 1.0); |