diff --git a/src/ol/easing.js b/src/ol/easing.js index 51a03a0ba3..9e829f3a93 100644 --- a/src/ol/easing.js +++ b/src/ol/easing.js @@ -3,6 +3,33 @@ goog.provide('ol.easing'); goog.require('goog.fx.easing'); +/** + * from https://raw.github.com/DmitryBaranovskiy/raphael/master/raphael.js + * @param {number} t Input between 0 and 1. + * @return {number} Output between 0 and 1. + */ +ol.easing.bounce = function(t) { + var s = 7.5625, p = 2.75, l; + if (t < (1 / p)) { + l = s * t * t; + } else { + if (t < (2 / p)) { + t -= (1.5 / p); + l = s * t * t + 0.75; + } else { + if (t < (2.5 / p)) { + t -= (2.25 / p); + l = s * t * t + 0.9375; + } else { + t -= (2.625 / p); + l = s * t * t + 0.984375; + } + } + } + return l; +}; + + /** * @param {number} t Input between 0 and 1. * @return {number} Output between 0 and 1. @@ -17,6 +44,16 @@ ol.easing.easeIn = goog.fx.easing.easeIn; ol.easing.easeOut = goog.fx.easing.easeOut; +/** + * from https://raw.github.com/DmitryBaranovskiy/raphael/master/raphael.js + * @param {number} t Input between 0 and 1. + * @return {number} Output between 0 and 1. + */ +ol.easing.elastic = function(t) { + return Math.pow(2, -10 * t) * Math.sin((t - 0.075) * (2 * Math.PI) / 0.3) + 1; +}; + + /** * @param {number} t Input between 0 and 1. * @return {number} Output between 0 and 1. @@ -44,40 +81,3 @@ ol.easing.upAndDown = function(t) { return 1 - ol.easing.inAndOut(2 * (t - 0.5)); } }; - - -/** - * from https://raw.github.com/DmitryBaranovskiy/raphael/master/raphael.js - * @param {number} t Input between 0 and 1. - * @return {number} Output between 0 and 1. - */ -ol.easing.elastic = function(t) { - return Math.pow(2, -10 * t) * Math.sin((t - 0.075) * (2 * Math.PI) / 0.3) + 1; -}; - - -/** - * from https://raw.github.com/DmitryBaranovskiy/raphael/master/raphael.js - * @param {number} t Input between 0 and 1. - * @return {number} Output between 0 and 1. - */ -ol.easing.bounce = function(t) { - var s = 7.5625, p = 2.75, l; - if (t < (1 / p)) { - l = s * t * t; - } else { - if (t < (2 / p)) { - t -= (1.5 / p); - l = s * t * t + 0.75; - } else { - if (t < (2.5 / p)) { - t -= (2.25 / p); - l = s * t * t + 0.9375; - } else { - t -= (2.625 / p); - l = s * t * t + 0.984375; - } - } - } - return l; -};