ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow custom post processing & improve blending

Browse Source
This commit is contained in:
Olivier Guyot
2018-11-15 16:33:19 +01:00
parent 298af9ca0f
commit 51becf1c2e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/webgl-new/PointsLayer.js
+3 -1
View File
@@ -63,7 +63,9 @@ class WebGLPointsLayerRenderer extends LayerRenderer {
const options = opt_options || {}; const options = opt_options || {};
this.context_ = new WebGLContext(); this.context_ = new WebGLContext({
postProcessingShader: options.postProcessingShader
});
this.sourceRevision_ = -1; this.sourceRevision_ = -1;
src/ol/webgl/Context.js
+6 -4
View File
@@ -82,8 +82,9 @@ class WebGLContext extends Disposable {
/** /**
*/ */
constructor() { constructor(opt_options) {
super(); super();
const options = opt_options || {};
/** /**
* @private * @private
@@ -185,7 +186,7 @@ class WebGLContext extends Disposable {
// compile the program for the frame buffer // compile the program for the frame buffer
const vertexShader = new WebGLVertex(FRAMEBUFFER_VERTEX_SHADER); const vertexShader = new WebGLVertex(FRAMEBUFFER_VERTEX_SHADER);
const fragmentShader = new WebGLFragment(FRAMEBUFFER_FRAGMENT_SHADER); const fragmentShader = new WebGLFragment(options.postProcessingShader || FRAMEBUFFER_FRAGMENT_SHADER);
this.renderTargetProgram_ = this.getProgram(fragmentShader, vertexShader); this.renderTargetProgram_ = this.getProgram(fragmentShader, vertexShader);
// bind the vertices buffer for the frame buffer // bind the vertices buffer for the frame buffer
@@ -315,7 +316,7 @@ class WebGLContext extends Disposable {
gl.clearColor(0.0, 0.0, 0.0, 0.0); gl.clearColor(0.0, 0.0, 0.0, 0.0);
gl.clear(gl.COLOR_BUFFER_BIT); gl.clear(gl.COLOR_BUFFER_BIT);
gl.enable(gl.BLEND); gl.enable(gl.BLEND);
gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA); gl.blendFunc(gl.ONE, gl.ONE_MINUS_SRC_ALPHA);
gl.viewport(0, 0, canvas.width, canvas.height); gl.viewport(0, 0, canvas.width, canvas.height);
} }
@@ -348,7 +349,8 @@ class WebGLContext extends Disposable {
// render the frame buffer to the canvas // render the frame buffer to the canvas
gl.clearColor(0.0, 0.0, 0.0, 0.0); gl.clearColor(0.0, 0.0, 0.0, 0.0);
gl.clear(gl.COLOR_BUFFER_BIT); gl.clear(gl.COLOR_BUFFER_BIT);
gl.disable(gl.BLEND); gl.enable(gl.BLEND);
gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA);
gl.viewport(0, 0, canvas.width, canvas.height); gl.viewport(0, 0, canvas.width, canvas.height);
this.bindBuffer(gl.ARRAY_BUFFER, this.renderTargetVerticesBuffer_); this.bindBuffer(gl.ARRAY_BUFFER, this.renderTargetVerticesBuffer_);