Merge pull request #564 from twpayne/frame-index

Frame index
openlayers · Apr 18, 2013 · 8735829 · 8735829
2 parents bc9f702 + 75bc61c
commit 8735829
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/ol/framestate.js b/src/ol/framestate.js
@@ -24,6 +24,7 @@ goog.require('ol.layer.LayerState');
  *            coordinateToPixelMatrix: goog.vec.Mat4.Number,
  *            extent: (null|ol.Extent),
  *            focus: ol.Coordinate,
+ *            index: number,
  *            layersArray: Array.<ol.layer.Layer>,
  *            layerStates: Object.<number, ol.layer.LayerState>,
  *            logos: Object.<string, boolean>,

diff --git a/src/ol/map.js b/src/ol/map.js
@@ -168,6 +168,12 @@ ol.Map = function(options) {
    */
   this.pixelToCoordinateMatrix_ = goog.vec.Mat4.createNumber();
 
+  /**
+   * @private
+   * @type {number}
+   */
+  this.frameIndex_ = 0;
+
   /**
    * @private
    * @type {?ol.FrameState}
@@ -804,6 +810,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
       coordinateToPixelMatrix: this.coordinateToPixelMatrix_,
       extent: null,
       focus: goog.isNull(this.focus_) ? view2DState.center : this.focus_,
+      index: this.frameIndex_++,
       layersArray: layersArray,
       layerStates: layerStates,
       logos: {},

diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -365,7 +365,7 @@ ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) {
     textureCacheEntry = /** @type {?ol.renderer.webgl.TextureCacheEntry} */
         (this.textureCache_.peekLast());
     if (goog.isNull(textureCacheEntry)) {
-      if (+this.textureCache_.peekLastKey() == frameState.time) {
+      if (+this.textureCache_.peekLastKey() == frameState.index) {
         break;
       } else {
         --this.textureCacheFrameMarkerCount_;
@@ -521,7 +521,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
 
   this.focus_ = frameState.focus;
 
-  this.textureCache_.set(frameState.time.toString(), null);
+  this.textureCache_.set(frameState.index.toString(), null);
   ++this.textureCacheFrameMarkerCount_;
 
   goog.array.forEach(frameState.layersArray, function(layer) {