diff options
| author | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-07-17 09:30:22 -0700 |
| commit | 53051672a62208fbc96957719d8285fac6431ed6 (patch) | |
| tree | 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /assets/shaders/Pulse.frag.glsl | |
| parent | 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff) | |
| parent | 5146f224258929415adf4a8022e492454b4e2476 (diff) | |
| download | ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz | |
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts:
js/panels/Timeline/DragDrop.js
js/panels/Timeline/Keyframe.reel/Keyframe.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
js/panels/Timeline/Span.reel/Span.js
js/panels/Timeline/Style.reel/Style.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
js/panels/Timeline/Track.reel/Track.html
js/panels/Timeline/Track.reel/Track.js
js/panels/Timeline/Track.reel/css/Track.css
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
js/panels/Timeline/Tween.reel/Tween.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'assets/shaders/Pulse.frag.glsl')
| -rw-r--r-- | assets/shaders/Pulse.frag.glsl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/assets/shaders/Pulse.frag.glsl b/assets/shaders/Pulse.frag.glsl index 9aeb05c9..b717d359 100644 --- a/assets/shaders/Pulse.frag.glsl +++ b/assets/shaders/Pulse.frag.glsl | |||
| @@ -22,6 +22,7 @@ void main(void) | |||
| 22 | float cLength = length(cPos); | 22 | float cLength = length(cPos); |
| 23 | 23 | ||
| 24 | vec2 uv = gl_FragCoord.xy/u_resolution.xy+(cPos/cLength)*sin(cLength/30.0-time*10.0)/25.0; | 24 | vec2 uv = gl_FragCoord.xy/u_resolution.xy+(cPos/cLength)*sin(cLength/30.0-time*10.0)/25.0; |
| 25 | uv.y = 1.0 - uv.y; | ||
| 25 | vec3 col = texture2D(u_tex0,uv).xyz*50.0/cLength; | 26 | vec3 col = texture2D(u_tex0,uv).xyz*50.0/cLength; |
| 26 | 27 | ||
| 27 | gl_FragColor = vec4(col,1.0); | 28 | gl_FragColor = vec4(col,1.0); |