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

Make webgl layer renderers dependencies of webgl layers

Browse Source
This commit is contained in:
Tim Schaub
2018-11-04 19:42:06 -07:00
parent 7374e32007
commit f6b838c635
14 changed files with 40 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ol/WebGLMap.js
View File

@@ -5,10 +5,7 @@ import PluggableMap from './PluggableMap.js';
import {defaults as defaultControls} from './control.js';
import {defaults as defaultInteractions} from './interaction.js';
import {assign} from './obj.js';
import WebGLImageLayerRenderer from './renderer/webgl/ImageLayer.js';
import WebGLMapRenderer from './renderer/webgl/Map.js';
import WebGLTileLayerRenderer from './renderer/webgl/TileLayer.js';
import WebGLVectorLayerRenderer from './renderer/webgl/VectorLayer.js';
/**
@@ -80,13 +77,7 @@ class WebGLMap extends PluggableMap {
}
createRenderer() {
const renderer = new WebGLMapRenderer(this);
renderer.registerLayerRenderers([
WebGLImageLayerRenderer,
WebGLTileLayerRenderer,
WebGLVectorLayerRenderer
]);
return renderer;
return new WebGLMapRenderer(this);
}
}

3
src/ol/layer/Image.js
View File

@@ -32,10 +32,11 @@ class ImageLayer extends BaseImageLayer {
/**
* Create a renderer for this layer.
* @param {import("../renderer/Map.js").default} mapRenderer The map renderer.
* @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/
createRenderer() {
createRenderer(mapRenderer) {
return new CanvasImageLayerRenderer(this);
}

8
src/ol/layer/Layer.js
View File

@@ -224,21 +224,23 @@ class Layer extends BaseLayer {
/**
* Get the renderer for this layer.
* @param {import("../renderer/Map.js").default} mapRenderer The map renderer.
* @return {import("../renderer/Layer.js").default} The layer renderer.
*/
getRenderer() {
getRenderer(mapRenderer) {
if (!this.renderer_) {
this.renderer_ = this.createRenderer();
this.renderer_ = this.createRenderer(mapRenderer);
}
return this.renderer_;
}
/**
* Create a renderer for this layer.
* @param {import("../renderer/Map.js").default} mapRenderer The map renderer.
* @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/
createRenderer() {
createRenderer(mapRenderer) {
return null;
}

3
src/ol/layer/Tile.js
View File

@@ -31,10 +31,11 @@ class TileLayer extends BaseTileLayer {
/**
* Create a renderer for this layer.
* @param {import("../renderer/Map.js").default} mapRenderer The map renderer.
* @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/
createRenderer() {
createRenderer(mapRenderer) {
return new CanvasTileLayerRenderer(this);
}

3
src/ol/layer/Vector.js
View File

@@ -29,10 +29,11 @@ class VectorLayer extends BaseVectorLayer {
/**
* Create a renderer for this layer.
* @param {import("../renderer/Map.js").default} mapRenderer The map renderer.
* @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/
createRenderer() {
createRenderer(mapRenderer) {
return new CanvasVectorLayerRenderer(this);
}
}

3
src/ol/layer/VectorImage.js
View File

@@ -28,10 +28,11 @@ class VectorImageLayer extends BaseVectorLayer {
/**
* Create a renderer for this layer.
* @param {import("../renderer/Map.js").default} mapRenderer The map renderer.
* @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/
createRenderer() {
createRenderer(mapRenderer) {
return new CanvasVectorImageLayerRenderer(this);
}
}

3
src/ol/layer/VectorTile.js
View File

@@ -123,10 +123,11 @@ class VectorTileLayer extends BaseVectorLayer {
/**
* Create a renderer for this layer.
* @param {import("../renderer/Map.js").default} mapRenderer The map renderer.
* @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/
createRenderer() {
createRenderer(mapRenderer) {
return new CanvasVectorTileLayerRenderer(this);
}

7
src/ol/layer/WebGLImage.js
View File

@@ -2,6 +2,7 @@
* @module ol/layer/WebGLImage
*/
import BaseImageLayer from './BaseImage.js';
import WebGLImageLayerRenderer from '../renderer/webgl/ImageLayer.js';
/**
@@ -31,12 +32,12 @@ class WebGLImageLayer extends BaseImageLayer {
/**
* Create a renderer for this layer.
* @param {import("../renderer/webgl/Map.js").default} mapRenderer The map renderer.
* @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/
createRenderer() {
// TODO: rework WebGL renderers to share context
return null;
createRenderer(mapRenderer) {
return new WebGLImageLayerRenderer(mapRenderer, this);
}
}

8
src/ol/layer/WebGLTile.js
View File

@@ -2,7 +2,7 @@
* @module ol/layer/WebGLTile
*/
import BaseTileLayer from './BaseTile.js';
import WebGLTileLayerRenderer from '../renderer/webgl/TileLayer.js';
/**
* @typedef {import("./BaseTile.js").Options} Options
@@ -30,12 +30,12 @@ class WebGLTileLayer extends BaseTileLayer {
/**
* Create a renderer for this layer.
* @param {import("../renderer/webgl/Map.js").default} mapRenderer The map renderer.
* @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/
createRenderer() {
// TODO: rework WebGL renderers to share context
return null;
createRenderer(mapRenderer) {
return new WebGLTileLayerRenderer(mapRenderer, this);
}
}

7
src/ol/layer/WebGLVector.js
View File

@@ -2,6 +2,7 @@
* @module ol/layer/WebGLVector
*/
import BaseVectorLayer from './BaseVector.js';
import WebGLVectorLayerRenderer from '../renderer/webgl/VectorLayer.js';
/**
@@ -28,12 +29,12 @@ class WebGLVectorLayer extends BaseVectorLayer {
/**
* Create a renderer for this layer.
* @param {import("../renderer/webgl/Map.js").default} mapRenderer The map renderer.
* @return {import("../renderer/Layer.js").default} A layer renderer.
* @protected
*/
createRenderer() {
// TODO: rework WebGL renderers to share context
return null;
createRenderer(mapRenderer) {
return new WebGLVectorLayerRenderer(mapRenderer, this);
}
}

42
src/ol/renderer/Map.js
View File

@@ -40,12 +40,6 @@ class MapRenderer extends Disposable {
*/
this.layerRendererListeners_ = {};
/**
* @private
* @type {Array<typeof import("./Layer.js").default>}
*/
this.layerRendererConstructors_ = [];
}
/**
@@ -57,14 +51,6 @@ class MapRenderer extends Disposable {
abstract();
}
/**
* Register layer renderer constructors.
* @param {Array<typeof import("./Layer.js").default>} constructors Layer renderers.
*/
registerLayerRenderers(constructors) {
this.layerRendererConstructors_.push.apply(this.layerRendererConstructors_, constructors);
}
/**
* @param {import("../PluggableMap.js").FrameState} frameState FrameState.
* @protected
@@ -151,10 +137,10 @@ class MapRenderer extends Disposable {
let i;
for (i = numLayers - 1; i >= 0; --i) {
const layerState = layerStates[i];
const layer = layerState.layer;
const layer = /** @type {import("../layer/Layer.js").default} */ (layerState.layer);
if (visibleAtResolution(layerState, viewResolution) && layerFilter.call(thisArg2, layer)) {
const layerRenderer = this.getLayerRenderer(layer);
const source = /** @type {import("../layer/Layer.js").default} */ (layer).getSource();
const source = layer.getSource();
if (source) {
result = layerRenderer.forEachFeatureAtCoordinate(
source.getWrapX() ? translatedCoordinate : coordinate,
@@ -208,7 +194,7 @@ class MapRenderer extends Disposable {
}
/**
* @param {import("../layer/Base.js").default} layer Layer.
* @param {import("../layer/Layer.js").default} layer Layer.
* @protected
* @return {import("./Layer.js").default} Layer renderer.
*/
@@ -216,27 +202,17 @@ class MapRenderer extends Disposable {
const layerKey = getUid(layer);
if (layerKey in this.layerRenderers_) {
return this.layerRenderers_[layerKey];
} else {
let renderer = layer.getRenderer();
}
const renderer = layer.getRenderer(this);
if (!renderer) {
for (let i = 0, ii = this.layerRendererConstructors_.length; i < ii; ++i) {
const candidate = this.layerRendererConstructors_[i];
if (candidate['handles'](layer)) {
renderer = candidate['create'](this, layer);
break;
}
}
}
if (renderer) {
this.layerRenderers_[layerKey] = renderer;
this.layerRendererListeners_[layerKey] = listen(renderer,
EventType.CHANGE, this.handleLayerRendererChange_, this);
} else {
throw new Error('Unable to create renderer for layer: ' + layer.getType());
}
this.layerRenderers_[layerKey] = renderer;
this.layerRendererListeners_[layerKey] = listen(renderer, EventType.CHANGE, this.handleLayerRendererChange_, this);
return renderer;
}
}
/**
* @param {string} layerKey Layer key.

25
src/ol/renderer/webgl/ImageLayer.js
View File

@@ -2,7 +2,6 @@
* @module ol/renderer/webgl/ImageLayer
*/
import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js';
import LayerType from '../../LayerType.js';
import ViewHint from '../../ViewHint.js';
import {createCanvasContext2D} from '../../dom.js';
import {getIntersection, isEmpty} from '../../extent.js';
@@ -269,28 +268,4 @@ class WebGLImageLayerRenderer extends WebGLLayerRenderer {
}
/**
* Determine if this renderer handles the provided layer.
* @param {import("../../layer/Layer.js").default} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLImageLayerRenderer['handles'] = function(layer) {
return layer.getType() === LayerType.IMAGE;
};
/**
* Create a layer renderer.
* @param {import("../Map.js").default} mapRenderer The map renderer.
* @param {import("../../layer/Layer.js").default} layer The layer to be rendererd.
* @return {WebGLImageLayerRenderer} The layer renderer.
*/
WebGLImageLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLImageLayerRenderer(
/** @type {import("./Map.js").default} */ (mapRenderer),
/** @type {import("../../layer/Image.js").default} */ (layer)
);
};
export default WebGLImageLayerRenderer;

25
src/ol/renderer/webgl/TileLayer.js
View File

@@ -4,7 +4,6 @@
// FIXME large resolutions lead to too large framebuffers :-(
// FIXME animated shaders! check in redraw
import LayerType from '../../LayerType.js';
import ImageTile from '../../ImageTile.js';
import TileRange from '../../TileRange.js';
import TileState from '../../TileState.js';
@@ -396,28 +395,4 @@ class WebGLTileLayerRenderer extends WebGLLayerRenderer {
}
/**
* Determine if this renderer handles the provided layer.
* @param {import("../../layer/Layer.js").default} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLTileLayerRenderer['handles'] = function(layer) {
return layer.getType() === LayerType.TILE;
};
/**
* Create a layer renderer.
* @param {import("../Map.js").default} mapRenderer The map renderer.
* @param {import("../../layer/Layer.js").default} layer The layer to be rendererd.
* @return {WebGLTileLayerRenderer} The layer renderer.
*/
WebGLTileLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLTileLayerRenderer(
/** @type {import("./Map.js").default} */ (mapRenderer),
/** @type {import("../../layer/Tile.js").default} */ (layer)
);
};
export default WebGLTileLayerRenderer;

25
src/ol/renderer/webgl/VectorLayer.js
View File

@@ -2,7 +2,6 @@
* @module ol/renderer/webgl/VectorLayer
*/
import {getUid} from '../../util.js';
import LayerType from '../../LayerType.js';
import ViewHint from '../../ViewHint.js';
import {buffer, containsExtent, createEmpty} from '../../extent.js';
import WebGLReplayGroup from '../../render/webgl/ReplayGroup.js';
@@ -304,28 +303,4 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
}
/**
* Determine if this renderer handles the provided layer.
* @param {import("../../layer/Layer.js").default} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
WebGLVectorLayerRenderer['handles'] = function(layer) {
return layer.getType() === LayerType.VECTOR;
};
/**
* Create a layer renderer.
* @param {import("../Map.js").default} mapRenderer The map renderer.
* @param {import("../../layer/Layer.js").default} layer The layer to be rendererd.
* @return {WebGLVectorLayerRenderer} The layer renderer.
*/
WebGLVectorLayerRenderer['create'] = function(mapRenderer, layer) {
return new WebGLVectorLayerRenderer(
/** @type {import("./Map.js").default} */ (mapRenderer),
/** @type {import("../../layer/Vector.js").default} */ (layer)
);
};
export default WebGLVectorLayerRenderer;