Skip to content

lights() and specularMaterial() support on framebuffer block when filter is applied inside the block. #6596

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

Merged
merged 1 commit into from
Nov 30, 2023
Merged

lights() and specularMaterial() support on framebuffer block when filter is applied inside the block. #6596

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/webgl/p5.Geometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ p5.Geometry = class Geometry {
* let points = [];
*
* function setup() {
* createCanvas(600, 600, WEBGL);
* createCanvas(100, 100, WEBGL);
* points.push(new p5.Vector(-1, -1, 0), new p5.Vector(-1, 1, 0),
* new p5.Vector(1, -1, 0), new p5.Vector(-1, -1, 0));
* buildShape01();
Expand Down
3 changes: 3 additions & 0 deletions src/webgl/p5.RendererGL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,6 +1095,7 @@ p5.RendererGL = class RendererGL extends p5.Renderer {
this.filterShader.setUniform('tex0', target);
this._pInst.clear();
this._pInst.shader(this.filterShader);
this._pInst.noLights();
this._pInst.rect(-target.width / 2,
-target.height / 2, target.width, target.height);
});
Expand All @@ -1105,6 +1106,7 @@ p5.RendererGL = class RendererGL extends p5.Renderer {
this.filterShader.setUniform('tex0', tmp);
this._pInst.clear();
this._pInst.shader(this.filterShader);
this._pInst.noLights();
this._pInst.rect(-target.width / 2,
-target.height / 2, target.width, target.height);
});
Expand All @@ -1122,6 +1124,7 @@ p5.RendererGL = class RendererGL extends p5.Renderer {
// filterParameter uniform only used for POSTERIZE, and THRESHOLD
// but shouldn't hurt to always set
this.filterShader.setUniform('filterParameter', filterParameter);
this._pInst.noLights();
this._pInst.rect(-target.width / 2, -target.height / 2,
target.width, target.height);
});
Expand Down