Merge remote-tracking branch 'upstream/dev-2.0' into fix/buildGeometry-docs

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: codervinitjangir

package-lock.json

@@ -20,7 +20,7 @@
     "test/**/*.js": "eslint",
     "utils/**/*.{js,mjs}": "eslint"
   },
-  "version": "2.2.3-rc.0",
+  "version": "2.2.3-rc.1",
   "dependencies": {
     "@davepagurek/bezier-path": "^0.0.7",
     "@japont/unicode-range": "^1.0.0",

package.json

@@ -41,7 +41,6 @@ function strands(p5, fn) {
     ctx.vertexDeclarations = new Set();
     ctx.fragmentDeclarations = new Set();
     ctx.hooks = [];
-    ctx.globalAssignments = [];
     ctx.backend = backend;
     ctx.active = active;
     ctx.renderer = renderer;
@@ -63,7 +62,6 @@ function strands(p5, fn) {
     ctx.vertexDeclarations = new Set();
     ctx.fragmentDeclarations = new Set();
     ctx.hooks = [];
-    ctx.globalAssignments = [];
     ctx.active = false;
     p5.disableFriendlyErrors = ctx.previousFES;
     for (const key in ctx.windowOverrides) {
@@ -212,7 +210,7 @@ if (typeof p5 !== "undefined") {
  * }
  *
  * function material() {
- *   let t = uniformFloat();
+ *   let t = millis();
  *   worldInputs.begin();
  *   // Move the vertex up and down in a wave in world space
  *   // In world space, moving the object (e.g., with translate()) will affect these coordinates
@@ -224,7 +222,6 @@ if (typeof p5 !== "undefined") {
  * function draw() {
  *   background(255);
  *   shader(myShader);
- *   myShader.setUniform('t', millis());
  *   lights();
  *   noStroke();
  *   fill('red');
@@ -313,9 +310,7 @@ if (typeof p5 !== "undefined") {
  *          A value between `0.0` and `1.0`
  *
  * @example
- * <div modernizr="webgl">
- * <code>
- * // Example 1: A soft vertical fade using smoothstep (no uniforms)
+ * // Example 1: A soft vertical fade using smoothstep
  *
  * let fadeShader;
  *
@@ -334,31 +329,25 @@ if (typeof p5 !== "undefined") {
  *
  * function setup() {
  *   createCanvas(300, 200, WEBGL);
- *   fadeShader = baseFilterShader().modify(fadeCallback);
+ *   fadeShader = buildFilterShader(fadeCallback);
  * }
  *
  * function draw() {
  *   background(0);
  *   filter(fadeShader);
  * }
- * </code>
- * </div>
  *
  * @example
- * <div modernizr="webgl">
- * <code>
- * // Example 2: Animate the smooth transition using a uniform
+ * // Example 2: Animate the smooth transition over time
  *
  * let animatedShader;
  *
  * function animatedFadeCallback() {
- *   const time = uniformFloat(() => millis() * 0.001);
- *
  *   getColor((inputs) => {
  *     let x = inputs.texCoord.x;
  *
  *     // Move the smoothstep band back and forth over time
- *     let center = 0.5 + 0.25 * sin(time);
+ *     let center = 0.5 + 0.25 * sin(millis() * 0.001);
  *     let t = smoothstep(center - 0.05, center + 0.05, x);
  *
  *     return [t, t, t, 1];
@@ -367,15 +356,13 @@ if (typeof p5 !== "undefined") {
  *
  * function setup() {
  *   createCanvas(300, 200, WEBGL);
- *   animatedShader = baseFilterShader().modify(animatedFadeCallback);
+ *   animatedShader = buildFilterShader(animatedFadeCallback);
  * }
  *
  * function draw() {
  *   background(0);
  *   filter(animatedShader);
  * }
- * </code>
- * </div>
  */
 
 /**
@@ -492,7 +479,7 @@ if (typeof p5 !== "undefined") {
  * }
  *
  * function material() {
- *   let t = uniformFloat();
+ *   let t = millis();
  *   pixelInputs.begin();
  *   // Animate alpha (transparency) based on x position
  *   pixelInputs.color.a = 0.5 + 0.5 *
@@ -503,7 +490,6 @@ if (typeof p5 !== "undefined") {
  * function draw() {
  *   background(240);
  *   shader(myShader);
- *   myShader.setUniform('t', millis());
  *   lights();
  *   noStroke();
  *   fill('purple');
@@ -694,7 +680,7 @@ if (typeof p5 !== "undefined") {
  * }
  *
  * function material() {
- *   let t = uniformFloat();
+ *   let t = millis();
  *   objectInputs.begin();
  *   // Create a sine wave along the object
  *   objectInputs.position.y += sin(t * 0.001 + objectInputs.position.x);
@@ -704,7 +690,6 @@ if (typeof p5 !== "undefined") {
  * function draw() {
  *   background(220);
  *   shader(myShader);
- *   myShader.setUniform('t', millis());
  *   noStroke();
  *   fill('orange');
  *   sphere(50);
@@ -736,7 +721,7 @@ if (typeof p5 !== "undefined") {
  * }
  *
  * function material() {
- *   let t = uniformFloat();
+ *   let t = millis();
  *   cameraInputs.begin();
  *   // Move vertices in camera space based on their x position
  *   cameraInputs.position.y += 30 * sin(cameraInputs.position.x * 0.05 + t * 0.001);
@@ -748,7 +733,6 @@ if (typeof p5 !== "undefined") {
  * function draw() {
  *   background(200);
  *   shader(myShader);
- *   myShader.setUniform('t', millis());
  *   noStroke();
  *   fill('red');
  *   sphere(50);
@@ -795,8 +779,6 @@ if (typeof p5 !== "undefined") {
  * will behave as a vec4 holding components r, g, b, and a (alpha), with each component being in the range 0.0 to 1.0.
  *
  * @example
- * <div modernizr='webgl'>
- * <code>
  * // A filter shader (using p5.strands) which will
  * // sample and invert the color of each pixel
  * // from the canvas.
@@ -829,12 +811,8 @@ if (typeof p5 !== "undefined") {
  *
  *   filterColor.end();
  * }
- * </code>
- *
  *
  * @example
- * <div modernizr='webgl'>
- * <code>
  * // This primitive edge-detection filter samples
  * // and compares the colors of the current pixel
  * // on the canvas, and a little to the right.
@@ -891,8 +869,6 @@ if (typeof p5 !== "undefined") {
  *   rotate(frameCount / 300);
  *   square(0, 0, 30);
  * }
- * </code>
- * </div>
  */
 
 /**

src/strands/p5.strands.js

@@ -427,7 +427,6 @@ export function initGlobalStrandsAPI(p5, fn, strandsContext) {
         typeInfo,
         usedInVertex: false,
         usedInFragment: false,
-        declared: false
       });
 
       return createStrandsNode(id, dimension, strandsContext);

src/strands/strands_api.js

@@ -47,18 +47,6 @@ export function generateShaderCode(strandsContext) {
       backend.generateBlock(blockID, strandsContext, generationContext);
     }
 
-    // Process any unvisited global assignments to ensure side effects are generated
-    for (const assignmentNodeID of strandsContext.globalAssignments) {
-      if (!generationContext.visitedNodes.has(assignmentNodeID)) {
-        // This assignment hasn't been visited yet, so we need to generate it
-        backend.generateAssignment(generationContext, strandsContext.dag, assignmentNodeID);
-        generationContext.visitedNodes.add(assignmentNodeID);
-      }
-    }
-
-    // Reset global assignments for next hook
-    strandsContext.globalAssignments = [];
-
     const firstLine = backend.hookEntry(hookType);
     let returnType;
     if (hookType.returnType.properties) {

src/strands/strands_codegen.js

@@ -69,9 +69,6 @@ export class StrandsNode {
       const assignmentID = getOrCreateNode(dag, assignmentNode);
       recordInBasicBlock(cfg, cfg.currentBlock, assignmentID);
 
-      // Track for global assignments processing
-      this.strandsContext.globalAssignments.push(assignmentID);
-
       // Simply update this node to be a variable node with the identifier
       // This ensures it always generates the variable name in expressions
       const variableNodeData = createNodeData({
@@ -135,9 +132,6 @@ export class StrandsNode {
       const assignmentID = getOrCreateNode(dag, assignmentNode);
       recordInBasicBlock(cfg, cfg.currentBlock, assignmentID);
 
-      // Track for global assignments processing in the current hook context
-      this.strandsContext.globalAssignments.push(assignmentID);
-
       // Simply update this node to be a variable node with the identifier
       // This ensures it always generates the variable name in expressions
       const variableNodeData = createNodeData({