Skip to content

Fix incorrect draw target when applying filter to a framebuffer #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: framebufferTesting
Choose a base branch
from
Open

Fix incorrect draw target when applying filter to a framebuffer #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions src/webgl/p5.RendererGL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,36 +1092,49 @@ p5.RendererGL = class RendererGL extends p5.Renderer {
else {
this.filterShader = args[0];
}
// pg.clear(); // prevent undesirable feedback effects accumulating secretly

let pd = this._pInst.pixelDensity();
let texelSize = [1 / (this.width * pd), 1 / (this.height * pd)];
const target = this.activeFramebuffer() || this;
// TODO: resize pg and change its density here if it doesn't match the target
pg.draw(() => this._pInst.clear()); // prevent undesirable feedback effects accumulating secretly

// apply blur shader with multiple passes
if (operation === constants.BLUR) {
// Removed blur branch.
}
// every other non-blur shader uses single pass
else {
let texelSize = [
1 / (target.width * target.pixelDensity()),
1 / (target.height * target.pixelDensity())
];
pg.draw(() => {
shader(this.filterShader);
this.filterShader.setUniform('tex0', this);
this._pInst.noStroke();
this._pInst.shader(this.filterShader);
this.filterShader.setUniform('tex0', target);
this.filterShader.setUniform('texelSize', texelSize);
this.filterShader.setUniform('canvasSize', [this.width, this.height]);
this.filterShader.setUniform('canvasSize', [target.width, target.height]);
this.filterShader.setUniform('filterParameter', filterParameter);
console.log(this.activeFramebuffers.slice());
rect(-this.width / 2, -this.height / 2, this.width, this.height);
this._pInst.plane(target.width, target.height);
});
}
// draw pg contents onto main renderer
this._pInst.push();
this._pInst.clear();
this._pInst.resetMatrix();
// Also removed filterCamera for now.
this._pInst.image(pg, -this.width / 2, -this.height / 2,
this.width, this.height);
this._pInst.imageMode(constants.CENTER);
this._pInst.image(pg, 0, 0);
this._pInst.pop();
}

// Pass this off to the host instance so that we can treat a renderer and a
// framebuffer the same in filter()
pixelDensity(newDensity) {
if (newDensity) {
return this._pInst.pixelDensity(newDensity);
}
return this._pInst.pixelDensity();
}

blendMode(mode) {
if (
mode === constants.DARKEST ||
Expand Down