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

Rename ol.render.EventType to ol.render.Event.Type

Browse Source
This commit is contained in:
Frederic Junod
2016-10-13 12:02:51 +02:00
parent 5a3794752a
commit ed677cec4e
12 changed files with 51 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ol/renderer/webgl/layer.js
View File

@@ -2,7 +2,6 @@ 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');
@@ -140,7 +139,7 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebu
ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState, context) {
this.dispatchComposeEvent_(
ol.render.EventType.PRECOMPOSE, context, frameState);
ol.render.Event.Type.PRECOMPOSE, context, frameState);
context.bindBuffer(ol.webgl.ARRAY_BUFFER, this.arrayBuffer_);
@@ -179,13 +178,13 @@ ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState
gl.drawArrays(ol.webgl.TRIANGLE_STRIP, 0, 4);
this.dispatchComposeEvent_(
ol.render.EventType.POSTCOMPOSE, context, frameState);
ol.render.Event.Type.POSTCOMPOSE, context, frameState);
};
/**
* @param {ol.render.EventType} type Event type.
* @param {ol.render.Event.Type} type Event type.
* @param {ol.webgl.Context} context WebGL context.
* @param {olx.FrameState} frameState Frame state.
* @private

7
src/ol/renderer/webgl/map.js
View File

@@ -12,7 +12,6 @@ goog.require('ol.layer.Layer');
goog.require('ol.layer.Tile');
goog.require('ol.layer.Vector');
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');
@@ -251,7 +250,7 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
/**
* @param {ol.render.EventType} type Event type.
* @param {ol.render.Event.Type} type Event type.
* @param {olx.FrameState} frameState Frame state.
* @private
*/
@@ -433,7 +432,7 @@ 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.Event.Type.PRECOMPOSE, frameState);
/** @type {Array.<ol.LayerState>} */
var layerStatesToDraw = [];
@@ -492,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.Event.Type.POSTCOMPOSE, frameState);
this.scheduleRemoveUnusedLayerRenderers(frameState);
this.scheduleExpireIconCache(frameState);