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

Use oli.FrameState instead of ol.FrameState

Browse Source
This commit is contained in:
Tom Payne
2014-03-10 14:48:23 +01:00
parent 8aca7ce140
commit 022a7a03e0
14 changed files with 43 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/canvaslayerrenderer.js
+6 -6
View File
@@ -31,7 +31,7 @@ goog.inherits(ol.renderer.canvas.Layer, ol.renderer.Layer);
/**
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {ol.layer.LayerState} layerState Layer state.
* @param {CanvasRenderingContext2D} context Context.
*/
@@ -75,7 +75,7 @@ ol.renderer.canvas.Layer.prototype.composeFrame =
/**
* @param {ol.render.EventType} type Event type.
* @param {CanvasRenderingContext2D} context Context.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {goog.vec.Mat4.Number=} opt_transform Transform.
* @private
*/
@@ -98,7 +98,7 @@ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ =
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {goog.vec.Mat4.Number=} opt_transform Transform.
* @protected
*/
@@ -111,7 +111,7 @@ ol.renderer.canvas.Layer.prototype.dispatchPostComposeEvent =
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {goog.vec.Mat4.Number=} opt_transform Transform.
* @protected
*/
@@ -124,7 +124,7 @@ ol.renderer.canvas.Layer.prototype.dispatchPreComposeEvent =
/**
* @param {CanvasRenderingContext2D} context Context.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {goog.vec.Mat4.Number=} opt_transform Transform.
* @protected
*/
@@ -148,7 +148,7 @@ ol.renderer.canvas.Layer.prototype.getImageTransform = goog.abstractMethod;
/**
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @protected
* @return {!goog.vec.Mat4.Number} Transform.
*/
src/ol/renderer/canvas/canvasmaprenderer.js
+1 -1
View File
@@ -87,7 +87,7 @@ ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) {
/**
* @param {ol.render.EventType} type Event type.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @private
*/
ol.renderer.canvas.Map.prototype.dispatchComposeEvent_ =
src/ol/renderer/layerrenderer.js
+6 -7
View File
@@ -1,7 +1,6 @@
goog.provide('ol.renderer.Layer');
goog.require('goog.Disposable');
goog.require('ol.FrameState');
goog.require('ol.Image');
goog.require('ol.ImageState');
goog.require('ol.Tile');
@@ -46,7 +45,7 @@ goog.inherits(ol.renderer.Layer, goog.Disposable);
/**
* @param {ol.Coordinate} coordinate Coordinate.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {function(this: S, ol.Feature, ol.layer.Layer): T} callback Feature
* callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
@@ -97,7 +96,7 @@ ol.renderer.Layer.prototype.handleImageChange = function(event) {
/**
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {ol.layer.LayerState} layerState Layer state.
*/
ol.renderer.Layer.prototype.prepareFrame = goog.abstractMethod;
@@ -115,7 +114,7 @@ ol.renderer.Layer.prototype.renderIfReadyAndVisible = function() {
/**
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {ol.source.Tile} tileSource Tile source.
* @protected
*/
@@ -127,7 +126,7 @@ ol.renderer.Layer.prototype.scheduleExpireCache =
/**
* @param {ol.source.Tile} tileSource Tile source.
* @param {ol.Map} map Map.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
*/
function(tileSource, map, frameState) {
var tileSourceKey = goog.getUid(tileSource).toString();
@@ -156,7 +155,7 @@ ol.renderer.Layer.prototype.updateAttributions =
/**
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {ol.source.Source} source Source.
* @protected
*/
@@ -242,7 +241,7 @@ ol.renderer.Layer.prototype.snapCenterToPixel =
* - registers idle tiles in frameState.wantedTiles so that they are not
* discarded by the tile queue
* - enqueues missing tiles
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {ol.source.Tile} tileSource Tile source.
* @param {ol.tilegrid.TileGrid} tileGrid Tile grid.
* @param {number} pixelRatio Pixel ratio.
src/ol/renderer/maprenderer.js
+7 -8
View File
@@ -5,7 +5,6 @@ goog.require('goog.asserts');
goog.require('goog.dispose');
goog.require('goog.object');
goog.require('goog.vec.Mat4');
goog.require('ol.FrameState');
goog.require('ol.layer.Layer');
goog.require('ol.renderer.Layer');
goog.require('ol.style.IconImageCache');
@@ -42,7 +41,7 @@ goog.inherits(ol.renderer.Map, goog.Disposable);
/**
* @param {ol.FrameState} frameState FrameState.
* @param {oli.FrameState} frameState FrameState.
* @protected
*/
ol.renderer.Map.prototype.calculateMatrices2D = function(frameState) {
@@ -83,7 +82,7 @@ ol.renderer.Map.prototype.disposeInternal = function() {
/**
* @param {ol.Coordinate} coordinate Coordinate.
* @param {ol.FrameState} frameState FrameState.
* @param {oli.FrameState} frameState FrameState.
* @param {function(this: S, ol.Feature, ol.layer.Layer): T} callback Feature
* callback.
* @param {S} thisArg Value to use as `this` when executing `callback`.
@@ -175,14 +174,14 @@ ol.renderer.Map.prototype.removeLayerRendererByKey_ = function(layerKey) {
/**
* Render.
* @param {?ol.FrameState} frameState Frame state.
* @param {?oli.FrameState} frameState Frame state.
*/
ol.renderer.Map.prototype.renderFrame = goog.nullFunction;
/**
* @param {ol.Map} map Map.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @private
*/
ol.renderer.Map.prototype.removeUnusedLayerRenderers_ =
@@ -197,14 +196,14 @@ ol.renderer.Map.prototype.removeUnusedLayerRenderers_ =
/**
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @protected
*/
ol.renderer.Map.prototype.scheduleExpireIconCache = function(frameState) {
frameState.postRenderFunctions.push(
/**
* @param {ol.Map} map Map.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
*/
function(map, frameState) {
ol.style.IconImageCache.getInstance().expire();
@@ -213,7 +212,7 @@ ol.renderer.Map.prototype.scheduleExpireIconCache = function(frameState) {
/**
* @param {!ol.FrameState} frameState Frame state.
* @param {!oli.FrameState} frameState Frame state.
* @protected
*/
ol.renderer.Map.prototype.scheduleRemoveUnusedLayerRenderers =
src/ol/renderer/webgl/webgllayerrenderer.js
+3 -4
View File
@@ -2,7 +2,6 @@ goog.provide('ol.renderer.webgl.Layer');
goog.require('goog.vec.Mat4');
goog.require('goog.webgl');
goog.require('ol.FrameState');
goog.require('ol.color.Matrix');
goog.require('ol.layer.Layer');
goog.require('ol.render.Event');
@@ -89,7 +88,7 @@ goog.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer);
/**
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {number} framebufferDimension Framebuffer dimension.
* @protected
*/
@@ -143,7 +142,7 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer =
/**
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @param {ol.layer.LayerState} layerState Layer state.
* @param {ol.webgl.Context} context Context.
*/
@@ -231,7 +230,7 @@ ol.renderer.webgl.Layer.prototype.composeFrame =
/**
* @param {ol.render.EventType} type Event type.
* @param {ol.webgl.Context} context WebGL context.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @private
*/
ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ =
src/ol/renderer/webgl/webglmaprenderer.js
+2 -3
View File
@@ -13,7 +13,6 @@ goog.require('goog.log.Logger');
goog.require('goog.object');
goog.require('goog.style');
goog.require('goog.webgl');
goog.require('ol.FrameState');
goog.require('ol.Tile');
goog.require('ol.css');
goog.require('ol.layer.Image');
@@ -271,7 +270,7 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
/**
* @param {ol.render.EventType} type Event type.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @private
*/
ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ =
@@ -311,7 +310,7 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() {
/**
* @param {ol.Map} map Map.
* @param {ol.FrameState} frameState Frame state.
* @param {oli.FrameState} frameState Frame state.
* @private
*/
ol.renderer.webgl.Map.prototype.expireCache_ = function(map, frameState) {