p5 2.2.3 → 2.3.0-rc.1

package/dist/math/patch-vector.js

@@ -0,0 +1,75 @@
+import { Vector } from './p5.Vector.js';
+import '../constants-0wkVUfqa.js';
+
+/**
+ * @private
+ * @internal
+ */
+function _defaultEmptyVector(target){
+  return function(...args){
+    if(args.length === 0){
+      this._friendlyError(
+        'In 1.x, createVector() was a shortcut for createVector(0, 0, 0). In 2.x, p5.js has vectors of any dimension, so you must provide your desired number of zeros. Use createVector(0, 0) for a 2D vector and createVector(0, 0, 0) for a 3D vector.',
+        'p5.createVector'
+      );
+      return target.call(this, 0, 0, 0);
+    }else {
+      if (Array.isArray(args[0])) {
+        args = args[0];
+      }
+      return target.call(this, ...args);
+    }
+  };
+}
+
+
+/**
+ * @private
+ * @internal
+ */
+function _validatedVectorOperation(expectsSoloNumberArgument){
+  return function(target){
+    return function(...args){
+      if (args.length === 0) {
+        // No arguments? No action
+        return this;
+      } else if (args[0] instanceof Vector) {
+        // First argument is a vector? Make it an array
+        args = args[0].values;
+      } else if (Array.isArray(args[0])) {
+        // First argument is an array? Great, keep it!
+        args = args[0];
+      } else if (expectsSoloNumberArgument && args.length === 1){
+        // Special case for a solo numeric arguments only applies sometimes
+        args = new Array(3).fill(args[0]);
+      }
+
+      if(Array.isArray(args) && !args.every(v => typeof v === 'number' && Number.isFinite(v))){
+        this._friendlyError(
+          'Arguments contain non-finite numbers',
+          target.name
+        );
+        return this;
+      }
+      return target.call(this, ...args);
+    };
+  };
+}
+
+/**
+ * Each of the following decorators validates the data on vector operations.
+ * These ensure that the arguments are consistently formatted, and that
+ * pre-conditions are met.
+ */
+function vectorValidation(p5, fn, lifecycles){
+
+  p5.registerDecorator('p5.prototype.createVector', _defaultEmptyVector);
+  p5.registerDecorator('p5.Vector.prototype.mult', _validatedVectorOperation(true));
+  p5.registerDecorator('p5.Vector.prototype.rem', _validatedVectorOperation(true));
+  p5.registerDecorator('p5.Vector.prototype.div', _validatedVectorOperation(true));
+  p5.registerDecorator('p5.Vector.prototype.add', _validatedVectorOperation(false));
+  p5.registerDecorator('p5.Vector.prototype.sub', _validatedVectorOperation(false));
+
+}
+
+export { _defaultEmptyVector, _validatedVectorOperation, vectorValidation as default };

package/dist/math/random.js

@@ -2,7 +2,6 @@
  * @module Math
  * @submodule Random
  * @for p5
