Skip to content

Commit 5579bb8

Browse files
authored
Merge pull request #7887 from LalitNarayanYadav/patch-7
Alias GLSL's mix function as lerp in p5.strands (#7875)
2 parents 3eae276 + bb32895 commit 5579bb8

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

src/webgl/ShaderGenerator.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { ancestor } from 'acorn-walk';
99
import escodegen from 'escodegen';
1010

1111
function shadergenerator(p5, fn) {
12+
1213
let GLOBAL_SHADER;
1314
let BRANCH;
1415

@@ -1618,7 +1619,19 @@ function shadergenerator(p5, fn) {
16181619
}
16191620
}
16201621
})
1622+
// Alias GLSL's mix function as lerp in p5.strands
1623+
// Bridging p5.js lerp and GLSL mix for consistency in shader expressions
1624+
const originalLerp = fn.lerp;
1625+
fn.lerp = function (...args) {
1626+
if (GLOBAL_SHADER?.isGenerating) {
1627+
return this.mix(...args); // Use mix inside p5.strands
1628+
} else {
1629+
return originalLerp.apply(this, args); // Fallback to normal p5.js lerp
1630+
}
1631+
};
16211632
}
1633+
1634+
16221635

16231636
export default shadergenerator;
16241637

0 commit comments

Comments
 (0)