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

Rename _ol_renderer_webgl_ImageLayer_ to WebGLImageLayerRenderer

Browse Source
This commit is contained in:
Tim Schaub
2018-01-08 09:45:51 -07:00
parent 0fe5e58d97
commit 12a3b99b09
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/Map.js
View File

@@ -13,7 +13,7 @@ import CanvasMapRenderer from './renderer/canvas/Map.js';
import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js'; import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js';
import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js'; import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js';
import CanvasVectorTileLayerRenderer from './renderer/canvas/VectorTileLayer.js'; import CanvasVectorTileLayerRenderer from './renderer/canvas/VectorTileLayer.js';
import _ol_renderer_webgl_ImageLayer_ from './renderer/webgl/ImageLayer.js'; import WebGLImageLayerRenderer from './renderer/webgl/ImageLayer.js';
import WebGLMapRenderer from './renderer/webgl/Map.js'; import WebGLMapRenderer from './renderer/webgl/Map.js';
import _ol_renderer_webgl_TileLayer_ from './renderer/webgl/TileLayer.js'; import _ol_renderer_webgl_TileLayer_ from './renderer/webgl/TileLayer.js';
import _ol_renderer_webgl_VectorLayer_ from './renderer/webgl/VectorLayer.js'; import _ol_renderer_webgl_VectorLayer_ from './renderer/webgl/VectorLayer.js';
@@ -30,7 +30,7 @@ registerMultiple(PluginType.LAYER_RENDERER, [
// TODO: move these to new ol-webgl package // TODO: move these to new ol-webgl package
register(PluginType.MAP_RENDERER, WebGLMapRenderer); register(PluginType.MAP_RENDERER, WebGLMapRenderer);
registerMultiple(PluginType.LAYER_RENDERER, [ registerMultiple(PluginType.LAYER_RENDERER, [
_ol_renderer_webgl_ImageLayer_, WebGLImageLayerRenderer,
_ol_renderer_webgl_TileLayer_, _ol_renderer_webgl_TileLayer_,
_ol_renderer_webgl_VectorLayer_ _ol_renderer_webgl_VectorLayer_
]); ]);

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

@@ -21,7 +21,7 @@ import _ol_webgl_Context_ from '../../webgl/Context.js';
* @param {ol.layer.Image} imageLayer Tile layer. * @param {ol.layer.Image} imageLayer Tile layer.
* @api * @api
*/ */
var _ol_renderer_webgl_ImageLayer_ = function(mapRenderer, imageLayer) { var WebGLImageLayerRenderer = function(mapRenderer, imageLayer) {
_ol_renderer_webgl_Layer_.call(this, mapRenderer, imageLayer); _ol_renderer_webgl_Layer_.call(this, mapRenderer, imageLayer);
@@ -46,7 +46,7 @@ var _ol_renderer_webgl_ImageLayer_ = function(mapRenderer, imageLayer) {
}; };
inherits(_ol_renderer_webgl_ImageLayer_, _ol_renderer_webgl_Layer_); inherits(WebGLImageLayerRenderer, _ol_renderer_webgl_Layer_);
/** /**
@@ -55,7 +55,7 @@ inherits(_ol_renderer_webgl_ImageLayer_, _ol_renderer_webgl_Layer_);
* @param {ol.layer.Layer} layer The candidate layer. * @param {ol.layer.Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer. * @return {boolean} The renderer can render the layer.
*/ */
_ol_renderer_webgl_ImageLayer_['handles'] = function(type, layer) { WebGLImageLayerRenderer['handles'] = function(type, layer) {
return type === RendererType.WEBGL && layer.getType() === LayerType.IMAGE; return type === RendererType.WEBGL && layer.getType() === LayerType.IMAGE;
}; };
@@ -66,8 +66,8 @@ _ol_renderer_webgl_ImageLayer_['handles'] = function(type, layer) {
* @param {ol.layer.Layer} layer The layer to be rendererd. * @param {ol.layer.Layer} layer The layer to be rendererd.
* @return {ol.renderer.webgl.ImageLayer} The layer renderer. * @return {ol.renderer.webgl.ImageLayer} The layer renderer.
*/ */
_ol_renderer_webgl_ImageLayer_['create'] = function(mapRenderer, layer) { WebGLImageLayerRenderer['create'] = function(mapRenderer, layer) {
return new _ol_renderer_webgl_ImageLayer_( return new WebGLImageLayerRenderer(
/** @type {ol.renderer.webgl.Map} */ (mapRenderer), /** @type {ol.renderer.webgl.Map} */ (mapRenderer),
/** @type {ol.layer.Image} */ (layer) /** @type {ol.layer.Image} */ (layer)
); );
@@ -79,7 +79,7 @@ _ol_renderer_webgl_ImageLayer_['create'] = function(mapRenderer, layer) {
* @private * @private
* @return {WebGLTexture} Texture. * @return {WebGLTexture} Texture.
*/ */
_ol_renderer_webgl_ImageLayer_.prototype.createTexture_ = function(image) { WebGLImageLayerRenderer.prototype.createTexture_ = function(image) {
// We meet the conditions to work with non-power of two textures. // 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 // http://www.khronos.org/webgl/wiki/WebGL_and_OpenGL_Differences#Non-Power_of_Two_Texture_Support
@@ -96,7 +96,7 @@ _ol_renderer_webgl_ImageLayer_.prototype.createTexture_ = function(image) {
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_renderer_webgl_ImageLayer_.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) { WebGLImageLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
var layer = this.getLayer(); var layer = this.getLayer();
var source = layer.getSource(); var source = layer.getSource();
var resolution = frameState.viewState.resolution; var resolution = frameState.viewState.resolution;
@@ -118,7 +118,7 @@ _ol_renderer_webgl_ImageLayer_.prototype.forEachFeatureAtCoordinate = function(c
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_renderer_webgl_ImageLayer_.prototype.prepareFrame = function(frameState, layerState, context) { WebGLImageLayerRenderer.prototype.prepareFrame = function(frameState, layerState, context) {
var gl = this.mapRenderer.getGL(); var gl = this.mapRenderer.getGL();
@@ -205,7 +205,7 @@ _ol_renderer_webgl_ImageLayer_.prototype.prepareFrame = function(frameState, lay
* @param {ol.Extent} imageExtent Image extent. * @param {ol.Extent} imageExtent Image extent.
* @private * @private
*/ */
_ol_renderer_webgl_ImageLayer_.prototype.updateProjectionMatrix_ = function(canvasWidth, canvasHeight, pixelRatio, WebGLImageLayerRenderer.prototype.updateProjectionMatrix_ = function(canvasWidth, canvasHeight, pixelRatio,
viewCenter, viewResolution, viewRotation, imageExtent) { viewCenter, viewResolution, viewRotation, imageExtent) {
var canvasExtentWidth = canvasWidth * viewResolution; var canvasExtentWidth = canvasWidth * viewResolution;
@@ -231,7 +231,7 @@ _ol_renderer_webgl_ImageLayer_.prototype.updateProjectionMatrix_ = function(canv
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_renderer_webgl_ImageLayer_.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) { WebGLImageLayerRenderer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) {
var hasFeature = this.forEachFeatureAtCoordinate(coordinate, frameState, 0, TRUE, this); var hasFeature = this.forEachFeatureAtCoordinate(coordinate, frameState, 0, TRUE, this);
return hasFeature !== undefined; return hasFeature !== undefined;
}; };
@@ -240,7 +240,7 @@ _ol_renderer_webgl_ImageLayer_.prototype.hasFeatureAtCoordinate = function(coord
/** /**
* @inheritDoc * @inheritDoc
*/ */
_ol_renderer_webgl_ImageLayer_.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) { WebGLImageLayerRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) {
if (!this.image_ || !this.image_.getImage()) { if (!this.image_ || !this.image_.getImage()) {
return undefined; return undefined;
} }
@@ -301,7 +301,7 @@ _ol_renderer_webgl_ImageLayer_.prototype.forEachLayerAtPixel = function(pixel, f
* @return {ol.Transform} The transformation matrix. * @return {ol.Transform} The transformation matrix.
* @private * @private
*/ */
_ol_renderer_webgl_ImageLayer_.prototype.getHitTransformationMatrix_ = function(mapSize, imageSize) { WebGLImageLayerRenderer.prototype.getHitTransformationMatrix_ = function(mapSize, imageSize) {
// the first matrix takes a map pixel, flips the y-axis and scales to // the first matrix takes a map pixel, flips the y-axis and scales to
// a range between -1 ... 1 // a range between -1 ... 1
var mapCoordTransform = _ol_transform_.create(); var mapCoordTransform = _ol_transform_.create();
@@ -326,4 +326,4 @@ _ol_renderer_webgl_ImageLayer_.prototype.getHitTransformationMatrix_ = function(
return transform; return transform;
}; };
export default _ol_renderer_webgl_ImageLayer_; export default WebGLImageLayerRenderer;

4
test/spec/ol/renderer/webgl/imagelayer.test.js
View File

@@ -2,7 +2,7 @@ import _ol_transform_ from '../../../../../src/ol/transform.js';
import Map from '../../../../../src/ol/Map.js'; import Map from '../../../../../src/ol/Map.js';
import _ol_layer_Image_ from '../../../../../src/ol/layer/Image.js'; import _ol_layer_Image_ from '../../../../../src/ol/layer/Image.js';
import _ol_source_Image_ from '../../../../../src/ol/source/Image.js'; import _ol_source_Image_ from '../../../../../src/ol/source/Image.js';
import _ol_renderer_webgl_ImageLayer_ from '../../../../../src/ol/renderer/webgl/ImageLayer.js'; import WebGLImageLayerRenderer from '../../../../../src/ol/renderer/webgl/ImageLayer.js';
describe('ol.renderer.webgl.ImageLayer', function() { describe('ol.renderer.webgl.ImageLayer', function() {
@@ -26,7 +26,7 @@ describe('ol.renderer.webgl.ImageLayer', function() {
extent: [0, 0, 1, 1] extent: [0, 0, 1, 1]
}) })
}); });
renderer = new _ol_renderer_webgl_ImageLayer_(map.renderer_, layer); renderer = new WebGLImageLayerRenderer(map.renderer_, layer);
// input params // input params
canvasWidth = 512; canvasWidth = 512;