Debug and test remaining equations.

This commit is contained in:
Balthazar Auger 2012-04-24 17:35:53 -03:00
parent 4945372f05
commit 383665d236
2 changed files with 8 additions and 3 deletions

View file

@ -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'),

View file

@ -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;