Merge pull request #1452 from tonio/vector-api-dragbox-webgl

[vector-api] Re-enable dragzoom for every renderer
This commit is contained in:
Antoine Abt
2014-01-03 07:46:14 -08:00
10 changed files with 178 additions and 127 deletions
+4 -1
View File
@@ -7,6 +7,7 @@ goog.require('ol.color.Matrix');
goog.require('ol.layer.Layer');
goog.require('ol.render.Event');
goog.require('ol.render.EventType');
goog.require('ol.render.webgl.Immediate');
goog.require('ol.renderer.Layer');
goog.require('ol.renderer.webgl.map.shader.Color');
goog.require('ol.renderer.webgl.map.shader.Default');
@@ -237,8 +238,10 @@ ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ =
function(type, context, frameState) {
var layer = this.getLayer();
if (layer.hasListener(type)) {
var render = new ol.render.webgl.Immediate(context,
frameState.devicePixelRatio);
var composeEvent = new ol.render.Event(
type, layer, null, frameState, null, context);
type, layer, render, frameState, null, context);
layer.dispatchEvent(composeEvent);
}
};
+5 -2
View File
@@ -20,6 +20,7 @@ goog.require('ol.layer.Image');
goog.require('ol.layer.Tile');
goog.require('ol.render.Event');
goog.require('ol.render.EventType');
goog.require('ol.render.webgl.Immediate');
goog.require('ol.renderer.Map');
goog.require('ol.renderer.webgl.ImageLayer');
goog.require('ol.renderer.webgl.Layer');
@@ -282,10 +283,12 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ =
function(type, frameState) {
var map = this.getMap();
var context = this.getContext();
if (map.hasListener(type)) {
var context = this.getContext();
var render = new ol.render.webgl.Immediate(context,
frameState.devicePixelRatio);
var composeEvent = new ol.render.Event(
type, map, null, frameState, null, context);
type, map, render, frameState, null, context);
map.dispatchEvent(composeEvent);
}
};