Skip to content

Setuniform #6474

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
davepagurek merged 10 commits into from
Oct 16, 2023
Merged

Setuniform #6474

Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0787bf1
spacing corrected
Garavitey Oct 12, 2023
2f0b448
Merge branch 'main' of https://github.com/Gaurav-1306/p5.js
Garavitey Oct 15, 2023
34461f4
added if statement to not throw error
Garavitey Oct 15, 2023
4775dec
minor indentation changes
Garavitey Oct 15, 2023
f261506
minor changes
Garavitey Oct 15, 2023
0fba290
minor changes
Garavitey Oct 15, 2023
64a3652
Update sketch.js
Garavitey Oct 15, 2023
e46b16b
Update sketch.js
Garavitey Oct 15, 2023
ead09ac
Update p5.RendererGL.Immediate.js
Garavitey Oct 16, 2023
332ab1e
Update src/webgl/p5.RendererGL.Immediate.js
Garavitey Oct 16, 2023
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
6 changes: 6 additions & 0 deletions src/webgl/p5.RendererGL.Immediate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ p5.RendererGL.prototype.vertex = function(x, y) {
u /= this._tex.width;
v /= this._tex.height;
}
} if (
(this.userFillShader !== undefined ||
Copy link
Contributor

@davepagurek davepagurek Oct 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a minor style comment: I think we can take out the extra set of brackets around the if condition.

Copy link
Contributor Author

@Garavitey Garavitey Oct 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Let me make the changes!

this.userStrokeShader !== undefined ||
this.userPointShader !== undefined)
) {
// Do nothing if user-defined shaders are present
} else if (
this._tex === null &&
arguments.length >= 4
Expand Down