From 3c701067b3a7b74ff72dd72f8a597ba0fa52305e Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 7 Mar 2013 02:58:00 +0100 Subject: [PATCH] Remove animations from side-by-side example --- examples/side-by-side.html | 4 -- examples/side-by-side.js | 95 -------------------------------------- 2 files changed, 99 deletions(-) diff --git a/examples/side-by-side.html b/examples/side-by-side.html index b937863e3d..ecdfe499a3 100644 --- a/examples/side-by-side.html +++ b/examples/side-by-side.html @@ -58,14 +58,10 @@
drag, arrow keys
Zoom
double-click, Shift+double-click, mouse wheel, +/- keys; Shift+drag
-
Rotate
-
Alt+Shift+drag, r to reset
Opacity
o/O keys
Visibility
v/V keys
-
Animations
-
j/l/m/x/L/M/X keys
Reset
0 key
diff --git a/examples/side-by-side.js b/examples/side-by-side.js index 01d7971372..5f07324f80 100644 --- a/examples/side-by-side.js +++ b/examples/side-by-side.js @@ -56,83 +56,6 @@ keyboardInteraction.addCallback('0', function() { layer.setOpacity(1); layer.setVisible(true); }); -keyboardInteraction.addCallback('j', function() { - var bounce = ol.animation.bounce({ - resolution: 2 * view.getResolution() - }); - domMap.addPreRenderFunction(bounce); - webglMap.addPreRenderFunction(bounce); - canvasMap.addPreRenderFunction(bounce); -}); -keyboardInteraction.addCallback('l', function() { - var pan = ol.animation.pan({ - source: view.getCenter(), - easing: ol.easing.elastic - }); - domMap.addPreRenderFunction(pan); - webglMap.addPreRenderFunction(pan); - canvasMap.addPreRenderFunction(pan); - view.setCenter(LONDON); -}); -keyboardInteraction.addCallback('L', function() { - var start = +new Date(); - var duration = 5000; - var bounce = ol.animation.bounce({ - resolution: 2 * view.getResolution(), - start: start, - duration: duration - }); - var pan = ol.animation.pan({ - source: view.getCenter(), - start: start, - duration: duration - }); - var rotate = ol.animation.rotate({ - rotation: 4 * Math.PI, - start: start, - duration: duration - }); - var preRenderFunctions = [bounce, pan, rotate]; - domMap.addPreRenderFunctions(preRenderFunctions); - webglMap.addPreRenderFunctions(preRenderFunctions); - canvasMap.addPreRenderFunctions(preRenderFunctions); - view.setCenter(LONDON); -}); -keyboardInteraction.addCallback('m', function() { - var pan = ol.animation.pan({ - source: view.getCenter(), - duration: 1000, - easing: ol.easing.bounce - }); - domMap.addPreRenderFunction(pan); - webglMap.addPreRenderFunction(pan); - canvasMap.addPreRenderFunction(pan); - view.setCenter(MOSCOW); -}); -keyboardInteraction.addCallback('M', function() { - var start = +new Date(); - var duration = 5000; - var bounce = ol.animation.bounce({ - resolution: 2 * view.getResolution(), - start: start, - duration: duration - }); - var pan = ol.animation.pan({ - source: view.getCenter(), - start: start, - duration: duration - }); - var rotate = ol.animation.rotate({ - rotation: -4 * Math.PI, - start: start, - duration: duration - }); - var preRenderFunctions = [bounce, pan, rotate]; - domMap.addPreRenderFunctions(preRenderFunctions); - webglMap.addPreRenderFunctions(preRenderFunctions); - canvasMap.addPreRenderFunctions(preRenderFunctions); - view.setCenter(MOSCOW); -}); keyboardInteraction.addCallback('o', function() { layer.setOpacity(layer.getOpacity() - 0.1); }); @@ -145,22 +68,4 @@ keyboardInteraction.addCallback('r', function() { keyboardInteraction.addCallback('vV', function() { layer.setVisible(!layer.getVisible()); }); -keyboardInteraction.addCallback('x', function() { - var rotate = ol.animation.rotate({ - rotation: 4 * Math.PI, - duration: 2000 - }); - domMap.addPreRenderFunction(rotate); - webglMap.addPreRenderFunction(rotate); - canvasMap.addPreRenderFunction(rotate); -}); -keyboardInteraction.addCallback('X', function() { - var rotate = ol.animation.rotate({ - rotation: -4 * Math.PI, - duration: 2000 - }); - domMap.addPreRenderFunction(rotate); - webglMap.addPreRenderFunction(rotate); - canvasMap.addPreRenderFunction(rotate); -}); domMap.getInteractions().push(keyboardInteraction);