Move arrayBuffer_ to layer renderer

This commit is contained in:
Éric Lemoine
2013-11-18 16:10:56 +01:00
committed by Tom Payne
parent 1c03886e1c
commit 93aef958e9
2 changed files with 14 additions and 13 deletions

View File

@@ -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 =

View File

@@ -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) {