Skip to content

Commit

Permalink
animations
Browse files Browse the repository at this point in the history
  • Loading branch information
mattdesl committed Jun 5, 2015
1 parent 29a977f commit 199f897
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 10 deletions.
4 changes: 2 additions & 2 deletions 13.glsl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
vec4 blur(sampler2D image, vec2 uv, vec2 resolution, vec2 direction) {
vec4 blur13(sampler2D image, vec2 uv, vec2 resolution, vec2 direction) {
vec4 color = vec4(0.0);
vec2 off1 = vec2(1.411764705882353) * direction;
vec2 off2 = vec2(3.2941176470588234) * direction;
Expand All @@ -13,4 +13,4 @@ vec4 blur(sampler2D image, vec2 uv, vec2 resolution, vec2 direction) {
return color;
}

#pragma glslify: export(blur)
#pragma glslify: export(blur13)
10 changes: 10 additions & 0 deletions 5.glsl
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
vec4 blur5(sampler2D image, vec2 uv, vec2 resolution, vec2 direction) {
vec4 color = vec4(0.0);
vec2 off1 = vec2(1.3333333333333333) * direction;
color += texture2D(image, uv) * 0.29411764705882354;
color += texture2D(image, uv + (off1 / resolution)) * 0.35294117647058826;
color += texture2D(image, uv - (off1 / resolution)) * 0.35294117647058826;
return color;
}

#pragma glslify: export(blur5)
4 changes: 2 additions & 2 deletions 9.glsl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
vec4 blur(sampler2D image, vec2 uv, vec2 resolution, vec2 direction) {
vec4 blur9(sampler2D image, vec2 uv, vec2 resolution, vec2 direction) {
vec4 color = vec4(0.0);
vec2 off1 = vec2(1.3846153846) * direction;
vec2 off2 = vec2(3.2307692308) * direction;
Expand All @@ -10,4 +10,4 @@ vec4 blur(sampler2D image, vec2 uv, vec2 resolution, vec2 direction) {
return color;
}

#pragma glslify: export(blur)
#pragma glslify: export(blur9)
3 changes: 1 addition & 2 deletions demo/frag.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ void main() {
uv.y = 1.0 - uv.y;
}

vec4 blurred = blur(iChannel0, uv, iResolution.xy, direction);
gl_FragColor = blurred;
gl_FragColor = blur(iChannel0, uv, iResolution.xy, direction);
}
3 changes: 2 additions & 1 deletion demo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ function start(err, image) {
var fboA = createFBO(gl, [width, height])
var fboB = createFBO(gl, [width, height])

// apply linear filtering to get a smooth interpolation
var textures = [ texture, fboA.color[0], fboB.color[0] ]
textures.forEach(setParameters)

Expand All @@ -44,7 +45,7 @@ function start(err, image) {
gl.viewport(0, 0, width, height)

var anim = (Math.sin(time) * 0.5 + 0.5)
var iterations = 9
var iterations = 8
var writeBuffer = fboA
var readBuffer = fboB

Expand Down
7 changes: 4 additions & 3 deletions tools/coefficients.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ function coefficients(weights) {
console.log('weights', linearWeights)
}


// var weights = '66 220 495 792 924 792 495 220 66'
var weights = '120 560 1820 4368 8008 11440 12870 11440 8008 4368 1820 560 120'
var weights = '28 56 70 56 28' // 5 taps
// var weights = '45 120 210 252 210 120 45' // 7 taps
// var weights = '66 220 495 792 924 792 495 220 66' // 9 taps
// var weights = '120 560 1820 4368 8008 11440 12870 11440 8008 4368 1820 560 120'
.split(/\s+/)
.map(function(a) {
return parseInt(a, 10)
Expand Down

0 comments on commit 199f897

Please sign in to comment.