- * @requires core
  */
 
 function random(p5, fn){

package/dist/math/trigonometry.js

@@ -1,11 +1,9 @@
-import { a5 as RAD_TO_DEG, a6 as DEG_TO_RAD } from '../constants-BdTiYOQI.js';
+import { a3 as RAD_TO_DEG, a4 as DEG_TO_RAD } from '../constants-0wkVUfqa.js';
 
 /**
  * @module Math
  * @submodule Trigonometry
  * @for p5
- * @requires core
- * @requires constants
  */
 
 
@@ -775,7 +773,8 @@ function trigonometry(p5, fn){
    * @returns {Number}
    */
   fn._toRadians = function(angle) {
-    if (this._angleMode === DEGREES) {
+    // returns undefined if no argument
+    if (typeof angle !== 'undefined' && this._angleMode === DEGREES) {
       return angle * DEG_TO_RAD;
     }
     return angle;

package/dist/{p5.Renderer-BmD2P6Wv.js → p5.Renderer-CQI8PO1F.js}

@@ -1,5 +1,5 @@
-import { C as Color } from './creating_reading-C7hu6sg1.js';
-import { a2 as NORMAL, aA as WORD, ax as BASELINE, av as LEFT, v as CENTER, p as CORNER, J as INCLUDE } from './constants-BdTiYOQI.js';
+import { C as Color } from './creating_reading-DLkHH80h.js';
+import { a1 as NORMAL, aA as WORD, ax as BASELINE, av as LEFT, t as CENTER, n as CORNER, I as INCLUDE } from './constants-0wkVUfqa.js';
 import Filters from './image/filters.js';
 import { Vector } from './math/p5.Vector.js';
 import { Shape } from './shape/custom_shapes.js';
@@ -9,9 +9,6 @@ import { _checkFileExtension, downloadFile } from './io/utilities.js';
 /**
  * @module Image
  * @submodule Image
- * @requires core
- * @requires constants
- * @requires filters
  */
 
 
@@ -32,6 +29,9 @@ class Image {
     this.pixels = [];
   }
 
+  // This will get overwritten when exported as part of p5.
+  _friendlyError(_e) {}
+
   /**
    * Gets or sets the pixel density for high pixel density displays.
    *
@@ -1601,7 +1601,7 @@ class Image {
         props.displayIndex = index;
         this.drawingContext.putImageData(props.frames[index].image, 0, 0);
       } else {
-        p5._friendlyError(
+        this._friendlyError(
           'Cannot set GIF to a frame number that is higher than total number of frames or below zero.',
           'setFrame'
         );
@@ -2099,6 +2099,8 @@ function image(p5, fn){
    */
   p5.Image = Image;
 
+  Image.prototype._friendlyError = p5._friendlyError;
+
   /**
    * The image's width in pixels.
    *
@@ -2291,6 +2293,11 @@ class Renderer {
     rectMode: CORNER,
     ellipseMode: CENTER,
     strokeWeight: 1,
+    bezierOrder: 3,
+    splineProperties: new ClonableObject({
+      ends: INCLUDE,
+      tightness: 0
+    }),
 
     textFont: { family: 'sans-serif' },
     textLeading: 15,
@@ -2298,15 +2305,8 @@ class Renderer {
     textSize: 12,
     textAlign: LEFT,
     textBaseline: BASELINE,
-    bezierOrder: 3,
-    splineProperties: new ClonableObject({
-      ends: INCLUDE,
-      tightness: 0
-    }),
     textWrap: WORD,
-
-    // added v2.0
-    fontStyle: NORMAL, // v1: textStyle
+    fontStyle: NORMAL, // v1: was textStyle
     fontStretch: NORMAL,
     fontWeight: NORMAL,
     lineHeight: NORMAL,
@@ -2319,12 +2319,14 @@ class Renderer {
     this._isMainCanvas = isMainCanvas;
     this.pixels = [];
 
+    const defaultRatio = typeof window !== 'undefined' ?
+      Math.ceil(window.devicePixelRatio) :
+      1;
     if (isMainCanvas) {
-      this._pixelDensity = Math.ceil(window.devicePixelRatio) || 1;
+      this._pixelDensity = defaultRatio;
     } else {
-      
       const parentDensity = pInst._pInst?._renderer?._pixelDensity;
-      this._pixelDensity = parentDensity || Math.ceil(window.devicePixelRatio) || 1;
+      this._pixelDensity = parentDensity || defaultRatio;
     }
 
     this.width = w;
@@ -2381,7 +2383,7 @@ class Renderer {
   // and push it into the push pop stack
   push() {
     this._pushPopDepth++;
-    this._pushPopStack.push(this.states.getDiff());
+    this._pushPopStack.push(this.states.takeDiff());
   }
 
   // Pop the previous states out of the push pop stack and
@@ -2576,9 +2578,12 @@ class Renderer {
   }
 
   fill(...args) {
-    this.states.setValue('fillSet', true);
-    this.states.setValue('fillColor', this._pInst.color(...args));
-    this.updateShapeVertexProperties();
+    if (args.length > 0) {
+      this.states.setValue('fillSet', true);
+      this.states.setValue('fillColor', this._pInst.color(...args));
+      this.updateShapeVertexProperties();
+    }
+    return this.states.fillColor;
   }
 
   noFill() {
@@ -2586,14 +2591,16 @@ class Renderer {
   }
 
   strokeWeight(w) {
-    if (w === undefined) {
+    if (typeof w === 'undefined') {
       return this.states.strokeWeight;
-    } else {
-      this.states.setValue('strokeWeight', w);
     }
+    this.states.setValue('strokeWeight', w);
   }
 
   stroke(...args) {
+    if (args.length === 0) {
+      return this.states.strokeColor;
+    }
     this.states.setValue('strokeSet', true);
     this.states.setValue('strokeColor', this._pInst.color(...args));
     this.updateShapeVertexProperties();