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

Webgl Layer and Context named exports

Browse Source
This commit is contained in:
Florent gravin
2018-02-15 13:38:03 +01:00
parent 0ec4f30aa9
commit 8eef99ad04
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/renderer/webgl/Layer.js
View File

@@ -12,7 +12,7 @@ import _ol_transform_ from '../../transform.js';
import {create, fromTransform} from '../../vec/mat4.js';
import _ol_webgl_ from '../../webgl.js';
import WebGLBuffer from '../../webgl/Buffer.js';
import WebGLContext from '../../webgl/Context.js';
import {createEmptyTexture} from '../../webgl/Context.js';
/**
* @constructor
@@ -116,7 +116,7 @@ WebGLLayerRenderer.prototype.bindFramebuffer = function(frameState, framebufferD
/** @type {ol.PostRenderFunction} */ (postRenderFunction)
);
const texture = WebGLContext.createEmptyTexture(
const texture = createEmptyTexture(
gl, framebufferDimension, framebufferDimension);
const framebuffer = gl.createFramebuffer();

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

@@ -8,7 +8,7 @@ import {CLASS_UNSELECTABLE} from '../../css.js';
import {createCanvasContext2D} from '../../dom.js';
import {listen} from '../../events.js';
import {WEBGL} from '../../has.js';
import Layer from '../../layer/Layer.js';
import {visibleAtResolution} from '../../layer/Layer.js';
import RenderEvent from '../../render/Event.js';
import RenderEventType from '../../render/EventType.js';
import WebGLImmediateRenderer from '../../render/webgl/Immediate.js';
@@ -450,7 +450,7 @@ WebGLMapRenderer.prototype.renderFrame = function(frameState) {
let i, ii, layerRenderer, layerState;
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
layerState = layerStatesArray[i];
if (Layer.visibleAtResolution(layerState, viewResolution) &&
if (visibleAtResolution(layerState, viewResolution) &&
layerState.sourceState == SourceState.READY) {
layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layerState.layer));
if (layerRenderer.prepareFrame(frameState, layerState, context)) {
@@ -525,7 +525,7 @@ WebGLMapRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, fra
for (i = numLayers - 1; i >= 0; --i) {
const layerState = layerStates[i];
const layer = layerState.layer;
if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
if (visibleAtResolution(layerState, viewState.resolution) &&
layerFilter.call(thisArg2, layer)) {
const layerRenderer = this.getLayerRenderer(layer);
result = layerRenderer.forEachFeatureAtCoordinate(
@@ -557,7 +557,7 @@ WebGLMapRenderer.prototype.hasFeatureAtCoordinate = function(coordinate, frameSt
for (i = numLayers - 1; i >= 0; --i) {
const layerState = layerStates[i];
const layer = layerState.layer;
if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
if (visibleAtResolution(layerState, viewState.resolution) &&
layerFilter.call(thisArg, layer)) {
const layerRenderer = this.getLayerRenderer(layer);
hasFeature =
@@ -589,7 +589,7 @@ WebGLMapRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, cal
for (i = numLayers - 1; i >= 0; --i) {
const layerState = layerStates[i];
const layer = layerState.layer;
if (Layer.visibleAtResolution(layerState, viewState.resolution) &&
if (visibleAtResolution(layerState, viewState.resolution) &&
layerFilter.call(thisArg, layer)) {
const layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layer));
result = layerRenderer.forEachLayerAtPixel(