Merge branch 'dev-2.0' into fix/strands-int

Author: ksen0

src/shape/2d_primitives.js

@@ -760,7 +760,10 @@ function primitives(p5, fn){
    *   createCanvas(100, 100);
    *
    *   background(200);
-   *
+   *   
+   *   // Making point to 5 pixels
+   *   strokeWeight(5);
+   * 
    *   // Top-left.
    *   point(30, 20);
    *
@@ -786,6 +789,9 @@ function primitives(p5, fn){
    *   createCanvas(100, 100);
    *
    *   background(200);
+   * 
+   *   // Making point to 5 pixels.
+   *   strokeWeight(5);
    *
    *   // Top-left.
    *   point(30, 20);
@@ -816,6 +822,9 @@ function primitives(p5, fn){
    *   createCanvas(100, 100);
    *
    *   background(200);
+   * 
+   *   // Making point to 5 pixels.
+   *   strokeWeight(5);
    *
    *   // Top-left.
    *   let a = createVector(30, 20);

src/shape/custom_shapes.js

@@ -2286,18 +2286,114 @@ function customShapes(p5, fn) {
   };
 
   /**
-   * Get or set multiple spline properties at once.
-   *
-   * Similar to <a href="#/p5/splineProperty">splineProperty()</a>:
-   * `splineProperty('tightness', t)` is the same as
-   * `splineProperties({'tightness': t})`
+   * Sets multiple properties for spline curves at once.
+   *
+   * `splineProperties()` accepts an object with key-value pairs to configure
+   * how spline curves are drawn. This is a convenient way to set multiple
+   * spline properties with a single function call, rather than calling
+   * <a href="#/p5/splineProperty">splineProperty()</a> multiple times.
+   *
+   * The properties object can include:
+   * - `tightness`: A number that controls how tightly the curve fits to the
+   *   vertex points. The default value is 0. Positive values make the curve
+   *   tighter (straighter), while negative values make it looser. Values
+   *   between -5 and 5 work best.
+   * - `ends`: Controls whether to draw the end segments of the spline. Set to
+   *   `EXCLUDE` to skip drawing the segments between the first and second
+   *   points and between the second-to-last and last points. This is useful
+   *   when you want to use the first and last points as control points only.
+   *
+   * `splineProperties()` affects curves drawn with
+   * <a href="#/p5/splineVertex">splineVertex()</a> within
+   * <a href="#/p5/beginShape">beginShape()</a> and
+   * <a href="#/p5/endShape">endShape()</a>, as well as curves drawn with
+   * <a href="#/p5/spline">spline()</a>. The properties remain active until
+   * changed by another call to `splineProperties()` or
+   * <a href="#/p5/splineProperty">splineProperty()</a>.
    *
    * @method splineProperties
-   * @param {Object} properties An object containing key-value pairs to set.
-   */
-  /**
+   * @param  {Object} values an object containing spline property key-value pairs
+   * @chainable
+   *
+   * @example
+   * <div>
+   * <code>
+   * function setup() {
+   *   createCanvas(100, 100);
+   *   background(220);
+   *
+   *   // Set spline tightness using splineProperties
+   *   splineProperties({
+   *     tightness: 0.5
+   *   });
+   *
+   *   // Draw a spline curve
+   *   noFill();
+   *   stroke(0);
+   *   strokeWeight(2);
+   *   
+   *   beginShape();
+   *   splineVertex(20, 80);
+   *   splineVertex(30, 30);
+   *   splineVertex(70, 30);
+   *   splineVertex(80, 80);
+   *   endShape();
+   *
+   *   // Show vertex points
+   *   fill(255, 0, 0);
+   *   noStroke();
+   *   circle(20, 80, 6);
+   *   circle(30, 30, 6);
+   *   circle(70, 30, 6);
+   *   circle(80, 80, 6);
+   *
+   *   describe('A smooth curved line with tightness 0.5 connecting four red points.');
+   * }
+   * </code>
+   * </div>
+   *
+   * @example
+   * <div>
+   * <code>
+   * function setup() {
+   *   createCanvas(100, 100);
+   *   background(220);
+   *
+   *   // Exclude end segments - first and last points become control points
+   *   splineProperties({
+   *     tightness: 0,
+   *     ends: EXCLUDE
+   *   });
+   *
+   *   // Draw curve only between middle points
+   *   noFill();
+   *   stroke(0);
+   *   strokeWeight(2);
+   *   
+   *   beginShape();
+   *   splineVertex(10, 50);  // Control point (affects curve but not drawn to)
+   *   splineVertex(30, 20);  // Start of visible curve
+   *   splineVertex(70, 80);  // End of visible curve
+   *   splineVertex(90, 50);  // Control point (affects curve but not drawn to)
+   *   endShape();
+   *
+   *   // Show all points
+   *   fill(200, 0, 0);
+   *   noStroke();
+   *   circle(10, 50, 6);  // Control point
+   *   circle(90, 50, 6);  // Control point
+   *   
+   *   fill(0, 0, 255);
+   *   circle(30, 20, 6);  // Visible curve point
+   *   circle(70, 80, 6);  // Visible curve point
+   *
+   *   describe('A curved line between two blue points, with red control points at the ends.');
+   * }
+   * </code>
+   * </div>
+   *
    * @method splineProperties
-   * @returns {Object} The current spline properties.
+   * @return {Object}
    */
   fn.splineProperties = function(values) {
     return this._renderer.splineProperties(values);

src/strands/p5.strands.js

@@ -65,39 +65,41 @@ function strands(p5, fn) {
 
   p5.Shader.prototype.modify = function(shaderModifier, scope = {}) {
     if (shaderModifier instanceof Function) {
-      // Reset the context object every time modify is called;
-      // const backend = glslBackend;
-      initStrandsContext(strandsContext, glslBackend, { active: true });
-      createShaderHooksFunctions(strandsContext, fn, this);
-      // TODO: expose this, is internal for debugging for now.
-      const options = { parser: true, srcLocations: false };
+      try {
+        // Reset the context object every time modify is called;
+        // const backend = glslBackend;
+        initStrandsContext(strandsContext, glslBackend, { active: true });
+        createShaderHooksFunctions(strandsContext, fn, this);
+        // TODO: expose this, is internal for debugging for now.
+        const options = { parser: true, srcLocations: false };
 
-      // 1. Transpile from strands DSL to JS
-      let strandsCallback;
-      if (options.parser) {
-        // #7955 Wrap function declaration code in brackets so anonymous functions are not top level statements, which causes an error in acorn when parsing
-        // https://github.com/acornjs/acorn/issues/1385
-        const sourceString = `(${shaderModifier.toString()})`;
-        strandsCallback = transpileStrandsToJS(p5, sourceString, options.srcLocations, scope);
-      } else {
-        strandsCallback = shaderModifier;
-      }
-
-      // 2. Build the IR from JavaScript API
-      const globalScope = createBasicBlock(strandsContext.cfg, BlockType.GLOBAL);
-      pushBlock(strandsContext.cfg, globalScope);
-      strandsCallback();
-      popBlock(strandsContext.cfg);
+        // 1. Transpile from strands DSL to JS
+        let strandsCallback;
+        if (options.parser) {
+          // #7955 Wrap function declaration code in brackets so anonymous functions are not top level statements, which causes an error in acorn when parsing
+          // https://github.com/acornjs/acorn/issues/1385
+          const sourceString = `(${shaderModifier.toString()})`;
+          strandsCallback = transpileStrandsToJS(p5, sourceString, options.srcLocations, scope);
+        } else {
+          strandsCallback = shaderModifier;
+        }
 
-      // 3. Generate shader code hooks object from the IR
-      // .......
-      const hooksObject = generateShaderCode(strandsContext);
+        // 2. Build the IR from JavaScript API
+        const globalScope = createBasicBlock(strandsContext.cfg, BlockType.GLOBAL);
+        pushBlock(strandsContext.cfg, globalScope);
+        strandsCallback();
+        popBlock(strandsContext.cfg);
 
-      // Reset the strands runtime context
-      deinitStrandsContext(strandsContext);
+        // 3. Generate shader code hooks object from the IR
+        // .......
+        const hooksObject = generateShaderCode(strandsContext);
 
-      // Call modify with the generated hooks object
-      return oldModify.call(this, hooksObject);
+        // Call modify with the generated hooks object
+        return oldModify.call(this, hooksObject);
+      } finally {
+        // Reset the strands runtime context
+        deinitStrandsContext(strandsContext);
+      }
     }
     else {
       return oldModify.call(this, shaderModifier)