Pass pixel ratio to ol.render.canvas.Immediate constructor

This commit is contained in:
Tom Payne
2013-12-14 11:42:11 +01:00
parent 81c0c37eb9
commit eb84072373
3 changed files with 11 additions and 4 deletions

View File

@@ -17,11 +17,12 @@ goog.require('ol.style.Text');
* @constructor * @constructor
* @implements {ol.render.IRender} * @implements {ol.render.IRender}
* @param {CanvasRenderingContext2D} context Context. * @param {CanvasRenderingContext2D} context Context.
* @param {number} pixelRatio Pixel ratio.
* @param {ol.Extent} extent Extent. * @param {ol.Extent} extent Extent.
* @param {goog.vec.Mat4.AnyType} transform Transform. * @param {goog.vec.Mat4.AnyType} transform Transform.
* @struct * @struct
*/ */
ol.render.canvas.Immediate = function(context, extent, transform) { ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform) {
/** /**
* @private * @private
@@ -29,6 +30,12 @@ ol.render.canvas.Immediate = function(context, extent, transform) {
*/ */
this.context_ = context; this.context_ = context;
/**
* @private
* @type {number}
*/
this.pixelRatio_ = pixelRatio;
/** /**
* @private * @private
* @type {ol.Extent} * @type {ol.Extent}

View File

@@ -85,8 +85,8 @@ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ =
if (layer.hasListener(type)) { if (layer.hasListener(type)) {
var transform = goog.isDef(opt_transform) ? var transform = goog.isDef(opt_transform) ?
opt_transform : this.getTransform(frameState); opt_transform : this.getTransform(frameState);
var render = new ol.render.canvas.Immediate(context, frameState.extent, var render = new ol.render.canvas.Immediate(
transform); context, frameState.devicePixelRatio, frameState.extent, transform);
var composeEvent = new ol.render.Event(type, layer, render, frameState, var composeEvent = new ol.render.Event(type, layer, render, frameState,
context, null); context, null);
layer.dispatchEvent(composeEvent); layer.dispatchEvent(composeEvent);

View File

@@ -105,7 +105,7 @@ ol.renderer.canvas.Map.prototype.dispatchComposeEvent_ =
-view2DState.rotation, -view2DState.rotation,
-view2DState.center[0], -view2DState.center[1]); -view2DState.center[0], -view2DState.center[1]);
var render = new ol.render.canvas.Immediate( var render = new ol.render.canvas.Immediate(
context, frameState.extent, this.transform_); context, devicePixelRatio, frameState.extent, this.transform_);
var composeEvent = new ol.render.Event(type, map, render, frameState, var composeEvent = new ol.render.Event(type, map, render, frameState,
context, null); context, null);
map.dispatchEvent(composeEvent); map.dispatchEvent(composeEvent);