From 93aef958e9d1ec7e84486a5923b5904b255597e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Mon, 18 Nov 2013 16:10:56 +0100 Subject: [PATCH] Move arrayBuffer_ to layer renderer --- src/ol/renderer/webgl/webgllayerrenderer.js | 14 ++++++++++++++ src/ol/renderer/webgl/webglmaprenderer.js | 13 ------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js index 1c8e5fac04..78897f8ffa 100644 --- a/src/ol/renderer/webgl/webgllayerrenderer.js +++ b/src/ol/renderer/webgl/webgllayerrenderer.js @@ -10,6 +10,7 @@ goog.require('ol.render.EventType'); goog.require('ol.renderer.Layer'); goog.require('ol.renderer.webgl.map.shader.Color'); goog.require('ol.renderer.webgl.map.shader.Default'); +goog.require('ol.structs.Buffer'); @@ -23,6 +24,17 @@ ol.renderer.webgl.Layer = function(mapRenderer, layer) { goog.base(this, mapRenderer, layer); + /** + * @private + * @type {ol.structs.Buffer} + */ + this.arrayBuffer_ = new ol.structs.Buffer([ + -1, -1, 0, 0, + 1, -1, 1, 0, + -1, 1, 0, 1, + 1, 1, 1, 1 + ]); + /** * @protected * @type {WebGLTexture} @@ -140,6 +152,8 @@ ol.renderer.webgl.Layer.prototype.composeFrame = this.dispatchComposeEvent_( ol.render.EventType.PRECOMPOSE, context, frameState); + context.bindBuffer(goog.webgl.ARRAY_BUFFER, this.arrayBuffer_); + var gl = context.getGL(); var useColor = diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 09bc869ff8..9716d85c76 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -24,7 +24,6 @@ goog.require('ol.renderer.Map'); goog.require('ol.renderer.webgl.ImageLayer'); goog.require('ol.renderer.webgl.TileLayer'); goog.require('ol.source.State'); -goog.require('ol.structs.Buffer'); goog.require('ol.structs.LRUCache'); goog.require('ol.structs.PriorityQueue'); goog.require('ol.webgl'); @@ -93,17 +92,6 @@ ol.renderer.webgl.Map = function(container, map) { goog.events.listen(this.canvas_, ol.webgl.WebGLContextEventType.RESTORED, this.handleWebGLContextRestored, false, this); - /** - * @private - * @type {ol.structs.Buffer} - */ - this.arrayBuffer_ = new ol.structs.Buffer([ - -1, -1, 0, 0, - 1, -1, 1, 0, - -1, 1, 0, 1, - 1, 1, 1, 1 - ]); - /** * @private * @type {ol.structs.LRUCache} @@ -425,7 +413,6 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) { gl.enable(goog.webgl.BLEND); gl.viewport(0, 0, size[0], size[1]); - context.bindBuffer(goog.webgl.ARRAY_BUFFER, this.arrayBuffer_); this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, frameState); for (i = 0, ii = layersToDraw.length; i < ii; ++i) {