From 03bc94f481ebfc15edfa5b23d3c95450d93161dd Mon Sep 17 00:00:00 2001 From: Dave Pagurek Date: Sun, 22 Jan 2023 10:49:33 -0500 Subject: [PATCH] Pass options into renderers and fix antialiased depth --- BlurRenderer.js | 4 ++-- ContactShadowRenderer.js | 4 ++-- GaussianBlurRenderer.js | 4 ++-- examples/shadows/sketch.js | 2 +- examples/simple/sketch.js | 2 +- p5.Framebuffer.js | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/BlurRenderer.js b/BlurRenderer.js index 43eb061..f616642 100644 --- a/BlurRenderer.js +++ b/BlurRenderer.js @@ -49,8 +49,8 @@ class BlurRenderer extends Renderer { } } -p5.prototype.createBlurRenderer = function() { - return new BlurRenderer(this) +p5.prototype.createBlurRenderer = function(options) { + return new BlurRenderer(this, options) } BlurRenderer.vert = ` diff --git a/ContactShadowRenderer.js b/ContactShadowRenderer.js index f7a6877..23ce418 100644 --- a/ContactShadowRenderer.js +++ b/ContactShadowRenderer.js @@ -134,8 +134,8 @@ class ContactShadowRenderer extends Renderer { } } -p5.prototype.createContactShadowRenderer = function() { - return new ContactShadowRenderer(this) +p5.prototype.createContactShadowRenderer = function(options) { + return new ContactShadowRenderer(this, options) } ContactShadowRenderer.vert = ` diff --git a/GaussianBlurRenderer.js b/GaussianBlurRenderer.js index ce8e46e..3f277ee 100644 --- a/GaussianBlurRenderer.js +++ b/GaussianBlurRenderer.js @@ -60,8 +60,8 @@ class GaussianBlurRenderer extends BlurRenderer { } } -p5.prototype.createGaussianBlurRenderer = function() { - return new GaussianBlurRenderer(this) +p5.prototype.createGaussianBlurRenderer = function(options) { + return new GaussianBlurRenderer(this, options) } GaussianBlurRenderer.frag = ` diff --git a/examples/shadows/sketch.js b/examples/shadows/sketch.js index 54a715f..4a24cce 100644 --- a/examples/shadows/sketch.js +++ b/examples/shadows/sketch.js @@ -2,7 +2,7 @@ let contactShadowRenderer function setup() { createCanvas(600, 600, WEBGL) - contactShadowRenderer = createContactShadowRenderer() + contactShadowRenderer = createContactShadowRenderer({ antialias: true }) contactShadowRenderer.setIntensity(0.9) contactShadowRenderer.setExponent(500) contactShadowRenderer.setSearchRadius(100) diff --git a/examples/simple/sketch.js b/examples/simple/sketch.js index 63ecc18..577a89f 100644 --- a/examples/simple/sketch.js +++ b/examples/simple/sketch.js @@ -2,7 +2,7 @@ let fbo function setup() { createCanvas(400, 400, WEBGL) - fbo = createFramebuffer() + fbo = createFramebuffer({ antialias: true }) } function draw() { diff --git a/p5.Framebuffer.js b/p5.Framebuffer.js index d03f47f..163cdcb 100644 --- a/p5.Framebuffer.js +++ b/p5.Framebuffer.js @@ -501,7 +501,7 @@ class Framebuffer { if (this.antialias && this._renderer.hasWebGL2) { gl.bindFramebuffer(gl.READ_FRAMEBUFFER, this.aaFramebuffer) gl.bindFramebuffer(gl.DRAW_FRAMEBUFFER, this.framebuffer) - for (const [flag, filter] of [[gl.COLOR_BUFFER_BIT, gl.LINEAR, gl.DEPTH_BUFFER_BIT, gl.NEAREST]]) { + for (const [flag, filter] of [[gl.COLOR_BUFFER_BIT, gl.LINEAR], [gl.DEPTH_BUFFER_BIT, gl.NEAREST]]) { gl.blitFramebuffer( 0, 0, this.width * this.density * this.aaDensity, this.height * this.density * this.aaDensity,