From 383665d2363f00dd1a577207837b7dc326e04ed8 Mon Sep 17 00:00:00 2001 From: Balthazar Auger Date: Tue, 24 Apr 2012 17:35:53 -0300 Subject: [PATCH] Debug and test remaining equations. --- build.js | 3 ++- src/util/anim_ease.js | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.js b/build.js index 7f1c18d7..9a52b7e4 100644 --- a/build.js +++ b/build.js @@ -57,6 +57,7 @@ var filesToInclude = [ 'src/observable.js', 'src/util/misc.js', + 'src/util/anim_ease.js', 'src/util/lang_array.js', 'src/util/lang_object.js', 'src/util/lang_string.js', @@ -66,7 +67,7 @@ var filesToInclude = [ 'src/util/dom_style.js', 'src/util/dom_misc.js', 'src/util/dom_request.js', - 'src/util/anim_ease.js', + ifSpecifiedInclude('parser', 'src/parser.js'), diff --git a/src/util/anim_ease.js b/src/util/anim_ease.js index 2dac5fe7..493d9fd2 100644 --- a/src/util/anim_ease.js +++ b/src/util/anim_ease.js @@ -1,5 +1,10 @@ (function(){ + /** + * @namespace + */ + fabric.util.ease = { }; + function easeInQuad(t, b, c, d) { return c*(t/=d)*t + b; } @@ -121,7 +126,7 @@ if (s == undefined) s = 1.70158; return c*(t/=d)*t*((s+1)*t - s) + b; } -/* + function easeOutBack(t, b, c, d, s) { if (s == undefined) s = 1.70158; return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b; @@ -132,7 +137,6 @@ if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b; return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b; } - */ function easeInBounce(t, b, c, d) { return c - easeOutBounce (d-t, 0, c, d) + b;