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

Make animations set animating hint

Browse Source
This commit is contained in:
Tom Payne
2013-01-13 00:15:21 +01:00
parent 969553cede
commit bafb53f2e1
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/animation.js
+6
View File
@@ -24,12 +24,14 @@ ol.animation.createBounce =
return function(map, frameState) { return function(map, frameState) {
if (frameState.time < start) { if (frameState.time < start) {
frameState.animate = true; frameState.animate = true;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
return true; return true;
} else if (frameState.time < start + duration) { } else if (frameState.time < start + duration) {
var delta = easingFunction((frameState.time - start) / duration); var delta = easingFunction((frameState.time - start) / duration);
var deltaResolution = resolution - frameState.view2DState.resolution; var deltaResolution = resolution - frameState.view2DState.resolution;
frameState.animate = true; frameState.animate = true;
frameState.view2DState.resolution += delta * deltaResolution; frameState.view2DState.resolution += delta * deltaResolution;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
return true; return true;
} else { } else {
return false; return false;
@@ -56,6 +58,7 @@ ol.animation.createPanFrom =
return function(map, frameState) { return function(map, frameState) {
if (frameState.time < start) { if (frameState.time < start) {
frameState.animate = true; frameState.animate = true;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
return true; return true;
} else if (frameState.time < start + duration) { } else if (frameState.time < start + duration) {
var delta = 1 - easingFunction((frameState.time - start) / duration); var delta = 1 - easingFunction((frameState.time - start) / duration);
@@ -64,6 +67,7 @@ ol.animation.createPanFrom =
frameState.animate = true; frameState.animate = true;
frameState.view2DState.center.x += delta * deltaX; frameState.view2DState.center.x += delta * deltaX;
frameState.view2DState.center.y += delta * deltaY; frameState.view2DState.center.y += delta * deltaY;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
return true; return true;
} else { } else {
return false; return false;
@@ -90,11 +94,13 @@ ol.animation.createSpin =
return function(map, frameState) { return function(map, frameState) {
if (frameState.time < start) { if (frameState.time < start) {
frameState.animate = true; frameState.animate = true;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
return true; return true;
} else if (frameState.time < start + duration) { } else if (frameState.time < start + duration) {
var delta = easingFunction((frameState.time - start) / duration); var delta = easingFunction((frameState.time - start) / duration);
frameState.animate = true; frameState.animate = true;
frameState.view2DState.rotation += delta * deltaTheta; frameState.view2DState.rotation += delta * deltaTheta;
frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
return true; return true;
} else { } else {
return false; return false;