Skip to content

Alias GLSL's mix function as lerp in p5.strands (#7875) #7887

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 8 commits into from
Jun 16, 2025
Merged

Alias GLSL's mix function as lerp in p5.strands (#7875) #7887

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c395dee
Alias GLSL mix as p5.strands lerp for shader consistency #7875
LalitNarayanYadav Jun 7, 2025
14544ef
Update ShaderGenerator.js
LalitNarayanYadav Jun 7, 2025
f4bfa1a
Update ShaderGenerator.js
LalitNarayanYadav Jun 7, 2025
92f729c
Fix ReferenceError by ensuring 'fn' is defined when registering shade…
LalitNarayanYadav Jun 7, 2025
ffe2f60
Fix ReferenceError by moving 'fn' to module scope in ShaderGenerator.js
LalitNarayanYadav Jun 7, 2025
ea4b3d6
Update ShaderGenerator.js to revert unnecessary changes
LalitNarayanYadav Jun 12, 2025
906b0e0
Update ShaderGenerator.js to revert unnecessary changes
LalitNarayanYadav Jun 12, 2025
bb32895
Update ShaderGenerator.js to revert unnecessary changes
LalitNarayanYadav Jun 12, 2025
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
Prev Previous commit
Next Next commit
Update ShaderGenerator.js to revert unnecessary changes
  • Loading branch information
@LalitNarayanYadav
LalitNarayanYadav authored Jun 12, 2025
commit ea4b3d64d3a9beaf45186fb219dcb696186cd3c7
7 changes: 2 additions & 5 deletions src/webgl/ShaderGenerator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ import escodegen from 'escodegen';

const fn = {};
function shadergenerator(p5, fn) {
if (!fn || typeof fn !== 'object') {
throw new Error("fn is not defined or is not an object. Ensure it is passed correctly to shadergenerator.");
}


let GLOBAL_SHADER;
let BRANCH;

Expand Down Expand Up @@ -1639,5 +1636,5 @@ fn.lerp = function (...args) {
export default shadergenerator;

if (typeof p5 !== 'undefined') {
p5.registerAddon((p5) => shadergenerator(p5, fn));
p5.registerAddon(shadergenerator)
}