diff --git a/cubic-in-out.glsl b/cubic-in-out.glsl index 32ce665..63164a7 100644 --- a/cubic-in-out.glsl +++ b/cubic-in-out.glsl @@ -1,7 +1,9 @@ float cubicInOut(float t) { - return t < 0.5 - ? 4.0 * t * t * t - : 0.5 * pow(2.0 * t - 2.0, 3.0) + 1.0; + if (t < 0.5) { + return 4.0 * t * t * t; + } + float u = 1.0 - t; + return 1.0 - 4.0 * u * u * u; } #pragma glslify: export(cubicInOut) diff --git a/quartic-in-out.glsl b/quartic-in-out.glsl index 094ab67..0a6a2e4 100644 --- a/quartic-in-out.glsl +++ b/quartic-in-out.glsl @@ -1,7 +1,9 @@ float quarticInOut(float t) { - return t < 0.5 - ? +8.0 * pow(t, 4.0) - : -8.0 * pow(t - 1.0, 4.0) + 1.0; + if (t < 0.5) { + return 8.0 * t * t * t * t; + } + float u = 1.0 - t; + return 1.0 - 8.0 * u * u * u * u; } #pragma glslify: export(quarticInOut) diff --git a/quartic-out.glsl b/quartic-out.glsl index d488d34..43719eb 100644 --- a/quartic-out.glsl +++ b/quartic-out.glsl @@ -1,5 +1,6 @@ float quarticOut(float t) { - return pow(t - 1.0, 3.0) * (1.0 - t) + 1.0; + float u = 1.0 - t; + return 1.0 - u * u * u * u; } #pragma glslify: export(quarticOut) diff --git a/quintic-in-out.glsl b/quintic-in-out.glsl index 6c9c505..1e2f1dd 100644 --- a/quintic-in-out.glsl +++ b/quintic-in-out.glsl @@ -1,7 +1,9 @@ -float qinticInOut(float t) { - return t < 0.5 - ? +16.0 * pow(t, 5.0) - : -0.5 * pow(2.0 * t - 2.0, 5.0) + 1.0; +float quinticInOut(float t) { + if (t < 0.5) { + return 16.0 * t * t * t * t * t; + } + float u = 1.0 - t; + return 1.0 - 16.0 * u * u * u * u * u; } -#pragma glslify: export(qinticInOut) +#pragma glslify: export(quinticInOut) diff --git a/quintic-in.glsl b/quintic-in.glsl index 3bf24e7..7e0df66 100644 --- a/quintic-in.glsl +++ b/quintic-in.glsl @@ -1,5 +1,5 @@ -float qinticIn(float t) { - return pow(t, 5.0); +float quinticIn(float t) { + return t*t*t*t*t; } -#pragma glslify: export(qinticIn) +#pragma glslify: export(quinticIn) diff --git a/test/visual/index.js b/test/visual/index.js index 4a9a6f6..a63889b 100644 --- a/test/visual/index.js +++ b/test/visual/index.js @@ -51,7 +51,7 @@ var shaders = { , sineIn : glslify({ frag: './frag.glsl', vert: './sine-in.glsl' })(gl) } -var linear = glslify({ frag: './blue.glsl', vert: './linear.glsl' })(gl) +var linear = glslify({ frag: './frag.glsl', vert: './linear.glsl' })(gl) var names = Object.keys(shaders) var selected = null var model = mat4.create()