Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-20 19:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:balthazar/fabric.js

Browse source 
Conflicts:
	build.js
This commit is contained in:
Balthazar Auger 2012-04-26 00:07:52 -03:00
commit d3abeeb957
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build.js
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,6 +67,10 @@ var filesToInclude = [
'src/util/dom_style.js',
'src/util/dom_misc.js',
'src/util/dom_request.js',
<<<<<<< HEAD
=======
>>>>>>> 383665d2363f00dd1a577207837b7dc326e04ed8
ifSpecifiedInclude('easing', 'src/util/anim_ease.js'),

8
src/util/anim_ease.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;