Merge pull request #7528 from processing/splineProperties

Add splineProperties

Author: davepagurek

src/core/p5.Renderer.js

@@ -170,6 +170,16 @@ class Renderer {
     this.updateShapeProperties();
   }
 
+  splineProperties(values) {
+    if (values) {
+      for (const key in values) {
+        this.splineProperty(key, values[key]);
+      }
+    } else {
+      return { ...this.states.splineProperties };
+    }
+  }
+
   splineVertex(x, y, z = 0, u = 0, v = 0) {
     const position = new Vector(x, y, z);
     const textureCoordinates = this.getSupportedIndividualVertexProperties().textureCoordinates

src/shape/custom_shapes.js

@@ -836,6 +836,16 @@ class Shape {
     this._splineProperties[key] = value;
   }
 
+  splineProperties(values) {
+    if (values) {
+      for (const key in values) {
+        this.splineProperty(key, values[key]);
+      }
+    } else {
+      return this._splineProperties;
+    }
+  }
+
   /*
   To-do: Maybe refactor #createVertex() since this has side effects that aren't advertised
   in the method name?
@@ -1597,12 +1607,20 @@ function customShapes(p5, fn) {
   /**
    * TODO: documentation
    * @param {String} key
-   * @param value
+   * @param [value]
    */
   fn.splineProperty = function(key, value) {
     return this._renderer.splineProperty(key, value);
   };
 
+  /**
+   * TODO: documentation
+   * @param {Object} [values]
+   */
+  fn.splineProperties = function(values) {
+    return this._renderer.splineProperties(values);
+  };
+
   /**
    * Adds a vertex to a custom shape.
    *

test/unit/core/rendering.js

@@ -1,5 +1,5 @@
 import p5 from '../../../src/app.js';
-import { vi } from 'vitest';
+import { vi, expect } from 'vitest';
 
 suite('Rendering', function() {
   var myp5;
@@ -185,7 +185,7 @@ suite('Rendering', function() {
             try {
               expect(function() {
                 myp5[webglMethod].call(myp5);
-              }).to.throw(Error, /is only supported in WEBGL mode/);
+              }).toThrow(Error, /is only supported in WEBGL mode/);
             } finally {
               myp5.validateParameters = validateParamters;
             }
@@ -194,4 +194,18 @@ suite('Rendering', function() {
       );
     }
   });
+
+  suite('spline functions', function() {
+    test('setting via splineProperty()', function() {
+      myp5.splineProperty('tightness', 2);
+      expect(myp5.splineProperty('tightness')).toEqual(2);
+      expect(myp5.splineProperties()).toMatchObject({ tightness: 2 });
+    });
+
+    test('setting via splineProperties()', function() {
+      myp5.splineProperties({ tightness: 2 });
+      expect(myp5.splineProperty('tightness')).toEqual(2);
+      expect(myp5.splineProperties()).toMatchObject({ tightness: 2 });
+    });
+  });
 });