Merge branch 'master' into vector

src/ol/renderer/dom/domlayerrenderer.js

@@ -71,8 +71,9 @@ ol.renderer.dom.Layer.prototype.handleLayerVisibleChange = function() {
 
 /**
  * Render.
+ * @param {number} time Time.
  */
-ol.renderer.dom.Layer.prototype.render = goog.abstractMethod;
+ol.renderer.dom.Layer.prototype.renderFrame = goog.abstractMethod;
 
 
 /**

src/ol/renderer/dom/dommaprenderer.js

@@ -135,11 +135,7 @@ ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) {
  */
 ol.renderer.dom.Map.prototype.handleCenterChanged = function() {
   goog.base(this, 'handleCenterChanged');
-  var map = this.getMap();
-  if (!map.isDef()) {
-    return;
-  }
-  map.render();
+  this.getMap().render();
 };
 
 
@@ -148,11 +144,7 @@ ol.renderer.dom.Map.prototype.handleCenterChanged = function() {
  */
 ol.renderer.dom.Map.prototype.handleResolutionChanged = function() {
   goog.base(this, 'handleResolutionChanged');
-  var map = this.getMap();
-  if (!map.isDef()) {
-    return;
-  }
-  map.render();
+  this.getMap().render();
 };
 
 
@@ -160,11 +152,8 @@ ol.renderer.dom.Map.prototype.handleResolutionChanged = function() {
  * @inheritDoc
  */
 ol.renderer.dom.Map.prototype.handleRotationChanged = function() {
-  var map = this.getMap();
-  if (!map.isDef()) {
-    return;
-  }
-  map.render();
+  goog.base(this, 'handleRotationChanged');
+  this.getMap().render();
 };
 
 
@@ -173,24 +162,19 @@ ol.renderer.dom.Map.prototype.handleRotationChanged = function() {
  */
 ol.renderer.dom.Map.prototype.handleSizeChanged = function() {
   goog.base(this, 'handleSizeChanged');
-  var map = this.getMap();
-  if (!map.isDef()) {
-    return;
-  }
-  map.render();
+  this.getMap().render();
 };
 
 
 /**
  * Render the map.  Sets up the layers pane on first render and adjusts its
  * position as needed on subsequent calls.
- *
- * @return {boolean} Animating.
+ * @inheritDoc
  */
-ol.renderer.dom.Map.prototype.render = function() {
+ol.renderer.dom.Map.prototype.renderFrame = function(time) {
   var map = this.getMap();
   if (!map.isDef()) {
-    return false;
+    return;
   }
 
   var mapCenter = map.getCenter();
@@ -228,14 +212,16 @@ ol.renderer.dom.Map.prototype.render = function() {
   this.renderedRotation_ = mapRotation;
   this.renderedSize_ = mapSize;
 
-  var animate = false;
+  var requestRenderFrame = false;
   this.forEachReadyVisibleLayer(function(layer, layerRenderer) {
-    if (layerRenderer.render()) {
-      animate = true;
+    if (layerRenderer.renderFrame(time)) {
+      requestRenderFrame = true;
     }
   });
 
-  return animate;
+  if (requestRenderFrame) {
+    map.requestRenderFrame();
+  }
 
 };
 

src/ol/renderer/dom/domtilelayerrenderer.js

@@ -33,11 +33,6 @@ ol.renderer.dom.TileLayer = function(mapRenderer, tileLayer, target) {
    */
   this.renderedMapResolution_ = undefined;
 
-  /**
-   * @type {Object.<number, (number|null)>}
-   * @private
-   */
-  this.tileChangeListenerKeys_ = {};
 };
 goog.inherits(ol.renderer.dom.TileLayer, ol.renderer.dom.Layer);
 
@@ -91,24 +86,10 @@ ol.renderer.dom.TileLayer.prototype.removeExtraTiles_ =
 };
 
 
-/**
- * @param {goog.events.Event} event Tile change event.
- * @private
- */
-ol.renderer.dom.TileLayer.prototype.handleTileChange_ = function(event) {
-  var tile = /** @type {ol.Tile} */ (event.target);
-  goog.asserts.assert(tile.getState() == ol.TileState.LOADED);
-  var tileKey = goog.getUid(tile);
-  goog.asserts.assert(tileKey in this.tileChangeListenerKeys_);
-  delete this.tileChangeListenerKeys_[tileKey];
-  this.render();
-};
-
-
 /**
  * @inheritDoc
  */
-ol.renderer.dom.TileLayer.prototype.render = function() {
+ol.renderer.dom.TileLayer.prototype.renderFrame = function(time) {
 
   var map = this.getMap();
   if (!map.isDef()) {
@@ -134,6 +115,7 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
   var tileRange =
       tileGrid.getTileRangeForExtentAndResolution(mapExtent, mapResolution);
 
+  var allTilesLoaded = true;
 
   // first pass through the tile range to determine all the tiles needed
   tileRange.forEachTileCoord(z, function(tileCoord) {
@@ -145,18 +127,15 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
 
     var key = tile.tileCoord.toString();
     var state = tile.getState();
-    if (state == ol.TileState.LOADED) {
+    if (state == ol.TileState.IDLE) {
+      tile.load();
+    } else if (state == ol.TileState.LOADED) {
       tilesToDrawByZ[z][key] = tile;
       return;
-    } else {
-      var tileKey = goog.getUid(tile);
-      if (!(tileKey in this.tileChangeListenerKeys_)) {
-        this.tileChangeListenerKeys_[tileKey] = goog.events.listen(tile,
-            goog.events.EventType.CHANGE, this.handleTileChange_, false, this);
-        tile.load();
-      }
     }
 
+    allTilesLoaded = false;
+
     /**
      * Look for already loaded tiles at alternate z that can serve as
      * placeholders until tiles at the current z have loaded.
@@ -243,4 +222,6 @@ ol.renderer.dom.TileLayer.prototype.render = function() {
   this.renderedMapResolution_ = mapResolution;
 
   this.removeExtraTiles_(tilesToDrawByZ);
+
+  return !allTilesLoaded;
 };

src/ol/renderer/maprenderer.js

@@ -309,9 +309,10 @@ ol.renderer.Map.prototype.removeLayerRenderer = function(layer) {
 
 
 /**
- * @return {boolean} Animating.
+ * Render.
+ * @param {number} time Time.
  */
-ol.renderer.Map.prototype.render = goog.functions.FALSE;
+ol.renderer.Map.prototype.renderFrame = goog.functions.FALSE;
 
 
 /**

src/ol/renderer/webgl/webgllayerrenderer.js

@@ -112,5 +112,7 @@ ol.renderer.webgl.Layer.prototype.handleWebGLContextLost = goog.nullFunction;
 
 /**
  * Render.
+ * @param {number} time Time.
+ * @return {boolean} Request render frame.
  */
-ol.renderer.webgl.Layer.prototype.render = goog.abstractMethod;
+ol.renderer.webgl.Layer.prototype.renderFrame = goog.abstractMethod;

src/ol/renderer/webgl/webglmaprenderer.js

@@ -601,12 +601,20 @@ ol.renderer.webgl.Map.prototype.removeLayerRenderer = function(layer) {
 /**
  * @inheritDoc
  */
-ol.renderer.webgl.Map.prototype.render = function() {
+ol.renderer.webgl.Map.prototype.renderFrame = function(time) {
 
   if (!this.getMap().isDef()) {
-    return false;
+    return;
   }
 
+  var requestRenderFrame = false;
+
+  this.forEachReadyVisibleLayer(function(layer, layerRenderer) {
+    if (layerRenderer.renderFrame(time)) {
+      requestRenderFrame = true;
+    }
+  });
+
   var size = /** @type {ol.Size} */ this.getMap().getSize();
   if (!this.canvasSize_.equals(size)) {
     this.canvas_.width = size.width;
@@ -616,7 +624,7 @@ ol.renderer.webgl.Map.prototype.render = function() {
 
   var animate = false;
   this.forEachReadyVisibleLayer(function(layer, layerRenderer) {
-    if (layerRenderer.render()) {
+    if (layerRenderer.renderFrame(time)) {
       animate = true;
     }
   });
@@ -684,7 +692,9 @@ ol.renderer.webgl.Map.prototype.render = function() {
     gl.drawArrays(goog.webgl.TRIANGLE_STRIP, 0, 4);
   }, this);
 
-  return animate;
+  if (requestRenderFrame) {
+    this.getMap().requestRenderFrame();
+  }
 
 };
 

src/ol/renderer/webgl/webgltilelayerrenderer.js

@@ -1,5 +1,7 @@
 // FIXME large resolutions lead to too large framebuffers :-(
 // FIXME animated shaders! check in redraw
+// FIXME throttle texture uploads
+// FIXME prioritize texture uploads
 
 goog.provide('ol.renderer.webgl.TileLayer');
 goog.provide('ol.renderer.webgl.tilelayerrenderer');
@@ -141,12 +143,6 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
    */
   this.framebufferDimension_ = undefined;
 
-  /**
-   * @private
-   * @type {Object.<number, (number|null)>}
-   */
-  this.tileChangeListenerKeys_ = {};
-
   /**
    * @private
    * @type {goog.vec.Mat4.AnyType}
@@ -276,19 +272,6 @@ ol.renderer.webgl.TileLayer.prototype.getTexture = function() {
 };
 
 
-/**
- * @param {goog.events.Event} event Event.
- * @protected
- */
-ol.renderer.webgl.TileLayer.prototype.handleTileChange = function(event) {
-  var tile = /** @type {ol.Tile} */ (event.target);
-  var tileKey = goog.getUid(tile);
-  goog.asserts.assert(tileKey in this.tileChangeListenerKeys_);
-  delete this.tileChangeListenerKeys_[tileKey];
-  this.dispatchChangeEvent();
-};
-
-
 /**
  * @inheritDoc
  */
@@ -304,9 +287,9 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
 /**
  * @inheritDoc
  */
-ol.renderer.webgl.TileLayer.prototype.render = function() {
+ol.renderer.webgl.TileLayer.prototype.renderFrame = function(time) {
 
-  var animate = false;
+  var requestRenderFrame = false;
 
   var mapRenderer = this.getMapRenderer();
   var map = this.getMap();
@@ -413,26 +396,26 @@ ol.renderer.webgl.TileLayer.prototype.render = function() {
       var tile = tileSource.getTile(tileCoord);
 
       if (goog.isNull(tile)) {
-        // FIXME consider returning here as this is outside the source's extent
-      } else if (tile.getState() == ol.TileState.LOADED) {
-        if (mapRenderer.isImageTextureLoaded(tile.getImage())) {
+        return;
+      }
+
+      var tileState = tile.getState();
+      if (tileState == ol.TileState.IDLE) {
+        tile.load();
+      } else if (tileState == ol.TileState.LOADED) {
+        var image = tile.getImage();
+        if (mapRenderer.isImageTextureLoaded(image)) {
           tilesToDrawByZ[z][tileCoord.toString()] = tile;
           return;
         } else {
-          imagesToLoad.push(tile.getImage());
-          allTilesLoaded = false;
+          imagesToLoad.push(image);
         }
-      } else {
-        var tileKey = goog.getUid(tile);
-        if (!(tileKey in this.tileChangeListenerKeys_)) {
-          tile.load();
-          // FIXME will need to handle aborts as well
-          this.tileChangeListenerKeys_[tileKey] = goog.events.listen(tile,
-              goog.events.EventType.CHANGE, this.handleTileChange, false, this);
-        }
-        allTilesLoaded = false;
+      } else if (tileState == ol.TileState.ERROR) {
+        return;
       }
 
+      allTilesLoaded = false;
+
       // FIXME this could be more efficient about filling partial holes
       tileGrid.forEachTileCoordParentTileRange(
           tileCoord,
@@ -497,7 +480,6 @@ ol.renderer.webgl.TileLayer.prototype.render = function() {
               this.logger.info('uploaded textures');
             }
           }, mapRenderer, imagesToLoad));
-      animate = true;
     }
 
     if (allTilesLoaded) {
@@ -506,6 +488,7 @@ ol.renderer.webgl.TileLayer.prototype.render = function() {
     } else {
       this.renderedTileRange_ = null;
       this.renderedFramebufferExtent_ = null;
+      requestRenderFrame = true;
     }
 
   }
@@ -531,6 +514,6 @@ ol.renderer.webgl.TileLayer.prototype.render = function() {
       -0.5,
       0);
 
-  return animate;
+  return requestRenderFrame;
 
 };