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

Fix type check errors in ol/renderer/webgl

Browse Source
This commit is contained in:
Kevin Schmidt
2018-10-02 15:36:02 -06:00
parent 2b8cee3e44
commit e30293d07f
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ class WebGLImageLayerRenderer extends WebGLLayerRenderer {
let image = this.image_;
let texture = this.texture;
const imageLayer = /** @type {import("../../layer/Image.js").default} */ (this.getLayer());
const imageSource = imageLayer.getSource();
const imageSource = /** @type {import("../../source/Image.js").default} */ (imageLayer.getSource());
const hints = frameState.viewHints;

15
src/ol/renderer/webgl/Map.js
View File

@@ -207,6 +207,7 @@ class WebGLMapRenderer extends MapRenderer {
}
} else {
const texture = gl.createTexture();
const imageTile = /** @type {import("../../ImageTile.js").default} */ (tile);
gl.bindTexture(TEXTURE_2D, texture);
if (tileGutter > 0) {
const clipTileCanvas = this.clipTileContext_.canvas;
@@ -220,7 +221,7 @@ class WebGLMapRenderer extends MapRenderer {
} else {
clipTileContext.clearRect(0, 0, tileSize[0], tileSize[1]);
}
clipTileContext.drawImage(tile.getImage(), tileGutter, tileGutter,
clipTileContext.drawImage(imageTile.getImage(), tileGutter, tileGutter,
tileSize[0], tileSize[1], 0, 0, tileSize[0], tileSize[1]);
gl.texImage2D(TEXTURE_2D, 0,
RGBA, RGBA,
@@ -228,7 +229,7 @@ class WebGLMapRenderer extends MapRenderer {
} else {
gl.texImage2D(TEXTURE_2D, 0,
RGBA, RGBA,
UNSIGNED_BYTE, tile.getImage());
UNSIGNED_BYTE, imageTile.getImage());
}
gl.texParameteri(
TEXTURE_2D, TEXTURE_MAG_FILTER, magFilter);
@@ -418,12 +419,12 @@ class WebGLMapRenderer extends MapRenderer {
stableSort(layerStatesArray, sortByZIndex);
const viewResolution = frameState.viewState.resolution;
let i, ii, layerRenderer, layerState;
let i, ii;
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
layerState = layerStatesArray[i];
const layerState = layerStatesArray[i];
if (visibleAtResolution(layerState, viewResolution) &&
layerState.sourceState == SourceState.READY) {
layerRenderer = /** @type {import("./Layer.js").default} */ (this.getLayerRenderer(layerState.layer));
const layerRenderer = /** @type {import("./Layer.js").default} */ (this.getLayerRenderer(layerState.layer));
if (layerRenderer.prepareFrame(frameState, layerState, context)) {
layerStatesToDraw.push(layerState);
}
@@ -445,8 +446,8 @@ class WebGLMapRenderer extends MapRenderer {
gl.viewport(0, 0, this.canvas_.width, this.canvas_.height);
for (i = 0, ii = layerStatesToDraw.length; i < ii; ++i) {
layerState = layerStatesToDraw[i];
layerRenderer = /** @type {import("./Layer.js").default} */ (this.getLayerRenderer(layerState.layer));
const layerState = layerStatesToDraw[i];
const layerRenderer = /** @type {import("./Layer.js").default} */ (this.getLayerRenderer(layerState.layer));
layerRenderer.composeFrame(frameState, layerState, context);
}

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

@@ -183,7 +183,7 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
*/
prepareFrame(frameState, layerState, context) {
const vectorLayer = /** @type {import("../../layer/Vector.js").default} */ (this.getLayer());
const vectorSource = vectorLayer.getSource();
const vectorSource = /** @type {import("../../source/Vector.js").default} */ (vectorLayer.getSource());
const animating = frameState.viewHints[ViewHint.ANIMATING];
const interacting = frameState.viewHints[ViewHint.INTERACTING];
@@ -245,7 +245,7 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
feature, resolution, pixelRatio, styles, replayGroup);
this.dirty_ = this.dirty_ || dirty;
}
};
}.bind(this);
if (vectorLayerRenderOrder) {
/** @type {Array<import("../../Feature.js").default>} */
const features = [];
@@ -255,11 +255,11 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer {
*/
function(feature) {
features.push(feature);
}, this);
});
features.sort(vectorLayerRenderOrder);
features.forEach(render.bind(this));
} else {
vectorSource.forEachFeatureInExtent(extent, render, this);
vectorSource.forEachFeatureInExtent(extent, render);
}
replayGroup.finish(context);