From c5de1db9e623399b1ebc9024eadbe5658a125f23 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sun, 10 Nov 2013 23:14:19 +0100 Subject: [PATCH] Rename render to immediate --- src/ol/render/canvas/canvasimmediate.exports | 9 ++++ .../{canvasrender.js => canvasimmediate.js} | 50 +++++++++---------- src/ol/render/canvas/canvasrender.exports | 9 ---- src/ol/render/{irender.js => iimmediate.js} | 0 .../canvas/canvasvectorlayerrenderer.js | 4 +- 5 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 src/ol/render/canvas/canvasimmediate.exports rename src/ol/render/canvas/{canvasrender.js => canvasimmediate.js} (78%) delete mode 100644 src/ol/render/canvas/canvasrender.exports rename src/ol/render/{irender.js => iimmediate.js} (100%) diff --git a/src/ol/render/canvas/canvasimmediate.exports b/src/ol/render/canvas/canvasimmediate.exports new file mode 100644 index 0000000000..d2bb4dd076 --- /dev/null +++ b/src/ol/render/canvas/canvasimmediate.exports @@ -0,0 +1,9 @@ +@exportProperty ol.render.canvas.Immediate.prototype.drawFeature +@exportProperty ol.render.canvas.Immediate.prototype.drawPointGeometry +@exportProperty ol.render.canvas.Immediate.prototype.drawLineStringGeometry +@exportProperty ol.render.canvas.Immediate.prototype.drawPolygonGeometry +@exportProperty ol.render.canvas.Immediate.prototype.drawMultiPointGeometry +@exportProperty ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry +@exportProperty ol.render.canvas.Immediate.prototype.drawMultiPointGeometry +@exportProperty ol.render.canvas.Immediate.prototype.setFillStrokeStyle +@exportProperty ol.render.canvas.Immediate.prototype.setImageStyle diff --git a/src/ol/render/canvas/canvasrender.js b/src/ol/render/canvas/canvasimmediate.js similarity index 78% rename from src/ol/render/canvas/canvasrender.js rename to src/ol/render/canvas/canvasimmediate.js index f063758747..79a4d9339f 100644 --- a/src/ol/render/canvas/canvasrender.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -1,6 +1,6 @@ // FIXME test, especially polygons with holes and multipolygons -goog.provide('ol.render.canvas.Render'); +goog.provide('ol.render.canvas.Immediate'); goog.require('goog.asserts'); goog.require('ol.render'); @@ -16,7 +16,7 @@ goog.require('ol.style.stroke'); * @param {CanvasRenderingContext2D} context Context. * @param {goog.vec.Mat4.AnyType} transform Transform. */ -ol.render.canvas.Render = function(context, transform) { +ol.render.canvas.Immediate = function(context, transform) { /** * @private @@ -55,7 +55,7 @@ ol.render.canvas.Render = function(context, transform) { * @param {ol.geom.Point|ol.geom.MultiPoint} geometry Geometry. * @private */ -ol.render.canvas.Render.prototype.drawImages_ = function(geometry) { +ol.render.canvas.Immediate.prototype.drawImages_ = function(geometry) { var context = this.context_; var imageStyle = this.state_.imageStyle; if (goog.isNull(imageStyle)) { @@ -84,7 +84,7 @@ ol.render.canvas.Render.prototype.drawImages_ = function(geometry) { * @private * @return {number} end End. */ -ol.render.canvas.Render.prototype.moveToLineTo_ = +ol.render.canvas.Immediate.prototype.moveToLineTo_ = function(pixelCoordinates, offset, end, close) { var context = this.context_; context.moveTo(pixelCoordinates[offset], pixelCoordinates[offset + 1]); @@ -106,7 +106,7 @@ ol.render.canvas.Render.prototype.moveToLineTo_ = * @private * @return {number} End. */ -ol.render.canvas.Render.prototype.drawRings_ = +ol.render.canvas.Immediate.prototype.drawRings_ = function(pixelCoordinates, offset, ends) { var context = this.context_; var i, ii; @@ -121,12 +121,12 @@ ol.render.canvas.Render.prototype.drawRings_ = /** * @inheritDoc */ -ol.render.canvas.Render.prototype.drawFeature = function(feature, style) { +ol.render.canvas.Immediate.prototype.drawFeature = function(feature, style) { this.setFillStrokeStyle(style.fill, style.stroke); this.setImageStyle(style.image); var geometry = feature.getGeometry(); var renderGeometry = - ol.render.canvas.Render.GEOMETRY_RENDERES_[geometry.getType()]; + ol.render.canvas.Immediate.GEOMETRY_RENDERES_[geometry.getType()]; goog.asserts.assert(goog.isDef(renderGeometry)); renderGeometry.call(this, geometry); }; @@ -135,21 +135,21 @@ ol.render.canvas.Render.prototype.drawFeature = function(feature, style) { /** * @inheritDoc */ -ol.render.canvas.Render.prototype.drawPointGeometry = - ol.render.canvas.Render.prototype.drawImages_; +ol.render.canvas.Immediate.prototype.drawPointGeometry = + ol.render.canvas.Immediate.prototype.drawImages_; /** * @inheritDoc */ -ol.render.canvas.Render.prototype.drawMultiPointGeometry = - ol.render.canvas.Render.prototype.drawImages_; +ol.render.canvas.Immediate.prototype.drawMultiPointGeometry = + ol.render.canvas.Immediate.prototype.drawImages_; /** * @inheritDoc */ -ol.render.canvas.Render.prototype.drawLineStringGeometry = +ol.render.canvas.Immediate.prototype.drawLineStringGeometry = function(lineStringGeometry) { if (goog.isNull(this.state_.strokeStyle)) { return; @@ -166,7 +166,7 @@ ol.render.canvas.Render.prototype.drawLineStringGeometry = /** * @inheritDoc */ -ol.render.canvas.Render.prototype.drawMultiLineStringGeometry = +ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry = function(multiLineStringGeometry) { if (goog.isNull(this.state_.strokeStyle)) { return; @@ -188,7 +188,7 @@ ol.render.canvas.Render.prototype.drawMultiLineStringGeometry = /** * @inheritDoc */ -ol.render.canvas.Render.prototype.drawPolygonGeometry = +ol.render.canvas.Immediate.prototype.drawPolygonGeometry = function(polygonGeometry) { var state = this.state_; if (goog.isNull(this.fillStyle) && goog.isNull(this.strokeStyle)) { @@ -212,7 +212,7 @@ ol.render.canvas.Render.prototype.drawPolygonGeometry = /** * @inheritDoc */ -ol.render.canvas.Render.prototype.drawMultiPolygonGeometry = +ol.render.canvas.Immediate.prototype.drawMultiPolygonGeometry = function(multiPolygonGeometry) { var state = this.state_; if (goog.isNull(this.fillStyle) && goog.isNull(this.strokeStyle)) { @@ -241,7 +241,7 @@ ol.render.canvas.Render.prototype.drawMultiPolygonGeometry = /** * @inheritDoc */ -ol.render.canvas.Render.prototype.setFillStrokeStyle = +ol.render.canvas.Immediate.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) { var context = this.context_; var state = this.state_; @@ -260,7 +260,7 @@ ol.render.canvas.Render.prototype.setFillStrokeStyle = /** * @inheritDoc */ -ol.render.canvas.Render.prototype.setImageStyle = function(imageStyle) { +ol.render.canvas.Immediate.prototype.setImageStyle = function(imageStyle) { this.state_.imageStyle = imageStyle; }; @@ -269,14 +269,14 @@ ol.render.canvas.Render.prototype.setImageStyle = function(imageStyle) { * @const * @private * @type {Object.} + * function(this: ol.render.canvas.Immediate, ol.geom.Geometry)>} */ -ol.render.canvas.Render.GEOMETRY_RENDERES_ = { - 'Point': ol.render.canvas.Render.prototype.drawPointGeometry, - 'LineString': ol.render.canvas.Render.prototype.drawLineStringGeometry, - 'Polygon': ol.render.canvas.Render.prototype.drawPolygonGeometry, - 'MultiPoint': ol.render.canvas.Render.prototype.drawMultiPointGeometry, +ol.render.canvas.Immediate.GEOMETRY_RENDERES_ = { + 'Point': ol.render.canvas.Immediate.prototype.drawPointGeometry, + 'LineString': ol.render.canvas.Immediate.prototype.drawLineStringGeometry, + 'Polygon': ol.render.canvas.Immediate.prototype.drawPolygonGeometry, + 'MultiPoint': ol.render.canvas.Immediate.prototype.drawMultiPointGeometry, 'MultiLineString': - ol.render.canvas.Render.prototype.drawMultiLineStringGeometry, - 'MultiPolygon': ol.render.canvas.Render.prototype.drawMultiPolygonGeometry + ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry, + 'MultiPolygon': ol.render.canvas.Immediate.prototype.drawMultiPolygonGeometry }; diff --git a/src/ol/render/canvas/canvasrender.exports b/src/ol/render/canvas/canvasrender.exports deleted file mode 100644 index 9268b3c87c..0000000000 --- a/src/ol/render/canvas/canvasrender.exports +++ /dev/null @@ -1,9 +0,0 @@ -@exportProperty ol.render.canvas.Render.prototype.drawFeature -@exportProperty ol.render.canvas.Render.prototype.drawPointGeometry -@exportProperty ol.render.canvas.Render.prototype.drawLineStringGeometry -@exportProperty ol.render.canvas.Render.prototype.drawPolygonGeometry -@exportProperty ol.render.canvas.Render.prototype.drawMultiPointGeometry -@exportProperty ol.render.canvas.Render.prototype.drawMultiLineStringGeometry -@exportProperty ol.render.canvas.Render.prototype.drawMultiPointGeometry -@exportProperty ol.render.canvas.Render.prototype.setFillStrokeStyle -@exportProperty ol.render.canvas.Render.prototype.setImageStyle diff --git a/src/ol/render/irender.js b/src/ol/render/iimmediate.js similarity index 100% rename from src/ol/render/irender.js rename to src/ol/render/iimmediate.js diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index f1cddb755a..1428a8105e 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -5,7 +5,7 @@ goog.require('ol.ViewHint'); goog.require('ol.extent'); goog.require('ol.layer.VectorEvent'); goog.require('ol.layer.VectorEventType'); -goog.require('ol.render.canvas.Render'); +goog.require('ol.render.canvas.Immediate'); goog.require('ol.render.canvas.ReplayGroup'); goog.require('ol.renderer.canvas.Layer'); goog.require('ol.renderer.vector'); @@ -94,7 +94,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame = var vectorLayer = this.getVectorLayer(); if (vectorLayer.hasListener(ol.layer.VectorEventType.POSTRENDER)) { - var render = new ol.render.canvas.Render(context, transform); + var render = new ol.render.canvas.Immediate(context, transform); var postRenderEvent = new ol.layer.VectorEvent( ol.layer.VectorEventType.POSTRENDER, vectorLayer, render, context, null);