Port WebGL renderer to requestRenderFrame

src/ol/renderer/webgl/webgllayerrenderer.js

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

src/ol/renderer/webgl/webglmaprenderer.js

@@ -604,9 +604,17 @@ ol.renderer.webgl.Map.prototype.removeLayerRenderer = function(layer) {
 ol.renderer.webgl.Map.prototype.render = function() {
 
   if (!this.getMap().isDef()) {
-    return false;
+    return;
   }
 
+  var requestRenderFrame = false;
+
+  this.forEachReadyVisibleLayer(function(layer, layerRenderer) {
+    if (layerRenderer.render()) {
+      requestRenderFrame = true;
+    }
+  });
+
   var size = /** @type {ol.Size} */ this.getMap().getSize();
   if (!this.canvasSize_.equals(size)) {
     this.canvas_.width = size.width;
@@ -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

@@ -141,12 +141,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 +270,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
  */
@@ -306,7 +287,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
  */
 ol.renderer.webgl.TileLayer.prototype.render = function() {
 
-  var animate = false;
+  var requestRenderFrame = false;
 
   var mapRenderer = this.getMapRenderer();
   var map = this.getMap();
@@ -413,25 +394,25 @@ 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());
+          imagesToLoad.push(image);
+        }
+      } else if (tileState == ol.TileState.ERROR) {
+        return;
+      }
+
       allTilesLoaded = false;
-        }
-      } 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;
-      }
 
       // FIXME this could be more efficient about filling partial holes
       tileGrid.forEachTileCoordParentTileRange(
@@ -497,7 +478,6 @@ ol.renderer.webgl.TileLayer.prototype.render = function() {
               this.logger.info('uploaded textures');
             }
           }, mapRenderer, imagesToLoad));
-      animate = true;
     }
 
     if (allTilesLoaded) {
@@ -506,6 +486,7 @@ ol.renderer.webgl.TileLayer.prototype.render = function() {
     } else {
       this.renderedTileRange_ = null;
       this.renderedFramebufferExtent_ = null;
+      requestRenderFrame = true;
     }
 
   }
@@ -531,6 +512,6 @@ ol.renderer.webgl.TileLayer.prototype.render = function() {
       -0.5,
       0);
 
-  return animate;
+  return requestRenderFrame;
 
 };