From d3294730f1d70e94b4c3b5355e159b498b6ac858 Mon Sep 17 00:00:00 2001 From: Olivier Guyot Date: Thu, 15 Nov 2018 17:45:03 +0100 Subject: [PATCH] Renamed WebGLContext to Helper for clarity --- src/ol/renderer/webgl-new/PointsLayer.js | 4 ++-- src/ol/webgl/{Context.js => Helper.js} | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) rename src/ol/webgl/{Context.js => Helper.js} (99%) diff --git a/src/ol/renderer/webgl-new/PointsLayer.js b/src/ol/renderer/webgl-new/PointsLayer.js index 431d9cef4a..78f1560745 100644 --- a/src/ol/renderer/webgl-new/PointsLayer.js +++ b/src/ol/renderer/webgl-new/PointsLayer.js @@ -4,7 +4,7 @@ import LayerRenderer from '../Layer'; import WebGLBuffer from '../../webgl/Buffer'; import {DYNAMIC_DRAW, ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, FLOAT} from '../../webgl'; -import WebGLContext, {DefaultAttrib, DefaultUniform} from '../../webgl/Context'; +import WebGLHelper, {DefaultAttrib, DefaultUniform} from '../../webgl/Helper'; import WebGLVertex from "../../webgl/Vertex"; import WebGLFragment from "../../webgl/Fragment"; import GeometryType from "../../geom/GeometryType"; @@ -63,7 +63,7 @@ class WebGLPointsLayerRenderer extends LayerRenderer { const options = opt_options || {}; - this.context_ = new WebGLContext({ + this.context_ = new WebGLHelper({ postProcessingShader: options.postProcessingShader }); diff --git a/src/ol/webgl/Context.js b/src/ol/webgl/Helper.js similarity index 99% rename from src/ol/webgl/Context.js rename to src/ol/webgl/Helper.js index 3f197c97c5..212f880068 100644 --- a/src/ol/webgl/Context.js +++ b/src/ol/webgl/Helper.js @@ -1,5 +1,5 @@ /** - * @module ol/webgl/Context + * @module ol/webgl/Helper */ import {getUid} from '../util.js'; import {EXTENSIONS as WEBGL_EXTENSIONS} from '../webgl.js'; @@ -78,7 +78,7 @@ const FRAMEBUFFER_FRAGMENT_SHADER = ` * Will handle attributes, uniforms, buffers, textures, frame buffers. * The context will always render to a frame buffer in order to allow post-processing. */ -class WebGLContext extends Disposable { +class WebGLHelper extends Disposable { /** */ @@ -202,8 +202,6 @@ class WebGLContext extends Disposable { this.renderTargetAttribLocation_ = gl.getAttribLocation(this.renderTargetProgram_, 'a_position'); this.renderTargetUniformLocation_ = gl.getUniformLocation(this.renderTargetProgram_, 'u_screenSize'); this.renderTargetTextureLocation_ = gl.getUniformLocation(this.renderTargetProgram_, 'u_image'); - - this.aa = this.createEmptyTexture(256, 256); } /** @@ -628,4 +626,4 @@ export function createEmptyTexture(gl, width, height, opt_wrapS, opt_wrapT) { export function createTexture(gl, image, opt_wrapS, opt_wrapT) { } -export default WebGLContext; +export default WebGLHelper;