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

Transformed

Browse Source
This commit is contained in:
Tim Schaub
2017-12-11 16:29:33 -07:00
parent 1cdb6a66f0
commit 7f47883c48
737 changed files with 22216 additions and 21609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/webgl/ImageLayer.js
+64 -62
View File
@@ -1,17 +1,17 @@
goog.provide('ol.renderer.webgl.ImageLayer');
goog.require('ol');
goog.require('ol.LayerType');
goog.require('ol.ViewHint');
goog.require('ol.dom');
goog.require('ol.extent');
goog.require('ol.functions');
goog.require('ol.renderer.Type');
goog.require('ol.renderer.webgl.Layer');
goog.require('ol.transform');
goog.require('ol.webgl');
goog.require('ol.webgl.Context');
/**
* @module ol/renderer/webgl/ImageLayer
*/
import _ol_ from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js';
import _ol_ViewHint_ from '../../ViewHint.js';
import _ol_dom_ from '../../dom.js';
import _ol_extent_ from '../../extent.js';
import _ol_functions_ from '../../functions.js';
import _ol_renderer_Type_ from '../Type.js';
import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js';
import _ol_transform_ from '../../transform.js';
import _ol_webgl_ from '../../webgl.js';
import _ol_webgl_Context_ from '../../webgl/Context.js';
/**
* @constructor
@@ -20,9 +20,9 @@ goog.require('ol.webgl.Context');
* @param {ol.layer.Image} imageLayer Tile layer.
* @api
*/
ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) {
var _ol_renderer_webgl_ImageLayer_ = function(mapRenderer, imageLayer) {
ol.renderer.webgl.Layer.call(this, mapRenderer, imageLayer);
_ol_renderer_webgl_Layer_.call(this, mapRenderer, imageLayer);
/**
* The last rendered image.
@@ -44,7 +44,8 @@ ol.renderer.webgl.ImageLayer = function(mapRenderer, imageLayer) {
this.hitTransformationMatrix_ = null;
};
ol.inherits(ol.renderer.webgl.ImageLayer, ol.renderer.webgl.Layer);
_ol_.inherits(_ol_renderer_webgl_ImageLayer_, _ol_renderer_webgl_Layer_);
/**
@@ -53,8 +54,8 @@ ol.inherits(ol.renderer.webgl.ImageLayer, ol.renderer.webgl.Layer);
* @param {ol.layer.Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
ol.renderer.webgl.ImageLayer['handles'] = function(type, layer) {
return type === ol.renderer.Type.WEBGL && layer.getType() === ol.LayerType.IMAGE;
_ol_renderer_webgl_ImageLayer_['handles'] = function(type, layer) {
return type === _ol_renderer_Type_.WEBGL && layer.getType() === _ol_LayerType_.IMAGE;
};
@@ -64,8 +65,8 @@ ol.renderer.webgl.ImageLayer['handles'] = function(type, layer) {
* @param {ol.layer.Layer} layer The layer to be rendererd.
* @return {ol.renderer.webgl.ImageLayer} The layer renderer.
*/
ol.renderer.webgl.ImageLayer['create'] = function(mapRenderer, layer) {
return new ol.renderer.webgl.ImageLayer(
_ol_renderer_webgl_ImageLayer_['create'] = function(mapRenderer, layer) {
return new _ol_renderer_webgl_ImageLayer_(
/** @type {ol.renderer.webgl.Map} */ (mapRenderer),
/** @type {ol.layer.Image} */ (layer)
);
@@ -77,7 +78,7 @@ ol.renderer.webgl.ImageLayer['create'] = function(mapRenderer, layer) {
* @private
* @return {WebGLTexture} Texture.
*/
ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) {
_ol_renderer_webgl_ImageLayer_.prototype.createTexture_ = function(image) {
// We meet the conditions to work with non-power of two textures.
// http://www.khronos.org/webgl/wiki/WebGL_and_OpenGL_Differences#Non-Power_of_Two_Texture_Support
@@ -86,15 +87,15 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) {
var imageElement = image.getImage();
var gl = this.mapRenderer.getGL();
return ol.webgl.Context.createTexture(
gl, imageElement, ol.webgl.CLAMP_TO_EDGE, ol.webgl.CLAMP_TO_EDGE);
return _ol_webgl_Context_.createTexture(
gl, imageElement, _ol_webgl_.CLAMP_TO_EDGE, _ol_webgl_.CLAMP_TO_EDGE);
};
/**
* @inheritDoc
*/
ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
_ol_renderer_webgl_ImageLayer_.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
var layer = this.getLayer();
var source = layer.getSource();
var resolution = frameState.viewState.resolution;
@@ -116,7 +117,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate = function(coo
/**
* @inheritDoc
*/
ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layerState, context) {
_ol_renderer_webgl_ImageLayer_.prototype.prepareFrame = function(frameState, layerState, context) {
var gl = this.mapRenderer.getGL();
@@ -135,13 +136,13 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
var renderedExtent = frameState.extent;
if (layerState.extent !== undefined) {
renderedExtent = ol.extent.getIntersection(
renderedExtent = _ol_extent_.getIntersection(
renderedExtent, layerState.extent);
}
if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING] &&
!ol.extent.isEmpty(renderedExtent)) {
if (!hints[_ol_ViewHint_.ANIMATING] && !hints[_ol_ViewHint_.INTERACTING] &&
!_ol_extent_.isEmpty(renderedExtent)) {
var projection = viewState.projection;
if (!ol.ENABLE_RASTER_REPROJECTION) {
if (!_ol_.ENABLE_RASTER_REPROJECTION) {
var sourceProjection = imageSource.getProjection();
if (sourceProjection) {
projection = sourceProjection;
@@ -182,9 +183,9 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
// Translate and scale to flip the Y coord.
var texCoordMatrix = this.texCoordMatrix;
ol.transform.reset(texCoordMatrix);
ol.transform.scale(texCoordMatrix, 1, -1);
ol.transform.translate(texCoordMatrix, 0, -1);
_ol_transform_.reset(texCoordMatrix);
_ol_transform_.scale(texCoordMatrix, 1, -1);
_ol_transform_.translate(texCoordMatrix, 0, -1);
this.image_ = image;
this.texture = texture;
@@ -206,25 +207,25 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
* @param {ol.Extent} imageExtent Image extent.
* @private
*/
ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = function(canvasWidth, canvasHeight, pixelRatio,
_ol_renderer_webgl_ImageLayer_.prototype.updateProjectionMatrix_ = function(canvasWidth, canvasHeight, pixelRatio,
viewCenter, viewResolution, viewRotation, imageExtent) {
var canvasExtentWidth = canvasWidth * viewResolution;
var canvasExtentHeight = canvasHeight * viewResolution;
var projectionMatrix = this.projectionMatrix;
ol.transform.reset(projectionMatrix);
ol.transform.scale(projectionMatrix,
_ol_transform_.reset(projectionMatrix);
_ol_transform_.scale(projectionMatrix,
pixelRatio * 2 / canvasExtentWidth,
pixelRatio * 2 / canvasExtentHeight);
ol.transform.rotate(projectionMatrix, -viewRotation);
ol.transform.translate(projectionMatrix,
_ol_transform_.rotate(projectionMatrix, -viewRotation);
_ol_transform_.translate(projectionMatrix,
imageExtent[0] - viewCenter[0],
imageExtent[1] - viewCenter[1]);
ol.transform.scale(projectionMatrix,
_ol_transform_.scale(projectionMatrix,
(imageExtent[2] - imageExtent[0]) / 2,
(imageExtent[3] - imageExtent[1]) / 2);
ol.transform.translate(projectionMatrix, 1, 1);
_ol_transform_.translate(projectionMatrix, 1, 1);
};
@@ -232,9 +233,9 @@ ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = function(canvas
/**
* @inheritDoc
*/
ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
_ol_renderer_webgl_ImageLayer_.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
var hasFeature = this.forEachFeatureAtCoordinate(
coordinate, frameState, 0, ol.functions.TRUE, this);
coordinate, frameState, 0, _ol_functions_.TRUE, this);
return hasFeature !== undefined;
};
@@ -242,18 +243,18 @@ ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate = function(coordin
/**
* @inheritDoc
*/
ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
_ol_renderer_webgl_ImageLayer_.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
if (!this.image_ || !this.image_.getImage()) {
return undefined;
}
if (this.getLayer().getSource().forEachFeatureAtCoordinate !== ol.nullFunction) {
if (this.getLayer().getSource().forEachFeatureAtCoordinate !== _ol_.nullFunction) {
// for ImageCanvas sources use the original hit-detection logic,
// so that for example also transparent polygons are detected
var coordinate = ol.transform.apply(
var coordinate = _ol_transform_.apply(
frameState.pixelToCoordinateTransform, pixel.slice());
var hasFeature = this.forEachFeatureAtCoordinate(
coordinate, frameState, 0, ol.functions.TRUE, this);
coordinate, frameState, 0, _ol_functions_.TRUE, this);
if (hasFeature) {
return callback.call(thisArg, this.getLayer(), null);
@@ -269,7 +270,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, fra
frameState.size, imageSize);
}
var pixelOnFrameBuffer = ol.transform.apply(
var pixelOnFrameBuffer = _ol_transform_.apply(
this.hitTransformationMatrix_, pixel.slice());
if (pixelOnFrameBuffer[0] < 0 || pixelOnFrameBuffer[0] > imageSize[0] ||
@@ -279,7 +280,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, fra
}
if (!this.hitCanvasContext_) {
this.hitCanvasContext_ = ol.dom.createCanvasContext2D(1, 1);
this.hitCanvasContext_ = _ol_dom_.createCanvasContext2D(1, 1);
}
this.hitCanvasContext_.clearRect(0, 0, 1, 1);
@@ -304,28 +305,29 @@ ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, fra
* @return {ol.Transform} The transformation matrix.
* @private
*/
ol.renderer.webgl.ImageLayer.prototype.getHitTransformationMatrix_ = function(mapSize, imageSize) {
_ol_renderer_webgl_ImageLayer_.prototype.getHitTransformationMatrix_ = function(mapSize, imageSize) {
// the first matrix takes a map pixel, flips the y-axis and scales to
// a range between -1 ... 1
var mapCoordTransform = ol.transform.create();
ol.transform.translate(mapCoordTransform, -1, -1);
ol.transform.scale(mapCoordTransform, 2 / mapSize[0], 2 / mapSize[1]);
ol.transform.translate(mapCoordTransform, 0, mapSize[1]);
ol.transform.scale(mapCoordTransform, 1, -1);
var mapCoordTransform = _ol_transform_.create();
_ol_transform_.translate(mapCoordTransform, -1, -1);
_ol_transform_.scale(mapCoordTransform, 2 / mapSize[0], 2 / mapSize[1]);
_ol_transform_.translate(mapCoordTransform, 0, mapSize[1]);
_ol_transform_.scale(mapCoordTransform, 1, -1);
// the second matrix is the inverse of the projection matrix used in the
// shader for drawing
var projectionMatrixInv = ol.transform.invert(this.projectionMatrix.slice());
var projectionMatrixInv = _ol_transform_.invert(this.projectionMatrix.slice());
// the third matrix scales to the image dimensions and flips the y-axis again
var transform = ol.transform.create();
ol.transform.translate(transform, 0, imageSize[1]);
ol.transform.scale(transform, 1, -1);
ol.transform.scale(transform, imageSize[0] / 2, imageSize[1] / 2);
ol.transform.translate(transform, 1, 1);
var transform = _ol_transform_.create();
_ol_transform_.translate(transform, 0, imageSize[1]);
_ol_transform_.scale(transform, 1, -1);
_ol_transform_.scale(transform, imageSize[0] / 2, imageSize[1] / 2);
_ol_transform_.translate(transform, 1, 1);
ol.transform.multiply(transform, projectionMatrixInv);
ol.transform.multiply(transform, mapCoordTransform);
_ol_transform_.multiply(transform, projectionMatrixInv);
_ol_transform_.multiply(transform, mapCoordTransform);
return transform;
};
export default _ol_renderer_webgl_ImageLayer_;
src/ol/renderer/webgl/Layer.js
+52 -50
View File
@@ -1,18 +1,18 @@
goog.provide('ol.renderer.webgl.Layer');
goog.require('ol');
goog.require('ol.render.Event');
goog.require('ol.render.EventType');
goog.require('ol.render.webgl.Immediate');
goog.require('ol.renderer.Layer');
goog.require('ol.renderer.webgl.defaultmapshader');
goog.require('ol.renderer.webgl.defaultmapshader.Locations');
goog.require('ol.transform');
goog.require('ol.vec.Mat4');
goog.require('ol.webgl');
goog.require('ol.webgl.Buffer');
goog.require('ol.webgl.Context');
/**
* @module ol/renderer/webgl/Layer
*/
import _ol_ from '../../index.js';
import _ol_render_Event_ from '../../render/Event.js';
import _ol_render_EventType_ from '../../render/EventType.js';
import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
import _ol_renderer_Layer_ from '../Layer.js';
import _ol_renderer_webgl_defaultmapshader_ from '../webgl/defaultmapshader.js';
import _ol_renderer_webgl_defaultmapshader_Locations_ from '../webgl/defaultmapshader/Locations.js';
import _ol_transform_ from '../../transform.js';
import _ol_vec_Mat4_ from '../../vec/Mat4.js';
import _ol_webgl_ from '../../webgl.js';
import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
import _ol_webgl_Context_ from '../../webgl/Context.js';
/**
* @constructor
@@ -21,9 +21,9 @@ goog.require('ol.webgl.Context');
* @param {ol.renderer.webgl.Map} mapRenderer Map renderer.
* @param {ol.layer.Layer} layer Layer.
*/
ol.renderer.webgl.Layer = function(mapRenderer, layer) {
var _ol_renderer_webgl_Layer_ = function(mapRenderer, layer) {
ol.renderer.Layer.call(this, layer);
_ol_renderer_Layer_.call(this, layer);
/**
* @protected
@@ -35,7 +35,7 @@ ol.renderer.webgl.Layer = function(mapRenderer, layer) {
* @private
* @type {ol.webgl.Buffer}
*/
this.arrayBuffer_ = new ol.webgl.Buffer([
this.arrayBuffer_ = new _ol_webgl_Buffer_([
-1, -1, 0, 0,
1, -1, 1, 0,
-1, 1, 0, 1,
@@ -64,19 +64,19 @@ ol.renderer.webgl.Layer = function(mapRenderer, layer) {
* @protected
* @type {ol.Transform}
*/
this.texCoordMatrix = ol.transform.create();
this.texCoordMatrix = _ol_transform_.create();
/**
* @protected
* @type {ol.Transform}
*/
this.projectionMatrix = ol.transform.create();
this.projectionMatrix = _ol_transform_.create();
/**
* @type {Array.<number>}
* @private
*/
this.tmpMat4_ = ol.vec.Mat4.create();
this.tmpMat4_ = _ol_vec_Mat4_.create();
/**
* @private
@@ -85,7 +85,8 @@ ol.renderer.webgl.Layer = function(mapRenderer, layer) {
this.defaultLocations_ = null;
};
ol.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer);
_ol_.inherits(_ol_renderer_webgl_Layer_, _ol_renderer_Layer_);
/**
@@ -93,7 +94,7 @@ ol.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer);
* @param {number} framebufferDimension Framebuffer dimension.
* @protected
*/
ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebufferDimension) {
_ol_renderer_webgl_Layer_.prototype.bindFramebuffer = function(frameState, framebufferDimension) {
var gl = this.mapRenderer.getGL();
@@ -115,20 +116,20 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebu
/** @type {ol.PostRenderFunction} */ (postRenderFunction)
);
var texture = ol.webgl.Context.createEmptyTexture(
var texture = _ol_webgl_Context_.createEmptyTexture(
gl, framebufferDimension, framebufferDimension);
var framebuffer = gl.createFramebuffer();
gl.bindFramebuffer(ol.webgl.FRAMEBUFFER, framebuffer);
gl.framebufferTexture2D(ol.webgl.FRAMEBUFFER,
ol.webgl.COLOR_ATTACHMENT0, ol.webgl.TEXTURE_2D, texture, 0);
gl.bindFramebuffer(_ol_webgl_.FRAMEBUFFER, framebuffer);
gl.framebufferTexture2D(_ol_webgl_.FRAMEBUFFER,
_ol_webgl_.COLOR_ATTACHMENT0, _ol_webgl_.TEXTURE_2D, texture, 0);
this.texture = texture;
this.framebuffer = framebuffer;
this.framebufferDimension = framebufferDimension;
} else {
gl.bindFramebuffer(ol.webgl.FRAMEBUFFER, this.framebuffer);
gl.bindFramebuffer(_ol_webgl_.FRAMEBUFFER, this.framebuffer);
}
};
@@ -139,23 +140,23 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebu
* @param {ol.LayerState} layerState Layer state.
* @param {ol.webgl.Context} context Context.
*/
ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState, context) {
_ol_renderer_webgl_Layer_.prototype.composeFrame = function(frameState, layerState, context) {
this.dispatchComposeEvent_(
ol.render.EventType.PRECOMPOSE, context, frameState);
_ol_render_EventType_.PRECOMPOSE, context, frameState);
context.bindBuffer(ol.webgl.ARRAY_BUFFER, this.arrayBuffer_);
context.bindBuffer(_ol_webgl_.ARRAY_BUFFER, this.arrayBuffer_);
var gl = context.getGL();
var fragmentShader = ol.renderer.webgl.defaultmapshader.fragment;
var vertexShader = ol.renderer.webgl.defaultmapshader.vertex;
var fragmentShader = _ol_renderer_webgl_defaultmapshader_.fragment;
var vertexShader = _ol_renderer_webgl_defaultmapshader_.vertex;
var program = context.getProgram(fragmentShader, vertexShader);
var locations;
if (!this.defaultLocations_) {
locations = new ol.renderer.webgl.defaultmapshader.Locations(gl, program);
locations = new _ol_renderer_webgl_defaultmapshader_Locations_(gl, program);
this.defaultLocations_ = locations;
} else {
locations = this.defaultLocations_;
@@ -164,23 +165,23 @@ ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState
if (context.useProgram(program)) {
gl.enableVertexAttribArray(locations.a_position);
gl.vertexAttribPointer(
locations.a_position, 2, ol.webgl.FLOAT, false, 16, 0);
locations.a_position, 2, _ol_webgl_.FLOAT, false, 16, 0);
gl.enableVertexAttribArray(locations.a_texCoord);
gl.vertexAttribPointer(
locations.a_texCoord, 2, ol.webgl.FLOAT, false, 16, 8);
locations.a_texCoord, 2, _ol_webgl_.FLOAT, false, 16, 8);
gl.uniform1i(locations.u_texture, 0);
}
gl.uniformMatrix4fv(locations.u_texCoordMatrix, false,
ol.vec.Mat4.fromTransform(this.tmpMat4_, this.getTexCoordMatrix()));
_ol_vec_Mat4_.fromTransform(this.tmpMat4_, this.getTexCoordMatrix()));
gl.uniformMatrix4fv(locations.u_projectionMatrix, false,
ol.vec.Mat4.fromTransform(this.tmpMat4_, this.getProjectionMatrix()));
_ol_vec_Mat4_.fromTransform(this.tmpMat4_, this.getProjectionMatrix()));
gl.uniform1f(locations.u_opacity, layerState.opacity);
gl.bindTexture(ol.webgl.TEXTURE_2D, this.getTexture());
gl.drawArrays(ol.webgl.TRIANGLE_STRIP, 0, 4);
gl.bindTexture(_ol_webgl_.TEXTURE_2D, this.getTexture());
gl.drawArrays(_ol_webgl_.TRIANGLE_STRIP, 0, 4);
this.dispatchComposeEvent_(
ol.render.EventType.POSTCOMPOSE, context, frameState);
_ol_render_EventType_.POSTCOMPOSE, context, frameState);
};
@@ -191,7 +192,7 @@ ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState
* @param {olx.FrameState} frameState Frame state.
* @private
*/
ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ = function(type, context, frameState) {
_ol_renderer_webgl_Layer_.prototype.dispatchComposeEvent_ = function(type, context, frameState) {
var layer = this.getLayer();
if (layer.hasListener(type)) {
var viewState = frameState.viewState;
@@ -202,9 +203,9 @@ ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ = function(type, context
var rotation = viewState.rotation;
var size = frameState.size;
var render = new ol.render.webgl.Immediate(
var render = new _ol_render_webgl_Immediate_(
context, center, resolution, rotation, size, extent, pixelRatio);
var composeEvent = new ol.render.Event(
var composeEvent = new _ol_render_Event_(
type, render, frameState, null, context);
layer.dispatchEvent(composeEvent);
}
@@ -214,7 +215,7 @@ ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ = function(type, context
/**
* @return {!ol.Transform} Matrix.
*/
ol.renderer.webgl.Layer.prototype.getTexCoordMatrix = function() {
_ol_renderer_webgl_Layer_.prototype.getTexCoordMatrix = function() {
return this.texCoordMatrix;
};
@@ -222,7 +223,7 @@ ol.renderer.webgl.Layer.prototype.getTexCoordMatrix = function() {
/**
* @return {WebGLTexture} Texture.
*/
ol.renderer.webgl.Layer.prototype.getTexture = function() {
_ol_renderer_webgl_Layer_.prototype.getTexture = function() {
return this.texture;
};
@@ -230,7 +231,7 @@ ol.renderer.webgl.Layer.prototype.getTexture = function() {
/**
* @return {!ol.Transform} Matrix.
*/
ol.renderer.webgl.Layer.prototype.getProjectionMatrix = function() {
_ol_renderer_webgl_Layer_.prototype.getProjectionMatrix = function() {
return this.projectionMatrix;
};
@@ -238,7 +239,7 @@ ol.renderer.webgl.Layer.prototype.getProjectionMatrix = function() {
/**
* Handle webglcontextlost.
*/
ol.renderer.webgl.Layer.prototype.handleWebGLContextLost = function() {
_ol_renderer_webgl_Layer_.prototype.handleWebGLContextLost = function() {
this.texture = null;
this.framebuffer = null;
this.framebufferDimension = undefined;
@@ -252,7 +253,7 @@ ol.renderer.webgl.Layer.prototype.handleWebGLContextLost = function() {
* @param {ol.webgl.Context} context Context.
* @return {boolean} whether composeFrame should be called.
*/
ol.renderer.webgl.Layer.prototype.prepareFrame = function(frameState, layerState, context) {};
_ol_renderer_webgl_Layer_.prototype.prepareFrame = function(frameState, layerState, context) {};
/**
@@ -265,4 +266,5 @@ ol.renderer.webgl.Layer.prototype.prepareFrame = function(frameState, layerState
* @return {T|undefined} Callback result.
* @template S,T,U
*/
ol.renderer.webgl.Layer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {};
_ol_renderer_webgl_Layer_.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {};
export default _ol_renderer_webgl_Layer_;
src/ol/renderer/webgl/Map.js
+95 -93
View File
@@ -1,26 +1,26 @@
/**
* @module ol/renderer/webgl/Map
*/
// FIXME check against gl.getParameter(webgl.MAX_TEXTURE_SIZE)
goog.provide('ol.renderer.webgl.Map');
goog.require('ol');
goog.require('ol.array');
goog.require('ol.css');
goog.require('ol.dom');
goog.require('ol.events');
goog.require('ol.has');
goog.require('ol.layer.Layer');
goog.require('ol.render.Event');
goog.require('ol.render.EventType');
goog.require('ol.render.webgl.Immediate');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.Type');
goog.require('ol.source.State');
goog.require('ol.structs.LRUCache');
goog.require('ol.structs.PriorityQueue');
goog.require('ol.webgl');
goog.require('ol.webgl.Context');
goog.require('ol.webgl.ContextEventType');
import _ol_ from '../../index.js';
import _ol_array_ from '../../array.js';
import _ol_css_ from '../../css.js';
import _ol_dom_ from '../../dom.js';
import _ol_events_ from '../../events.js';
import _ol_has_ from '../../has.js';
import _ol_layer_Layer_ from '../../layer/Layer.js';
import _ol_render_Event_ from '../../render/Event.js';
import _ol_render_EventType_ from '../../render/EventType.js';
import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
import _ol_renderer_Map_ from '../Map.js';
import _ol_renderer_Type_ from '../Type.js';
import _ol_source_State_ from '../../source/State.js';
import _ol_structs_LRUCache_ from '../../structs/LRUCache.js';
import _ol_structs_PriorityQueue_ from '../../structs/PriorityQueue.js';
import _ol_webgl_ from '../../webgl.js';
import _ol_webgl_Context_ from '../../webgl/Context.js';
import _ol_webgl_ContextEventType_ from '../../webgl/ContextEventType.js';
/**
* @constructor
@@ -29,8 +29,8 @@ goog.require('ol.webgl.ContextEventType');
* @param {ol.PluggableMap} map Map.
* @api
*/
ol.renderer.webgl.Map = function(container, map) {
ol.renderer.Map.call(this, container, map);
var _ol_renderer_webgl_Map_ = function(container, map) {
_ol_renderer_Map_.call(this, container, map);
/**
* @private
@@ -41,7 +41,7 @@ ol.renderer.webgl.Map = function(container, map) {
this.canvas_.style.width = '100%';
this.canvas_.style.height = '100%';
this.canvas_.style.display = 'block';
this.canvas_.className = ol.css.CLASS_UNSELECTABLE;
this.canvas_.className = _ol_css_.CLASS_UNSELECTABLE;
container.insertBefore(this.canvas_, container.childNodes[0] || null);
/**
@@ -60,7 +60,7 @@ ol.renderer.webgl.Map = function(container, map) {
* @private
* @type {CanvasRenderingContext2D}
*/
this.clipTileContext_ = ol.dom.createCanvasContext2D();
this.clipTileContext_ = _ol_dom_.createCanvasContext2D();
/**
* @private
@@ -72,7 +72,7 @@ ol.renderer.webgl.Map = function(container, map) {
* @private
* @type {WebGLRenderingContext}
*/
this.gl_ = ol.webgl.getContext(this.canvas_, {
this.gl_ = _ol_webgl_.getContext(this.canvas_, {
antialias: true,
depth: true,
failIfMajorPerformanceCaveat: true,
@@ -84,18 +84,18 @@ ol.renderer.webgl.Map = function(container, map) {
* @private
* @type {ol.webgl.Context}
*/
this.context_ = new ol.webgl.Context(this.canvas_, this.gl_);
this.context_ = new _ol_webgl_Context_(this.canvas_, this.gl_);
ol.events.listen(this.canvas_, ol.webgl.ContextEventType.LOST,
_ol_events_.listen(this.canvas_, _ol_webgl_ContextEventType_.LOST,
this.handleWebGLContextLost, this);
ol.events.listen(this.canvas_, ol.webgl.ContextEventType.RESTORED,
_ol_events_.listen(this.canvas_, _ol_webgl_ContextEventType_.RESTORED,
this.handleWebGLContextRestored, this);
/**
* @private
* @type {ol.structs.LRUCache.<ol.WebglTextureCacheEntry|null>}
*/
this.textureCache_ = new ol.structs.LRUCache();
this.textureCache_ = new _ol_structs_LRUCache_();
/**
* @private
@@ -107,7 +107,7 @@ ol.renderer.webgl.Map = function(container, map) {
* @private
* @type {ol.structs.PriorityQueue.<Array>}
*/
this.tileTextureQueue_ = new ol.structs.PriorityQueue(
this.tileTextureQueue_ = new _ol_structs_PriorityQueue_(
/**
* @param {Array.<*>} element Element.
* @return {number} Priority.
@@ -145,7 +145,7 @@ ol.renderer.webgl.Map = function(container, map) {
var tileSize = /** @type {ol.Size} */ (element[3]);
var tileGutter = /** @type {number} */ (element[4]);
this.bindTileTexture(
tile, tileSize, tileGutter, ol.webgl.LINEAR, ol.webgl.LINEAR);
tile, tileSize, tileGutter, _ol_webgl_.LINEAR, _ol_webgl_.LINEAR);
}
return false;
}.bind(this);
@@ -159,7 +159,8 @@ ol.renderer.webgl.Map = function(container, map) {
this.initializeGL_();
};
ol.inherits(ol.renderer.webgl.Map, ol.renderer.Map);
_ol_.inherits(_ol_renderer_webgl_Map_, _ol_renderer_Map_);
/**
@@ -167,8 +168,8 @@ ol.inherits(ol.renderer.webgl.Map, ol.renderer.Map);
* @param {ol.renderer.Type} type The renderer type.
* @return {boolean} The renderer can render the layer.
*/
ol.renderer.webgl.Map['handles'] = function(type) {
return ol.has.WEBGL && type === ol.renderer.Type.WEBGL;
_ol_renderer_webgl_Map_['handles'] = function(type) {
return _ol_has_.WEBGL && type === _ol_renderer_Type_.WEBGL;
};
@@ -178,8 +179,8 @@ ol.renderer.webgl.Map['handles'] = function(type) {
* @param {ol.PluggableMap} map Map.
* @return {ol.renderer.webgl.Map} The map renderer.
*/
ol.renderer.webgl.Map['create'] = function(container, map) {
return new ol.renderer.webgl.Map(container, map);
_ol_renderer_webgl_Map_['create'] = function(container, map) {
return new _ol_renderer_webgl_Map_(container, map);
};
@@ -190,25 +191,25 @@ ol.renderer.webgl.Map['create'] = function(container, map) {
* @param {number} magFilter Mag filter.
* @param {number} minFilter Min filter.
*/
ol.renderer.webgl.Map.prototype.bindTileTexture = function(tile, tileSize, tileGutter, magFilter, minFilter) {
_ol_renderer_webgl_Map_.prototype.bindTileTexture = function(tile, tileSize, tileGutter, magFilter, minFilter) {
var gl = this.getGL();
var tileKey = tile.getKey();
if (this.textureCache_.containsKey(tileKey)) {
var textureCacheEntry = this.textureCache_.get(tileKey);
gl.bindTexture(ol.webgl.TEXTURE_2D, textureCacheEntry.texture);
gl.bindTexture(_ol_webgl_.TEXTURE_2D, textureCacheEntry.texture);
if (textureCacheEntry.magFilter != magFilter) {
gl.texParameteri(
ol.webgl.TEXTURE_2D, ol.webgl.TEXTURE_MAG_FILTER, magFilter);
_ol_webgl_.TEXTURE_2D, _ol_webgl_.TEXTURE_MAG_FILTER, magFilter);
textureCacheEntry.magFilter = magFilter;
}
if (textureCacheEntry.minFilter != minFilter) {
gl.texParameteri(
ol.webgl.TEXTURE_2D, ol.webgl.TEXTURE_MIN_FILTER, minFilter);
_ol_webgl_.TEXTURE_2D, _ol_webgl_.TEXTURE_MIN_FILTER, minFilter);
textureCacheEntry.minFilter = minFilter;
}
} else {
var texture = gl.createTexture();
gl.bindTexture(ol.webgl.TEXTURE_2D, texture);
gl.bindTexture(_ol_webgl_.TEXTURE_2D, texture);
if (tileGutter > 0) {
var clipTileCanvas = this.clipTileContext_.canvas;
var clipTileContext = this.clipTileContext_;
@@ -223,22 +224,22 @@ ol.renderer.webgl.Map.prototype.bindTileTexture = function(tile, tileSize, tileG
}
clipTileContext.drawImage(tile.getImage(), tileGutter, tileGutter,
tileSize[0], tileSize[1], 0, 0, tileSize[0], tileSize[1]);
gl.texImage2D(ol.webgl.TEXTURE_2D, 0,
ol.webgl.RGBA, ol.webgl.RGBA,
ol.webgl.UNSIGNED_BYTE, clipTileCanvas);
gl.texImage2D(_ol_webgl_.TEXTURE_2D, 0,
_ol_webgl_.RGBA, _ol_webgl_.RGBA,
_ol_webgl_.UNSIGNED_BYTE, clipTileCanvas);
} else {
gl.texImage2D(ol.webgl.TEXTURE_2D, 0,
ol.webgl.RGBA, ol.webgl.RGBA,
ol.webgl.UNSIGNED_BYTE, tile.getImage());
gl.texImage2D(_ol_webgl_.TEXTURE_2D, 0,
_ol_webgl_.RGBA, _ol_webgl_.RGBA,
_ol_webgl_.UNSIGNED_BYTE, tile.getImage());
}
gl.texParameteri(
ol.webgl.TEXTURE_2D, ol.webgl.TEXTURE_MAG_FILTER, magFilter);
_ol_webgl_.TEXTURE_2D, _ol_webgl_.TEXTURE_MAG_FILTER, magFilter);
gl.texParameteri(
ol.webgl.TEXTURE_2D, ol.webgl.TEXTURE_MIN_FILTER, minFilter);
gl.texParameteri(ol.webgl.TEXTURE_2D, ol.webgl.TEXTURE_WRAP_S,
ol.webgl.CLAMP_TO_EDGE);
gl.texParameteri(ol.webgl.TEXTURE_2D, ol.webgl.TEXTURE_WRAP_T,
ol.webgl.CLAMP_TO_EDGE);
_ol_webgl_.TEXTURE_2D, _ol_webgl_.TEXTURE_MIN_FILTER, minFilter);
gl.texParameteri(_ol_webgl_.TEXTURE_2D, _ol_webgl_.TEXTURE_WRAP_S,
_ol_webgl_.CLAMP_TO_EDGE);
gl.texParameteri(_ol_webgl_.TEXTURE_2D, _ol_webgl_.TEXTURE_WRAP_T,
_ol_webgl_.CLAMP_TO_EDGE);
this.textureCache_.set(tileKey, {
texture: texture,
magFilter: magFilter,
@@ -253,7 +254,7 @@ ol.renderer.webgl.Map.prototype.bindTileTexture = function(tile, tileSize, tileG
* @param {olx.FrameState} frameState Frame state.
* @private
*/
ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ = function(type, frameState) {
_ol_renderer_webgl_Map_.prototype.dispatchComposeEvent_ = function(type, frameState) {
var map = this.getMap();
if (map.hasListener(type)) {
var context = this.context_;
@@ -267,9 +268,9 @@ ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ = function(type, frameStat
var center = viewState.center;
var rotation = viewState.rotation;
var vectorContext = new ol.render.webgl.Immediate(context,
var vectorContext = new _ol_render_webgl_Immediate_(context,
center, resolution, rotation, size, extent, pixelRatio);
var composeEvent = new ol.render.Event(type, vectorContext,
var composeEvent = new _ol_render_Event_(type, vectorContext,
frameState, null, context);
map.dispatchEvent(composeEvent);
}
@@ -279,7 +280,7 @@ ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ = function(type, frameStat
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.disposeInternal = function() {
_ol_renderer_webgl_Map_.prototype.disposeInternal = function() {
var gl = this.getGL();
if (!gl.isContextLost()) {
this.textureCache_.forEach(
@@ -294,7 +295,7 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() {
});
}
this.context_.dispose();
ol.renderer.Map.prototype.disposeInternal.call(this);
_ol_renderer_Map_.prototype.disposeInternal.call(this);
};
@@ -303,11 +304,11 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() {
* @param {olx.FrameState} frameState Frame state.
* @private
*/
ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) {
_ol_renderer_webgl_Map_.prototype.expireCache_ = function(map, frameState) {
var gl = this.getGL();
var textureCacheEntry;
while (this.textureCache_.getCount() - this.textureCacheFrameMarkerCount_ >
ol.WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK) {
_ol_.WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK) {
textureCacheEntry = this.textureCache_.peekLast();
if (!textureCacheEntry) {
if (+this.textureCache_.peekLastKey() == frameState.index) {
@@ -326,7 +327,7 @@ ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) {
/**
* @return {ol.webgl.Context} The context.
*/
ol.renderer.webgl.Map.prototype.getContext = function() {
_ol_renderer_webgl_Map_.prototype.getContext = function() {
return this.context_;
};
@@ -334,7 +335,7 @@ ol.renderer.webgl.Map.prototype.getContext = function() {
/**
* @return {WebGLRenderingContext} GL.
*/
ol.renderer.webgl.Map.prototype.getGL = function() {
_ol_renderer_webgl_Map_.prototype.getGL = function() {
return this.gl_;
};
@@ -342,7 +343,7 @@ ol.renderer.webgl.Map.prototype.getGL = function() {
/**
* @return {ol.structs.PriorityQueue.<Array>} Tile texture queue.
*/
ol.renderer.webgl.Map.prototype.getTileTextureQueue = function() {
_ol_renderer_webgl_Map_.prototype.getTileTextureQueue = function() {
return this.tileTextureQueue_;
};
@@ -350,8 +351,8 @@ ol.renderer.webgl.Map.prototype.getTileTextureQueue = function() {
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.getType = function() {
return ol.renderer.Type.WEBGL;
_ol_renderer_webgl_Map_.prototype.getType = function() {
return _ol_renderer_Type_.WEBGL;
};
@@ -359,7 +360,7 @@ ol.renderer.webgl.Map.prototype.getType = function() {
* @param {ol.events.Event} event Event.
* @protected
*/
ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
_ol_renderer_webgl_Map_.prototype.handleWebGLContextLost = function(event) {
event.preventDefault();
this.textureCache_.clear();
this.textureCacheFrameMarkerCount_ = 0;
@@ -375,7 +376,7 @@ ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
/**
* @protected
*/
ol.renderer.webgl.Map.prototype.handleWebGLContextRestored = function() {
_ol_renderer_webgl_Map_.prototype.handleWebGLContextRestored = function() {
this.initializeGL_();
this.getMap().render();
};
@@ -384,16 +385,16 @@ ol.renderer.webgl.Map.prototype.handleWebGLContextRestored = function() {
/**
* @private
*/
ol.renderer.webgl.Map.prototype.initializeGL_ = function() {
_ol_renderer_webgl_Map_.prototype.initializeGL_ = function() {
var gl = this.gl_;
gl.activeTexture(ol.webgl.TEXTURE0);
gl.activeTexture(_ol_webgl_.TEXTURE0);
gl.blendFuncSeparate(
ol.webgl.SRC_ALPHA, ol.webgl.ONE_MINUS_SRC_ALPHA,
ol.webgl.ONE, ol.webgl.ONE_MINUS_SRC_ALPHA);
gl.disable(ol.webgl.CULL_FACE);
gl.disable(ol.webgl.DEPTH_TEST);
gl.disable(ol.webgl.SCISSOR_TEST);
gl.disable(ol.webgl.STENCIL_TEST);
_ol_webgl_.SRC_ALPHA, _ol_webgl_.ONE_MINUS_SRC_ALPHA,
_ol_webgl_.ONE, _ol_webgl_.ONE_MINUS_SRC_ALPHA);
gl.disable(_ol_webgl_.CULL_FACE);
gl.disable(_ol_webgl_.DEPTH_TEST);
gl.disable(_ol_webgl_.SCISSOR_TEST);
gl.disable(_ol_webgl_.STENCIL_TEST);
};
@@ -401,7 +402,7 @@ ol.renderer.webgl.Map.prototype.initializeGL_ = function() {
* @param {ol.Tile} tile Tile.
* @return {boolean} Is tile texture loaded.
*/
ol.renderer.webgl.Map.prototype.isTileTextureLoaded = function(tile) {
_ol_renderer_webgl_Map_.prototype.isTileTextureLoaded = function(tile) {
return this.textureCache_.containsKey(tile.getKey());
};
@@ -409,7 +410,7 @@ ol.renderer.webgl.Map.prototype.isTileTextureLoaded = function(tile) {
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
_ol_renderer_webgl_Map_.prototype.renderFrame = function(frameState) {
var context = this.getContext();
var gl = this.getGL();
@@ -431,19 +432,19 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
this.textureCache_.set((-frameState.index).toString(), null);
++this.textureCacheFrameMarkerCount_;
this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, frameState);
this.dispatchComposeEvent_(_ol_render_EventType_.PRECOMPOSE, frameState);
/** @type {Array.<ol.LayerState>} */
var layerStatesToDraw = [];
var layerStatesArray = frameState.layerStatesArray;
ol.array.stableSort(layerStatesArray, ol.renderer.Map.sortByZIndex);
_ol_array_.stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
var viewResolution = frameState.viewState.resolution;
var i, ii, layerRenderer, layerState;
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
layerState = layerStatesArray[i];
if (ol.layer.Layer.visibleAtResolution(layerState, viewResolution) &&
layerState.sourceState == ol.source.State.READY) {
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewResolution) &&
layerState.sourceState == _ol_source_State_.READY) {
layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layerState.layer));
if (layerRenderer.prepareFrame(frameState, layerState, context)) {
layerStatesToDraw.push(layerState);
@@ -458,11 +459,11 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
this.canvas_.height = height;
}
gl.bindFramebuffer(ol.webgl.FRAMEBUFFER, null);
gl.bindFramebuffer(_ol_webgl_.FRAMEBUFFER, null);
gl.clearColor(0, 0, 0, 0);
gl.clear(ol.webgl.COLOR_BUFFER_BIT);
gl.enable(ol.webgl.BLEND);
gl.clear(_ol_webgl_.COLOR_BUFFER_BIT);
gl.enable(_ol_webgl_.BLEND);
gl.viewport(0, 0, this.canvas_.width, this.canvas_.height);
for (i = 0, ii = layerStatesToDraw.length; i < ii; ++i) {
@@ -479,7 +480,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
this.calculateMatrices2D(frameState);
if (this.textureCache_.getCount() - this.textureCacheFrameMarkerCount_ >
ol.WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK) {
_ol_.WEBGL_TEXTURE_CACHE_HIGH_WATER_MARK) {
frameState.postRenderFunctions.push(
/** @type {ol.PostRenderFunction} */ (this.expireCache_.bind(this))
);
@@ -490,7 +491,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
frameState.animate = true;
}
this.dispatchComposeEvent_(ol.render.EventType.POSTCOMPOSE, frameState);
this.dispatchComposeEvent_(_ol_render_EventType_.POSTCOMPOSE, frameState);
this.scheduleRemoveUnusedLayerRenderers(frameState);
this.scheduleExpireIconCache(frameState);
@@ -501,7 +502,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg,
_ol_renderer_webgl_Map_.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg,
layerFilter, thisArg2) {
var result;
@@ -517,7 +518,7 @@ ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate = function(coordinate
for (i = numLayers - 1; i >= 0; --i) {
var layerState = layerStates[i];
var layer = layerState.layer;
if (ol.layer.Layer.visibleAtResolution(layerState, viewState.resolution) &&
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewState.resolution) &&
layerFilter.call(thisArg2, layer)) {
var layerRenderer = this.getLayerRenderer(layer);
result = layerRenderer.forEachFeatureAtCoordinate(
@@ -534,7 +535,7 @@ ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate = function(coordinate
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, layerFilter, thisArg) {
_ol_renderer_webgl_Map_.prototype.hasFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, layerFilter, thisArg) {
var hasFeature = false;
if (this.getGL().isContextLost()) {
@@ -549,7 +550,7 @@ ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate = function(coordinate, fr
for (i = numLayers - 1; i >= 0; --i) {
var layerState = layerStates[i];
var layer = layerState.layer;
if (ol.layer.Layer.visibleAtResolution(layerState, viewState.resolution) &&
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewState.resolution) &&
layerFilter.call(thisArg, layer)) {
var layerRenderer = this.getLayerRenderer(layer);
hasFeature =
@@ -566,7 +567,7 @@ ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate = function(coordinate, fr
/**
* @inheritDoc
*/
ol.renderer.webgl.Map.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg,
_ol_renderer_webgl_Map_.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg,
layerFilter, thisArg2) {
if (this.getGL().isContextLost()) {
return false;
@@ -581,7 +582,7 @@ ol.renderer.webgl.Map.prototype.forEachLayerAtPixel = function(pixel, frameState
for (i = numLayers - 1; i >= 0; --i) {
var layerState = layerStates[i];
var layer = layerState.layer;
if (ol.layer.Layer.visibleAtResolution(layerState, viewState.resolution) &&
if (_ol_layer_Layer_.visibleAtResolution(layerState, viewState.resolution) &&
layerFilter.call(thisArg, layer)) {
var layerRenderer = /** @type {ol.renderer.webgl.Layer} */ (this.getLayerRenderer(layer));
result = layerRenderer.forEachLayerAtPixel(
@@ -593,3 +594,4 @@ ol.renderer.webgl.Map.prototype.forEachLayerAtPixel = function(pixel, frameState
}
return undefined;
};
export default _ol_renderer_webgl_Map_;
src/ol/renderer/webgl/TileLayer.js
+64 -62
View File
@@ -1,24 +1,24 @@
/**
* @module ol/renderer/webgl/TileLayer
*/
// FIXME large resolutions lead to too large framebuffers :-(
// FIXME animated shaders! check in redraw
goog.provide('ol.renderer.webgl.TileLayer');
goog.require('ol');
goog.require('ol.LayerType');
goog.require('ol.TileRange');
goog.require('ol.TileState');
goog.require('ol.array');
goog.require('ol.extent');
goog.require('ol.math');
goog.require('ol.renderer.Type');
goog.require('ol.renderer.webgl.Layer');
goog.require('ol.renderer.webgl.tilelayershader');
goog.require('ol.renderer.webgl.tilelayershader.Locations');
goog.require('ol.size');
goog.require('ol.transform');
goog.require('ol.webgl');
goog.require('ol.webgl.Buffer');
import _ol_ from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js';
import _ol_TileRange_ from '../../TileRange.js';
import _ol_TileState_ from '../../TileState.js';
import _ol_array_ from '../../array.js';
import _ol_extent_ from '../../extent.js';
import _ol_math_ from '../../math.js';
import _ol_renderer_Type_ from '../Type.js';
import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js';
import _ol_renderer_webgl_tilelayershader_ from '../webgl/tilelayershader.js';
import _ol_renderer_webgl_tilelayershader_Locations_ from '../webgl/tilelayershader/Locations.js';
import _ol_size_ from '../../size.js';
import _ol_transform_ from '../../transform.js';
import _ol_webgl_ from '../../webgl.js';
import _ol_webgl_Buffer_ from '../../webgl/Buffer.js';
/**
* @constructor
@@ -27,21 +27,21 @@ goog.require('ol.webgl.Buffer');
* @param {ol.layer.Tile} tileLayer Tile layer.
* @api
*/
ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
var _ol_renderer_webgl_TileLayer_ = function(mapRenderer, tileLayer) {
ol.renderer.webgl.Layer.call(this, mapRenderer, tileLayer);
_ol_renderer_webgl_Layer_.call(this, mapRenderer, tileLayer);
/**
* @private
* @type {ol.webgl.Fragment}
*/
this.fragmentShader_ = ol.renderer.webgl.tilelayershader.fragment;
this.fragmentShader_ = _ol_renderer_webgl_tilelayershader_.fragment;
/**
* @private
* @type {ol.webgl.Vertex}
*/
this.vertexShader_ = ol.renderer.webgl.tilelayershader.vertex;
this.vertexShader_ = _ol_renderer_webgl_tilelayershader_.vertex;
/**
* @private
@@ -53,7 +53,7 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
* @private
* @type {ol.webgl.Buffer}
*/
this.renderArrayBuffer_ = new ol.webgl.Buffer([
this.renderArrayBuffer_ = new _ol_webgl_Buffer_([
0, 0, 0, 1,
1, 0, 1, 1,
0, 1, 0, 0,
@@ -85,7 +85,8 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
this.tmpSize_ = [0, 0];
};
ol.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer);
_ol_.inherits(_ol_renderer_webgl_TileLayer_, _ol_renderer_webgl_Layer_);
/**
@@ -94,8 +95,8 @@ ol.inherits(ol.renderer.webgl.TileLayer, ol.renderer.webgl.Layer);
* @param {ol.layer.Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
ol.renderer.webgl.TileLayer['handles'] = function(type, layer) {
return type === ol.renderer.Type.WEBGL && layer.getType() === ol.LayerType.TILE;
_ol_renderer_webgl_TileLayer_['handles'] = function(type, layer) {
return type === _ol_renderer_Type_.WEBGL && layer.getType() === _ol_LayerType_.TILE;
};
@@ -105,8 +106,8 @@ ol.renderer.webgl.TileLayer['handles'] = function(type, layer) {
* @param {ol.layer.Layer} layer The layer to be rendererd.
* @return {ol.renderer.webgl.TileLayer} The layer renderer.
*/
ol.renderer.webgl.TileLayer['create'] = function(mapRenderer, layer) {
return new ol.renderer.webgl.TileLayer(
_ol_renderer_webgl_TileLayer_['create'] = function(mapRenderer, layer) {
return new _ol_renderer_webgl_TileLayer_(
/** @type {ol.renderer.webgl.Map} */ (mapRenderer),
/** @type {ol.layer.Tile} */ (layer)
);
@@ -116,17 +117,17 @@ ol.renderer.webgl.TileLayer['create'] = function(mapRenderer, layer) {
/**
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() {
_ol_renderer_webgl_TileLayer_.prototype.disposeInternal = function() {
var context = this.mapRenderer.getContext();
context.deleteBuffer(this.renderArrayBuffer_);
ol.renderer.webgl.Layer.prototype.disposeInternal.call(this);
_ol_renderer_webgl_Layer_.prototype.disposeInternal.call(this);
};
/**
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = function(source, projection, tiles) {
_ol_renderer_webgl_TileLayer_.prototype.createLoadedTileFinder = function(source, projection, tiles) {
var mapRenderer = this.mapRenderer;
return (
@@ -154,8 +155,8 @@ ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = function(source,
/**
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
ol.renderer.webgl.Layer.prototype.handleWebGLContextLost.call(this);
_ol_renderer_webgl_TileLayer_.prototype.handleWebGLContextLost = function() {
_ol_renderer_webgl_Layer_.prototype.handleWebGLContextLost.call(this);
this.locations_ = null;
};
@@ -163,7 +164,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
/**
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerState, context) {
_ol_renderer_webgl_TileLayer_.prototype.prepareFrame = function(frameState, layerState, context) {
var mapRenderer = this.mapRenderer;
var gl = context.getGL();
@@ -180,7 +181,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
var tilePixelSize =
tileSource.getTilePixelSize(z, frameState.pixelRatio, projection);
var pixelRatio = tilePixelSize[0] /
ol.size.toSize(tileGrid.getTileSize(z), this.tmpSize_)[0];
_ol_size_.toSize(tileGrid.getTileSize(z), this.tmpSize_)[0];
var tilePixelResolution = tileResolution / pixelRatio;
var tileGutter = tileSource.getTilePixelRatio(pixelRatio) * tileSource.getGutter(projection);
@@ -200,7 +201,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
var maxDimension = Math.max(
tileRangeSize[0] * tilePixelSize[0],
tileRangeSize[1] * tilePixelSize[1]);
var framebufferDimension = ol.math.roundUpToPowerOfTwo(maxDimension);
var framebufferDimension = _ol_math_.roundUpToPowerOfTwo(maxDimension);
var framebufferExtentDimension = tilePixelResolution * framebufferDimension;
var origin = tileGrid.getOrigin(z);
var minX = origin[0] +
@@ -216,22 +217,22 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
gl.viewport(0, 0, framebufferDimension, framebufferDimension);
gl.clearColor(0, 0, 0, 0);
gl.clear(ol.webgl.COLOR_BUFFER_BIT);
gl.disable(ol.webgl.BLEND);
gl.clear(_ol_webgl_.COLOR_BUFFER_BIT);
gl.disable(_ol_webgl_.BLEND);
var program = context.getProgram(this.fragmentShader_, this.vertexShader_);
context.useProgram(program);
if (!this.locations_) {
this.locations_ = new ol.renderer.webgl.tilelayershader.Locations(gl, program);
this.locations_ = new _ol_renderer_webgl_tilelayershader_Locations_(gl, program);
}
context.bindBuffer(ol.webgl.ARRAY_BUFFER, this.renderArrayBuffer_);
context.bindBuffer(_ol_webgl_.ARRAY_BUFFER, this.renderArrayBuffer_);
gl.enableVertexAttribArray(this.locations_.a_position);
gl.vertexAttribPointer(
this.locations_.a_position, 2, ol.webgl.FLOAT, false, 16, 0);
this.locations_.a_position, 2, _ol_webgl_.FLOAT, false, 16, 0);
gl.enableVertexAttribArray(this.locations_.a_texCoord);
gl.vertexAttribPointer(
this.locations_.a_texCoord, 2, ol.webgl.FLOAT, false, 16, 8);
this.locations_.a_texCoord, 2, _ol_webgl_.FLOAT, false, 16, 8);
gl.uniform1i(this.locations_.u_texture, 0);
/**
@@ -245,8 +246,8 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
var useInterimTilesOnError = tileLayer.getUseInterimTilesOnError();
var allTilesLoaded = true;
var tmpExtent = ol.extent.createEmpty();
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
var tmpExtent = _ol_extent_.createEmpty();
var tmpTileRange = new _ol_TileRange_(0, 0, 0, 0);
var childTileRange, drawable, fullyLoaded, tile, tileState;
var x, y, tileExtent;
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
@@ -256,25 +257,25 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
if (layerState.extent !== undefined) {
// ignore tiles outside layer extent
tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent);
if (!ol.extent.intersects(tileExtent, layerState.extent)) {
if (!_ol_extent_.intersects(tileExtent, layerState.extent)) {
continue;
}
}
tileState = tile.getState();
drawable = tileState == ol.TileState.LOADED ||
tileState == ol.TileState.EMPTY ||
tileState == ol.TileState.ERROR && !useInterimTilesOnError;
drawable = tileState == _ol_TileState_.LOADED ||
tileState == _ol_TileState_.EMPTY ||
tileState == _ol_TileState_.ERROR && !useInterimTilesOnError;
if (!drawable) {
tile = tile.getInterimTile();
}
tileState = tile.getState();
if (tileState == ol.TileState.LOADED) {
if (tileState == _ol_TileState_.LOADED) {
if (mapRenderer.isTileTextureLoaded(tile)) {
tilesToDrawByZ[z][tile.tileCoord.toString()] = tile;
continue;
}
} else if (tileState == ol.TileState.EMPTY ||
(tileState == ol.TileState.ERROR &&
} else if (tileState == _ol_TileState_.EMPTY ||
(tileState == _ol_TileState_.ERROR &&
!useInterimTilesOnError)) {
continue;
}
@@ -296,7 +297,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
/** @type {Array.<number>} */
var zs = Object.keys(tilesToDrawByZ).map(Number);
zs.sort(ol.array.numberSafeCompareFunction);
zs.sort(_ol_array_.numberSafeCompareFunction);
var u_tileOffset = new Float32Array(4);
var i, ii, tileKey, tilesToDraw;
for (i = 0, ii = zs.length; i < ii; ++i) {
@@ -314,8 +315,8 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
framebufferExtentDimension - 1;
gl.uniform4fv(this.locations_.u_tileOffset, u_tileOffset);
mapRenderer.bindTileTexture(tile, tilePixelSize,
tileGutter * pixelRatio, ol.webgl.LINEAR, ol.webgl.LINEAR);
gl.drawArrays(ol.webgl.TRIANGLE_STRIP, 0, 4);
tileGutter * pixelRatio, _ol_webgl_.LINEAR, _ol_webgl_.LINEAR);
gl.drawArrays(_ol_webgl_.TRIANGLE_STRIP, 0, 4);
}
}
@@ -341,7 +342,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
* @param {ol.Tile} tile Tile.
*/
function(tile) {
if (tile.getState() == ol.TileState.LOADED &&
if (tile.getState() == _ol_TileState_.LOADED &&
!mapRenderer.isTileTextureLoaded(tile) &&
!tileTextureQueue.isKeyQueued(tile.getKey())) {
tileTextureQueue.enqueue([
@@ -356,21 +357,21 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
this.updateLogos(frameState, tileSource);
var texCoordMatrix = this.texCoordMatrix;
ol.transform.reset(texCoordMatrix);
ol.transform.translate(texCoordMatrix,
_ol_transform_.reset(texCoordMatrix);
_ol_transform_.translate(texCoordMatrix,
(Math.round(center[0] / tileResolution) * tileResolution - framebufferExtent[0]) /
(framebufferExtent[2] - framebufferExtent[0]),
(Math.round(center[1] / tileResolution) * tileResolution - framebufferExtent[1]) /
(framebufferExtent[3] - framebufferExtent[1]));
if (viewState.rotation !== 0) {
ol.transform.rotate(texCoordMatrix, viewState.rotation);
_ol_transform_.rotate(texCoordMatrix, viewState.rotation);
}
ol.transform.scale(texCoordMatrix,
_ol_transform_.scale(texCoordMatrix,
frameState.size[0] * viewState.resolution /
(framebufferExtent[2] - framebufferExtent[0]),
frameState.size[1] * viewState.resolution /
(framebufferExtent[3] - framebufferExtent[1]));
ol.transform.translate(texCoordMatrix, -0.5, -0.5);
_ol_transform_.translate(texCoordMatrix, -0.5, -0.5);
return true;
};
@@ -379,7 +380,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
/**
* @inheritDoc
*/
ol.renderer.webgl.TileLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
_ol_renderer_webgl_TileLayer_.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
if (!this.framebuffer) {
return undefined;
}
@@ -388,7 +389,7 @@ ol.renderer.webgl.TileLayer.prototype.forEachLayerAtPixel = function(pixel, fram
pixel[0] / frameState.size[0],
(frameState.size[1] - pixel[1]) / frameState.size[1]];
var pixelOnFrameBufferScaled = ol.transform.apply(
var pixelOnFrameBufferScaled = _ol_transform_.apply(
this.texCoordMatrix, pixelOnMapScaled.slice());
var pixelOnFrameBuffer = [
pixelOnFrameBufferScaled[0] * this.framebufferDimension,
@@ -406,3 +407,4 @@ ol.renderer.webgl.TileLayer.prototype.forEachLayerAtPixel = function(pixel, fram
return undefined;
}
};
export default _ol_renderer_webgl_TileLayer_;
src/ol/renderer/webgl/VectorLayer.js
+44 -42
View File
@@ -1,15 +1,15 @@
goog.provide('ol.renderer.webgl.VectorLayer');
goog.require('ol');
goog.require('ol.LayerType');
goog.require('ol.ViewHint');
goog.require('ol.extent');
goog.require('ol.render.webgl.ReplayGroup');
goog.require('ol.renderer.Type');
goog.require('ol.renderer.vector');
goog.require('ol.renderer.webgl.Layer');
goog.require('ol.transform');
/**
* @module ol/renderer/webgl/VectorLayer
*/
import _ol_ from '../../index.js';
import _ol_LayerType_ from '../../LayerType.js';
import _ol_ViewHint_ from '../../ViewHint.js';
import _ol_extent_ from '../../extent.js';
import _ol_render_webgl_ReplayGroup_ from '../../render/webgl/ReplayGroup.js';
import _ol_renderer_Type_ from '../Type.js';
import _ol_renderer_vector_ from '../vector.js';
import _ol_renderer_webgl_Layer_ from '../webgl/Layer.js';
import _ol_transform_ from '../../transform.js';
/**
* @constructor
@@ -18,9 +18,9 @@ goog.require('ol.transform');
* @param {ol.layer.Vector} vectorLayer Vector layer.
* @api
*/
ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) {
var _ol_renderer_webgl_VectorLayer_ = function(mapRenderer, vectorLayer) {
ol.renderer.webgl.Layer.call(this, mapRenderer, vectorLayer);
_ol_renderer_webgl_Layer_.call(this, mapRenderer, vectorLayer);
/**
* @private
@@ -44,7 +44,7 @@ ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) {
* @private
* @type {ol.Extent}
*/
this.renderedExtent_ = ol.extent.createEmpty();
this.renderedExtent_ = _ol_extent_.createEmpty();
/**
* @private
@@ -66,7 +66,8 @@ ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) {
this.layerState_ = null;
};
ol.inherits(ol.renderer.webgl.VectorLayer, ol.renderer.webgl.Layer);
_ol_.inherits(_ol_renderer_webgl_VectorLayer_, _ol_renderer_webgl_Layer_);
/**
@@ -75,8 +76,8 @@ ol.inherits(ol.renderer.webgl.VectorLayer, ol.renderer.webgl.Layer);
* @param {ol.layer.Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
ol.renderer.webgl.VectorLayer['handles'] = function(type, layer) {
return type === ol.renderer.Type.WEBGL && layer.getType() === ol.LayerType.VECTOR;
_ol_renderer_webgl_VectorLayer_['handles'] = function(type, layer) {
return type === _ol_renderer_Type_.WEBGL && layer.getType() === _ol_LayerType_.VECTOR;
};
@@ -86,8 +87,8 @@ ol.renderer.webgl.VectorLayer['handles'] = function(type, layer) {
* @param {ol.layer.Layer} layer The layer to be rendererd.
* @return {ol.renderer.webgl.VectorLayer} The layer renderer.
*/
ol.renderer.webgl.VectorLayer['create'] = function(mapRenderer, layer) {
return new ol.renderer.webgl.VectorLayer(
_ol_renderer_webgl_VectorLayer_['create'] = function(mapRenderer, layer) {
return new _ol_renderer_webgl_VectorLayer_(
/** @type {ol.renderer.webgl.Map} */ (mapRenderer),
/** @type {ol.layer.Vector} */ (layer)
);
@@ -97,7 +98,7 @@ ol.renderer.webgl.VectorLayer['create'] = function(mapRenderer, layer) {
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.composeFrame = function(frameState, layerState, context) {
_ol_renderer_webgl_VectorLayer_.prototype.composeFrame = function(frameState, layerState, context) {
this.layerState_ = layerState;
var viewState = frameState.viewState;
var replayGroup = this.replayGroup_;
@@ -120,21 +121,21 @@ ol.renderer.webgl.VectorLayer.prototype.composeFrame = function(frameState, laye
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.disposeInternal = function() {
_ol_renderer_webgl_VectorLayer_.prototype.disposeInternal = function() {
var replayGroup = this.replayGroup_;
if (replayGroup) {
var context = this.mapRenderer.getContext();
replayGroup.getDeleteResourcesFunction(context)();
this.replayGroup_ = null;
}
ol.renderer.webgl.Layer.prototype.disposeInternal.call(this);
_ol_renderer_webgl_Layer_.prototype.disposeInternal.call(this);
};
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
_ol_renderer_webgl_VectorLayer_.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
if (!this.replayGroup_ || !this.layerState_) {
return undefined;
} else {
@@ -153,7 +154,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(co
* @return {?} Callback result.
*/
function(feature) {
var key = ol.getUid(feature).toString();
var key = _ol_.getUid(feature).toString();
if (!(key in features)) {
features[key] = true;
return callback.call(thisArg, feature, layer);
@@ -166,7 +167,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(co
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
_ol_renderer_webgl_VectorLayer_.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
if (!this.replayGroup_ || !this.layerState_) {
return false;
} else {
@@ -184,8 +185,8 @@ ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate = function(coordi
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
var coordinate = ol.transform.apply(
_ol_renderer_webgl_VectorLayer_.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
var coordinate = _ol_transform_.apply(
frameState.pixelToCoordinateTransform, pixel.slice());
var hasFeature = this.hasFeatureAtCoordinate(coordinate, frameState);
@@ -202,7 +203,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel = function(pixel, fr
* @param {ol.events.Event} event Image style change event.
* @private
*/
ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ = function(event) {
_ol_renderer_webgl_VectorLayer_.prototype.handleStyleImageChange_ = function(event) {
this.renderIfReadyAndVisible();
};
@@ -210,15 +211,15 @@ ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ = function(event
/**
* @inheritDoc
*/
ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, layerState, context) {
_ol_renderer_webgl_VectorLayer_.prototype.prepareFrame = function(frameState, layerState, context) {
var vectorLayer = /** @type {ol.layer.Vector} */ (this.getLayer());
var vectorSource = vectorLayer.getSource();
this.updateLogos(frameState, vectorSource);
var animating = frameState.viewHints[ol.ViewHint.ANIMATING];
var interacting = frameState.viewHints[ol.ViewHint.INTERACTING];
var animating = frameState.viewHints[_ol_ViewHint_.ANIMATING];
var interacting = frameState.viewHints[_ol_ViewHint_.INTERACTING];
var updateWhileAnimating = vectorLayer.getUpdateWhileAnimating();
var updateWhileInteracting = vectorLayer.getUpdateWhileInteracting();
@@ -237,17 +238,17 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, laye
var vectorLayerRenderOrder = vectorLayer.getRenderOrder();
if (vectorLayerRenderOrder === undefined) {
vectorLayerRenderOrder = ol.renderer.vector.defaultOrder;
vectorLayerRenderOrder = _ol_renderer_vector_.defaultOrder;
}
var extent = ol.extent.buffer(frameStateExtent,
var extent = _ol_extent_.buffer(frameStateExtent,
vectorLayerRenderBuffer * resolution);
if (!this.dirty_ &&
this.renderedResolution_ == resolution &&
this.renderedRevision_ == vectorLayerRevision &&
this.renderedRenderOrder_ == vectorLayerRenderOrder &&
ol.extent.containsExtent(this.renderedExtent_, extent)) {
_ol_extent_.containsExtent(this.renderedExtent_, extent)) {
return true;
}
@@ -258,8 +259,8 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, laye
this.dirty_ = false;
var replayGroup = new ol.render.webgl.ReplayGroup(
ol.renderer.vector.getTolerance(resolution, pixelRatio),
var replayGroup = new _ol_render_webgl_ReplayGroup_(
_ol_renderer_vector_.getTolerance(resolution, pixelRatio),
extent, vectorLayer.getRenderBuffer());
vectorSource.loadFeatures(extent, resolution, projection);
/**
@@ -319,23 +320,24 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, laye
* @param {ol.render.webgl.ReplayGroup} replayGroup Replay group.
* @return {boolean} `true` if an image is loading.
*/
ol.renderer.webgl.VectorLayer.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) {
_ol_renderer_webgl_VectorLayer_.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) {
if (!styles) {
return false;
}
var loading = false;
if (Array.isArray(styles)) {
for (var i = styles.length - 1, ii = 0; i >= ii; --i) {
loading = ol.renderer.vector.renderFeature(
loading = _ol_renderer_vector_.renderFeature(
replayGroup, feature, styles[i],
ol.renderer.vector.getSquaredTolerance(resolution, pixelRatio),
_ol_renderer_vector_.getSquaredTolerance(resolution, pixelRatio),
this.handleStyleImageChange_, this) || loading;
}
} else {
loading = ol.renderer.vector.renderFeature(
loading = _ol_renderer_vector_.renderFeature(
replayGroup, feature, styles,
ol.renderer.vector.getSquaredTolerance(resolution, pixelRatio),
_ol_renderer_vector_.getSquaredTolerance(resolution, pixelRatio),
this.handleStyleImageChange_, this) || loading;
}
return loading;
};
export default _ol_renderer_webgl_VectorLayer_;
src/ol/renderer/webgl/defaultmapshader.js
+10 -7
View File
@@ -1,15 +1,18 @@
/**
* @module ol/renderer/webgl/defaultmapshader
*/
// This file is automatically generated, do not edit
goog.provide('ol.renderer.webgl.defaultmapshader');
goog.require('ol');
goog.require('ol.webgl.Fragment');
goog.require('ol.webgl.Vertex');
import _ol_ from '../../index.js';
import _ol_webgl_Fragment_ from '../../webgl/Fragment.js';
import _ol_webgl_Vertex_ from '../../webgl/Vertex.js';
var _ol_renderer_webgl_defaultmapshader_ = {};
ol.renderer.webgl.defaultmapshader.fragment = new ol.webgl.Fragment(ol.DEBUG_WEBGL ?
_ol_renderer_webgl_defaultmapshader_.fragment = new _ol_webgl_Fragment_(_ol_.DEBUG_WEBGL ?
'precision mediump float;\nvarying vec2 v_texCoord;\n\n\nuniform float u_opacity;\nuniform sampler2D u_texture;\n\nvoid main(void) {\n vec4 texColor = texture2D(u_texture, v_texCoord);\n gl_FragColor.rgb = texColor.rgb;\n gl_FragColor.a = texColor.a * u_opacity;\n}\n' :
'precision mediump float;varying vec2 a;uniform float f;uniform sampler2D g;void main(void){vec4 texColor=texture2D(g,a);gl_FragColor.rgb=texColor.rgb;gl_FragColor.a=texColor.a*f;}');
ol.renderer.webgl.defaultmapshader.vertex = new ol.webgl.Vertex(ol.DEBUG_WEBGL ?
_ol_renderer_webgl_defaultmapshader_.vertex = new _ol_webgl_Vertex_(_ol_.DEBUG_WEBGL ?
'varying vec2 v_texCoord;\n\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\n\nuniform mat4 u_texCoordMatrix;\nuniform mat4 u_projectionMatrix;\n\nvoid main(void) {\n gl_Position = u_projectionMatrix * vec4(a_position, 0., 1.);\n v_texCoord = (u_texCoordMatrix * vec4(a_texCoord, 0., 1.)).st;\n}\n\n\n' :
'varying vec2 a;attribute vec2 b;attribute vec2 c;uniform mat4 d;uniform mat4 e;void main(void){gl_Position=e*vec4(b,0.,1.);a=(d*vec4(c,0.,1.)).st;}');
export default _ol_renderer_webgl_defaultmapshader_;
src/ol/renderer/webgl/defaultmapshader/Locations.js
+13 -11
View File
@@ -1,8 +1,8 @@
/**
* @module ol/renderer/webgl/defaultmapshader/Locations
*/
// This file is automatically generated, do not edit
goog.provide('ol.renderer.webgl.defaultmapshader.Locations');
goog.require('ol');
import _ol_ from '../../../index.js';
/**
* @constructor
@@ -10,41 +10,43 @@ goog.require('ol');
* @param {WebGLProgram} program Program.
* @struct
*/
ol.renderer.webgl.defaultmapshader.Locations = function(gl, program) {
var _ol_renderer_webgl_defaultmapshader_Locations_ = function(gl, program) {
/**
* @type {WebGLUniformLocation}
*/
this.u_texCoordMatrix = gl.getUniformLocation(
program, ol.DEBUG_WEBGL ? 'u_texCoordMatrix' : 'd');
program, _ol_.DEBUG_WEBGL ? 'u_texCoordMatrix' : 'd');
/**
* @type {WebGLUniformLocation}
*/
this.u_projectionMatrix = gl.getUniformLocation(
program, ol.DEBUG_WEBGL ? 'u_projectionMatrix' : 'e');
program, _ol_.DEBUG_WEBGL ? 'u_projectionMatrix' : 'e');
/**
* @type {WebGLUniformLocation}
*/
this.u_opacity = gl.getUniformLocation(
program, ol.DEBUG_WEBGL ? 'u_opacity' : 'f');
program, _ol_.DEBUG_WEBGL ? 'u_opacity' : 'f');
/**
* @type {WebGLUniformLocation}
*/
this.u_texture = gl.getUniformLocation(
program, ol.DEBUG_WEBGL ? 'u_texture' : 'g');
program, _ol_.DEBUG_WEBGL ? 'u_texture' : 'g');
/**
* @type {number}
*/
this.a_position = gl.getAttribLocation(
program, ol.DEBUG_WEBGL ? 'a_position' : 'b');
program, _ol_.DEBUG_WEBGL ? 'a_position' : 'b');
/**
* @type {number}
*/
this.a_texCoord = gl.getAttribLocation(
program, ol.DEBUG_WEBGL ? 'a_texCoord' : 'c');
program, _ol_.DEBUG_WEBGL ? 'a_texCoord' : 'c');
};
export default _ol_renderer_webgl_defaultmapshader_Locations_;
src/ol/renderer/webgl/tilelayershader.js
+10 -7
View File
@@ -1,15 +1,18 @@
/**
* @module ol/renderer/webgl/tilelayershader
*/
// This file is automatically generated, do not edit
goog.provide('ol.renderer.webgl.tilelayershader');
goog.require('ol');
goog.require('ol.webgl.Fragment');
goog.require('ol.webgl.Vertex');
import _ol_ from '../../index.js';
import _ol_webgl_Fragment_ from '../../webgl/Fragment.js';
import _ol_webgl_Vertex_ from '../../webgl/Vertex.js';
var _ol_renderer_webgl_tilelayershader_ = {};
ol.renderer.webgl.tilelayershader.fragment = new ol.webgl.Fragment(ol.DEBUG_WEBGL ?
_ol_renderer_webgl_tilelayershader_.fragment = new _ol_webgl_Fragment_(_ol_.DEBUG_WEBGL ?
'precision mediump float;\nvarying vec2 v_texCoord;\n\n\nuniform sampler2D u_texture;\n\nvoid main(void) {\n gl_FragColor = texture2D(u_texture, v_texCoord);\n}\n' :
'precision mediump float;varying vec2 a;uniform sampler2D e;void main(void){gl_FragColor=texture2D(e,a);}');
ol.renderer.webgl.tilelayershader.vertex = new ol.webgl.Vertex(ol.DEBUG_WEBGL ?
_ol_renderer_webgl_tilelayershader_.vertex = new _ol_webgl_Vertex_(_ol_.DEBUG_WEBGL ?
'varying vec2 v_texCoord;\n\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nuniform vec4 u_tileOffset;\n\nvoid main(void) {\n gl_Position = vec4(a_position * u_tileOffset.xy + u_tileOffset.zw, 0., 1.);\n v_texCoord = a_texCoord;\n}\n\n\n' :
'varying vec2 a;attribute vec2 b;attribute vec2 c;uniform vec4 d;void main(void){gl_Position=vec4(b*d.xy+d.zw,0.,1.);a=c;}');
export default _ol_renderer_webgl_tilelayershader_;
src/ol/renderer/webgl/tilelayershader/Locations.js
+11 -9
View File
@@ -1,8 +1,8 @@
/**
* @module ol/renderer/webgl/tilelayershader/Locations
*/
// This file is automatically generated, do not edit
goog.provide('ol.renderer.webgl.tilelayershader.Locations');
goog.require('ol');
import _ol_ from '../../../index.js';
/**
* @constructor
@@ -10,29 +10,31 @@ goog.require('ol');
* @param {WebGLProgram} program Program.
* @struct
*/
ol.renderer.webgl.tilelayershader.Locations = function(gl, program) {
var _ol_renderer_webgl_tilelayershader_Locations_ = function(gl, program) {
/**
* @type {WebGLUniformLocation}
*/
this.u_tileOffset = gl.getUniformLocation(
program, ol.DEBUG_WEBGL ? 'u_tileOffset' : 'd');
program, _ol_.DEBUG_WEBGL ? 'u_tileOffset' : 'd');
/**
* @type {WebGLUniformLocation}
*/
this.u_texture = gl.getUniformLocation(
program, ol.DEBUG_WEBGL ? 'u_texture' : 'e');
program, _ol_.DEBUG_WEBGL ? 'u_texture' : 'e');
/**
* @type {number}
*/
this.a_position = gl.getAttribLocation(
program, ol.DEBUG_WEBGL ? 'a_position' : 'b');
program, _ol_.DEBUG_WEBGL ? 'a_position' : 'b');
/**
* @type {number}
*/
this.a_texCoord = gl.getAttribLocation(
program, ol.DEBUG_WEBGL ? 'a_texCoord' : 'c');
program, _ol_.DEBUG_WEBGL ? 'a_texCoord' : 'c');
};
export default _ol_renderer_webgl_tilelayershader_Locations_;