ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ol.easing instead of goog.fx.easing

Browse Source
This commit is contained in:
Tom Payne
2013-03-09 02:03:59 +01:00
parent e12458b32e
commit 77bd279160
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ol/animation.js
View File

@@ -2,7 +2,6 @@
goog.provide('ol.animation'); goog.provide('ol.animation');
goog.require('goog.fx.easing');
goog.require('ol.PreRenderFunction'); goog.require('ol.PreRenderFunction');
goog.require('ol.ViewHint'); goog.require('ol.ViewHint');
goog.require('ol.easing'); goog.require('ol.easing');
@@ -48,7 +47,7 @@ ol.animation.pan = function(options) {
var sourceY = source.y; var sourceY = source.y;
var duration = goog.isDef(options.duration) ? options.duration : 1000; var duration = goog.isDef(options.duration) ? options.duration : 1000;
var easing = goog.isDef(options.easing) ? var easing = goog.isDef(options.easing) ?
options.easing : goog.fx.easing.inAndOut; options.easing : ol.easing.inAndOut;
return function(map, frameState) { return function(map, frameState) {
if (frameState.time < start) { if (frameState.time < start) {
frameState.animate = true; frameState.animate = true;
@@ -79,7 +78,7 @@ ol.animation.rotate = function(options) {
var start = goog.isDef(options.start) ? options.start : goog.now(); var start = goog.isDef(options.start) ? options.start : goog.now();
var duration = goog.isDef(options.duration) ? options.duration : 1000; var duration = goog.isDef(options.duration) ? options.duration : 1000;
var easing = goog.isDef(options.easing) ? var easing = goog.isDef(options.easing) ?
options.easing : goog.fx.easing.inAndOut; options.easing : ol.easing.inAndOut;
return function(map, frameState) { return function(map, frameState) {
if (frameState.time < start) { if (frameState.time < start) {

4
src/ol/easing.js
View File

@@ -39,9 +39,9 @@ ol.easing.linear = function(t) {
*/ */
ol.easing.upAndDown = function(t) { ol.easing.upAndDown = function(t) {
if (t < 0.5) { if (t < 0.5) {
return goog.fx.easing.inAndOut(2 * t); return ol.easing.inAndOut(2 * t);
} else { } else {
return 1 - goog.fx.easing.inAndOut(2 * (t - 0.5)); return 1 - ol.easing.inAndOut(2 * (t - 0.5));
} }
}; };

9
src/ol/view2d.js
View File

@@ -4,7 +4,6 @@
goog.provide('ol.View2D'); goog.provide('ol.View2D');
goog.provide('ol.View2DProperty'); goog.provide('ol.View2DProperty');
goog.require('goog.fx.easing');
goog.require('ol.Constraints'); goog.require('ol.Constraints');
goog.require('ol.Coordinate'); goog.require('ol.Coordinate');
goog.require('ol.Extent'); goog.require('ol.Extent');
@@ -308,13 +307,13 @@ ol.View2D.prototype.rotateWithoutConstraints =
map.addPreRenderFunction(ol.animation.rotate({ map.addPreRenderFunction(ol.animation.rotate({
rotation: currentRotation, rotation: currentRotation,
duration: opt_duration, duration: opt_duration,
easing: goog.fx.easing.easeOut easing: ol.easing.easeOut
})); }));
if (goog.isDef(opt_anchor)) { if (goog.isDef(opt_anchor)) {
map.addPreRenderFunction(ol.animation.pan({ map.addPreRenderFunction(ol.animation.pan({
source: currentCenter, source: currentCenter,
duration: opt_duration, duration: opt_duration,
easing: goog.fx.easing.easeOut easing: ol.easing.easeOut
})); }));
} }
} }
@@ -382,13 +381,13 @@ ol.View2D.prototype.zoomWithoutConstraints =
map.addPreRenderFunction(ol.animation.zoom({ map.addPreRenderFunction(ol.animation.zoom({
resolution: currentResolution, resolution: currentResolution,
duration: opt_duration, duration: opt_duration,
easing: goog.fx.easing.easeOut easing: ol.easing.easeOut
})); }));
if (goog.isDef(opt_anchor)) { if (goog.isDef(opt_anchor)) {
map.addPreRenderFunction(ol.animation.pan({ map.addPreRenderFunction(ol.animation.pan({
source: currentCenter, source: currentCenter,
duration: opt_duration, duration: opt_duration,
easing: goog.fx.easing.easeOut easing: ol.easing.easeOut
})); }));
} }
} }