Pass view rotation to ol.render.canvas.Immediate

This commit is contained in:
Tom Payne
2014-02-21 12:57:09 +01:00
parent 222fafcb77
commit 0e90cf02ad
3 changed files with 13 additions and 4 deletions

View File

@@ -25,9 +25,11 @@ goog.require('ol.vec.Mat4');
* @param {number} pixelRatio Pixel ratio.
* @param {ol.Extent} extent Extent.
* @param {goog.vec.Mat4.Number} transform Transform.
* @param {number} viewRotation View rotation.
* @struct
*/
ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform) {
ol.render.canvas.Immediate =
function(context, pixelRatio, extent, transform, viewRotation) {
/**
* @private
@@ -60,6 +62,12 @@ ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform) {
*/
this.transform_ = transform;
/**
* @private
* @type {number}
*/
this.viewRotation_ = viewRotation;
/**
* @private
* @type {?ol.render.canvas.FillState}

View File

@@ -86,7 +86,8 @@ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ =
var transform = goog.isDef(opt_transform) ?
opt_transform : this.getTransform(frameState);
var render = new ol.render.canvas.Immediate(
context, frameState.pixelRatio, frameState.extent, transform);
context, frameState.pixelRatio, frameState.extent, transform,
frameState.view2DState.rotation);
var composeEvent = new ol.render.Event(type, layer, render, frameState,
context, null);
layer.dispatchEvent(composeEvent);

View File

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