Pass view rotation to ol.render.canvas.Immediate
This commit is contained in:
@@ -25,9 +25,11 @@ goog.require('ol.vec.Mat4');
|
|||||||
* @param {number} pixelRatio Pixel ratio.
|
* @param {number} pixelRatio Pixel ratio.
|
||||||
* @param {ol.Extent} extent Extent.
|
* @param {ol.Extent} extent Extent.
|
||||||
* @param {goog.vec.Mat4.Number} transform Transform.
|
* @param {goog.vec.Mat4.Number} transform Transform.
|
||||||
|
* @param {number} viewRotation View rotation.
|
||||||
* @struct
|
* @struct
|
||||||
*/
|
*/
|
||||||
ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform) {
|
ol.render.canvas.Immediate =
|
||||||
|
function(context, pixelRatio, extent, transform, viewRotation) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
@@ -60,6 +62,12 @@ ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform) {
|
|||||||
*/
|
*/
|
||||||
this.transform_ = transform;
|
this.transform_ = transform;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @private
|
||||||
|
* @type {number}
|
||||||
|
*/
|
||||||
|
this.viewRotation_ = viewRotation;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
* @type {?ol.render.canvas.FillState}
|
* @type {?ol.render.canvas.FillState}
|
||||||
|
|||||||
@@ -86,7 +86,8 @@ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ =
|
|||||||
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(
|
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,
|
var composeEvent = new ol.render.Event(type, layer, render, frameState,
|
||||||
context, null);
|
context, null);
|
||||||
layer.dispatchEvent(composeEvent);
|
layer.dispatchEvent(composeEvent);
|
||||||
|
|||||||
@@ -104,8 +104,8 @@ ol.renderer.canvas.Map.prototype.dispatchComposeEvent_ =
|
|||||||
-pixelRatio / view2DState.resolution,
|
-pixelRatio / view2DState.resolution,
|
||||||
-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, pixelRatio,
|
||||||
context, pixelRatio, frameState.extent, this.transform_);
|
frameState.extent, this.transform_, view2DState.rotation);
|
||||||
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);
|
||||||
|
|||||||
Reference in New Issue
Block a user