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

More natural names for animations

Browse Source
This commit is contained in:
Tim Schaub
2013-02-06 13:43:54 -07:00
parent 9c9fe4a9b1
commit a2bbdf7ccc
7 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
examples/side-by-side.js
View File

@@ -110,7 +110,7 @@ keyboardInteraction.addCallback('H', function() {
layer.setHue(layer.getHue() + (Math.PI / 5)); layer.setHue(layer.getHue() + (Math.PI / 5));
}); });
keyboardInteraction.addCallback('j', function() { keyboardInteraction.addCallback('j', function() {
var bounce = ol.animation.createBounce({ var bounce = ol.animation.bounce({
resolution: 2 * view.getResolution() resolution: 2 * view.getResolution()
}); });
domMap.addPreRenderFunction(bounce); domMap.addPreRenderFunction(bounce);
@@ -118,69 +118,69 @@ keyboardInteraction.addCallback('j', function() {
canvasMap.addPreRenderFunction(bounce); canvasMap.addPreRenderFunction(bounce);
}); });
keyboardInteraction.addCallback('l', function() { keyboardInteraction.addCallback('l', function() {
var panFrom = ol.animation.createPanFrom({ var pan = ol.animation.pan({
source: view.getCenter(), source: view.getCenter(),
easing: ol.easing.elastic easing: ol.easing.elastic
}); });
domMap.addPreRenderFunction(panFrom); domMap.addPreRenderFunction(pan);
webglMap.addPreRenderFunction(panFrom); webglMap.addPreRenderFunction(pan);
canvasMap.addPreRenderFunction(panFrom); canvasMap.addPreRenderFunction(pan);
view.setCenter(LONDON); view.setCenter(LONDON);
}); });
keyboardInteraction.addCallback('L', function() { keyboardInteraction.addCallback('L', function() {
var start = goog.now(); var start = goog.now();
var duration = 5000; var duration = 5000;
var bounce = ol.animation.createBounce({ var bounce = ol.animation.bounce({
resolution: 2 * view.getResolution(), resolution: 2 * view.getResolution(),
start: start, start: start,
duration: duration duration: duration
}); });
var panFrom = ol.animation.createPanFrom({ var pan = ol.animation.pan({
source: view.getCenter(), source: view.getCenter(),
start: start, start: start,
duration: duration duration: duration
}); });
var rotateFrom = ol.animation.createRotateFrom({ var rotate = ol.animation.rotate({
rotation: 4 * Math.PI, rotation: 4 * Math.PI,
start: start, start: start,
duration: duration duration: duration
}); });
var preRenderFunctions = [bounce, panFrom, rotateFrom]; var preRenderFunctions = [bounce, pan, rotate];
domMap.addPreRenderFunctions(preRenderFunctions); domMap.addPreRenderFunctions(preRenderFunctions);
webglMap.addPreRenderFunctions(preRenderFunctions); webglMap.addPreRenderFunctions(preRenderFunctions);
canvasMap.addPreRenderFunctions(preRenderFunctions); canvasMap.addPreRenderFunctions(preRenderFunctions);
view.setCenter(LONDON); view.setCenter(LONDON);
}); });
keyboardInteraction.addCallback('m', function() { keyboardInteraction.addCallback('m', function() {
var panFrom = ol.animation.createPanFrom({ var pan = ol.animation.pan({
source: view.getCenter(), source: view.getCenter(),
duration: 1000, duration: 1000,
easing: ol.easing.bounce easing: ol.easing.bounce
}); });
domMap.addPreRenderFunction(panFrom); domMap.addPreRenderFunction(pan);
webglMap.addPreRenderFunction(panFrom); webglMap.addPreRenderFunction(pan);
canvasMap.addPreRenderFunction(panFrom); canvasMap.addPreRenderFunction(pan);
view.setCenter(MOSCOW); view.setCenter(MOSCOW);
}); });
keyboardInteraction.addCallback('M', function() { keyboardInteraction.addCallback('M', function() {
var start = goog.now(); var start = goog.now();
var duration = 5000; var duration = 5000;
var bounce = ol.animation.createBounce({ var bounce = ol.animation.bounce({
resolution: 2 * view.getResolution(), resolution: 2 * view.getResolution(),
start: start, start: start,
duration: duration duration: duration
}); });
var panFrom = ol.animation.createPanFrom({ var pan = ol.animation.pan({
source: view.getCenter(), source: view.getCenter(),
start: start, start: start,
duration: duration duration: duration
}); });
var rotateFrom = ol.animation.createRotateFrom({ var rotate = ol.animation.rotate({
rotation: -4 * Math.PI, rotation: -4 * Math.PI,
start: start, start: start,
duration: duration duration: duration
}); });
var preRenderFunctions = [bounce, panFrom, rotateFrom]; var preRenderFunctions = [bounce, pan, rotate];
domMap.addPreRenderFunctions(preRenderFunctions); domMap.addPreRenderFunctions(preRenderFunctions);
webglMap.addPreRenderFunctions(preRenderFunctions); webglMap.addPreRenderFunctions(preRenderFunctions);
canvasMap.addPreRenderFunctions(preRenderFunctions); canvasMap.addPreRenderFunctions(preRenderFunctions);
@@ -206,21 +206,21 @@ keyboardInteraction.addCallback('vV', function() {
layer.setVisible(!layer.getVisible()); layer.setVisible(!layer.getVisible());
}); });
keyboardInteraction.addCallback('x', function() { keyboardInteraction.addCallback('x', function() {
var rotateFrom = ol.animation.createRotateFrom({ var rotate = ol.animation.rotate({
rotation: 4 * Math.PI, rotation: 4 * Math.PI,
duration: 2000 duration: 2000
}); });
domMap.addPreRenderFunction(rotateFrom); domMap.addPreRenderFunction(rotate);
webglMap.addPreRenderFunction(rotateFrom); webglMap.addPreRenderFunction(rotate);
canvasMap.addPreRenderFunction(rotateFrom); canvasMap.addPreRenderFunction(rotate);
}); });
keyboardInteraction.addCallback('X', function() { keyboardInteraction.addCallback('X', function() {
var rotateFrom = ol.animation.createRotateFrom({ var rotate = ol.animation.rotate({
rotation: -4 * Math.PI, rotation: -4 * Math.PI,
duration: 2000 duration: 2000
}); });
domMap.addPreRenderFunction(rotateFrom); domMap.addPreRenderFunction(rotate);
webglMap.addPreRenderFunction(rotateFrom); webglMap.addPreRenderFunction(rotate);
canvasMap.addPreRenderFunction(rotateFrom); canvasMap.addPreRenderFunction(rotate);
}); });
domMap.getInteractions().push(keyboardInteraction); domMap.getInteractions().push(keyboardInteraction);

30
src/objectliterals.exports
View File

@@ -32,23 +32,23 @@
@exportObjectLiteralProperty ol.animation.BounceOptions.duration number|undefined @exportObjectLiteralProperty ol.animation.BounceOptions.duration number|undefined
@exportObjectLiteralProperty ol.animation.BounceOptions.easing function(number):number|undefined @exportObjectLiteralProperty ol.animation.BounceOptions.easing function(number):number|undefined
@exportObjectLiteral ol.animation.PanFromOptions @exportObjectLiteral ol.animation.PanOptions
@exportObjectLiteralProperty ol.animation.PanFromOptions.source ol.Coordinate @exportObjectLiteralProperty ol.animation.PanOptions.source ol.Coordinate
@exportObjectLiteralProperty ol.animation.PanFromOptions.start number|undefined @exportObjectLiteralProperty ol.animation.PanOptions.start number|undefined
@exportObjectLiteralProperty ol.animation.PanFromOptions.duration number|undefined @exportObjectLiteralProperty ol.animation.PanOptions.duration number|undefined
@exportObjectLiteralProperty ol.animation.PanFromOptions.easing function(number):number|undefined @exportObjectLiteralProperty ol.animation.PanOptions.easing function(number):number|undefined
@exportObjectLiteral ol.animation.RotateFromOptions @exportObjectLiteral ol.animation.RotateOptions
@exportObjectLiteralProperty ol.animation.RotateFromOptions.rotation number @exportObjectLiteralProperty ol.animation.RotateOptions.rotation number
@exportObjectLiteralProperty ol.animation.RotateFromOptions.start number|undefined @exportObjectLiteralProperty ol.animation.RotateOptions.start number|undefined
@exportObjectLiteralProperty ol.animation.RotateFromOptions.duration number|undefined @exportObjectLiteralProperty ol.animation.RotateOptions.duration number|undefined
@exportObjectLiteralProperty ol.animation.RotateFromOptions.easing function(number):number|undefined @exportObjectLiteralProperty ol.animation.RotateOptions.easing function(number):number|undefined
@exportObjectLiteral ol.animation.ZoomFromOptions @exportObjectLiteral ol.animation.ZoomOptions
@exportObjectLiteralProperty ol.animation.ZoomFromOptions.resolution number @exportObjectLiteralProperty ol.animation.ZoomOptions.resolution number
@exportObjectLiteralProperty ol.animation.ZoomFromOptions.start number|undefined @exportObjectLiteralProperty ol.animation.ZoomOptions.start number|undefined
@exportObjectLiteralProperty ol.animation.ZoomFromOptions.duration number|undefined @exportObjectLiteralProperty ol.animation.ZoomOptions.duration number|undefined
@exportObjectLiteralProperty ol.animation.ZoomFromOptions.easing function(number):number|undefined @exportObjectLiteralProperty ol.animation.ZoomOptions.easing function(number):number|undefined
@exportObjectLiteral ol.control.AttributionOptions @exportObjectLiteral ol.control.AttributionOptions
@exportObjectLiteralProperty ol.control.AttributionOptions.map ol.Map|undefined @exportObjectLiteralProperty ol.control.AttributionOptions.map ol.Map|undefined

6
src/ol/animation.exports
View File

@@ -1,4 +1,4 @@
@exportSymbol ol.animation @exportSymbol ol.animation
@exportProperty ol.animation.createBounce @exportProperty ol.animation.bounce
@exportProperty ol.animation.createPanFrom @exportProperty ol.animation.pan
@exportProperty ol.animation.createRotateFrom @exportProperty ol.animation.rotate

14
src/ol/animation.js
View File

@@ -12,7 +12,7 @@ goog.require('ol.easing');
* @param {ol.animation.BounceOptions} options Options. * @param {ol.animation.BounceOptions} options Options.
* @return {ol.PreRenderFunction} Pre-render function. * @return {ol.PreRenderFunction} Pre-render function.
*/ */
ol.animation.createBounce = function(options) { ol.animation.bounce = function(options) {
var resolution = options.resolution; var resolution = options.resolution;
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;
@@ -38,10 +38,10 @@ ol.animation.createBounce = function(options) {
/** /**
* @param {ol.animation.PanFromOptions} options Options. * @param {ol.animation.PanOptions} options Options.
* @return {ol.PreRenderFunction} Pre-render function. * @return {ol.PreRenderFunction} Pre-render function.
*/ */
ol.animation.createPanFrom = function(options) { ol.animation.pan = function(options) {
var source = options.source; var source = options.source;
var start = goog.isDef(options.start) ? options.start : goog.now(); var start = goog.isDef(options.start) ? options.start : goog.now();
var sourceX = source.x; var sourceX = source.x;
@@ -71,10 +71,10 @@ ol.animation.createPanFrom = function(options) {
/** /**
* @param {ol.animation.RotateFromOptions} options Options. * @param {ol.animation.RotateOptions} options Options.
* @return {ol.PreRenderFunction} Pre-render function. * @return {ol.PreRenderFunction} Pre-render function.
*/ */
ol.animation.createRotateFrom = function(options) { ol.animation.rotate = function(options) {
var sourceRotation = options.rotation; var sourceRotation = options.rotation;
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;
@@ -102,10 +102,10 @@ ol.animation.createRotateFrom = function(options) {
/** /**
* @param {ol.animation.ZoomFromOptions} options Options. * @param {ol.animation.ZoomOptions} options Options.
* @return {ol.PreRenderFunction} Pre-render function. * @return {ol.PreRenderFunction} Pre-render function.
*/ */
ol.animation.createZoomFrom = function(options) { ol.animation.zoom = function(options) {
var sourceResolution = options.resolution; var sourceResolution = options.resolution;
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;

2
src/ol/interaction/dragpaninteraction.js
View File

@@ -84,7 +84,7 @@ ol.interaction.DragPan.prototype.handleDragEnd = function(mapBrowserEvent) {
var distance = this.kinetic_.getDistance(); var distance = this.kinetic_.getDistance();
var angle = this.kinetic_.getAngle(); var angle = this.kinetic_.getAngle();
var center = view.getCenter(); var center = view.getCenter();
this.kineticPreRenderFn_ = this.kinetic_.createPanFrom(center); this.kineticPreRenderFn_ = this.kinetic_.pan(center);
map.addPreRenderFunction(this.kineticPreRenderFn_); map.addPreRenderFunction(this.kineticPreRenderFn_);
var centerpx = map.getPixelFromCoordinate(center); var centerpx = map.getPixelFromCoordinate(center);

4
src/ol/kinetic.js
View File

@@ -112,7 +112,7 @@ ol.Kinetic.prototype.end = function() {
* @param {ol.Coordinate} source Source coordinate for the animation. * @param {ol.Coordinate} source Source coordinate for the animation.
* @return {ol.PreRenderFunction} Pre-render function for kinetic animation. * @return {ol.PreRenderFunction} Pre-render function for kinetic animation.
*/ */
ol.Kinetic.prototype.createPanFrom = function(source) { ol.Kinetic.prototype.pan = function(source) {
var decay = this.decay_; var decay = this.decay_;
var initialVelocity = this.initialVelocity_; var initialVelocity = this.initialVelocity_;
var minVelocity = this.minVelocity_; var minVelocity = this.minVelocity_;
@@ -121,7 +121,7 @@ ol.Kinetic.prototype.createPanFrom = function(source) {
return initialVelocity * (Math.exp((decay * t) * duration) - 1) / return initialVelocity * (Math.exp((decay * t) * duration) - 1) /
(minVelocity - initialVelocity); (minVelocity - initialVelocity);
}; };
return ol.animation.createPanFrom({ return ol.animation.pan({
source: source, source: source,
duration: duration, duration: duration,
easing: easingFunction easing: easingFunction

2
src/ol/view2d.js
View File

@@ -298,7 +298,7 @@ ol.View2D.prototype.zoom = function(map, delta, opt_anchor, opt_duration) {
var currentResolution = this.getResolution(); var currentResolution = this.getResolution();
if (goog.isDef(currentResolution) && goog.isDef(opt_duration)) { if (goog.isDef(currentResolution) && goog.isDef(opt_duration)) {
map.requestRenderFrame(); map.requestRenderFrame();
map.addPreRenderFunction(ol.animation.createZoomFrom({ map.addPreRenderFunction(ol.animation.zoom({
resolution: currentResolution, resolution: currentResolution,
duration: opt_duration duration: opt_duration
})); }));