p5 2.0.0 → 2.0.1

package/{src → dist}/type/p5.Font.js

@@ -1,47 +1,25 @@
-/**
- * @module Typography
- */
-
-import { textCoreConstants } from './textCore';
-import * as constants from '../core/constants';
+import { textCoreConstants } from './textCore.js';
+import { C as CENTER, R as RIGHT, a as RADIUS } from '../constants-C-g_eAdC.js';
 import { UnicodeRange } from '@japont/unicode-range';
-import { unicodeRanges } from './unicodeRanges';
-
-/*
-  API:
-     loadFont("https://fonts.googleapis.com/css2?family=Bricolage+Grotesque:opsz,wght@12..96,200..800&display=swap")
-     loadFont("@font-face { font-family: "Bricolage Grotesque", serif; font-optical-sizing: auto; font-weight: <weight> font-style: normal; font-variation-settings: "wdth" 100; });
-     loadFont({
-         fontFamily: '"Bricolage Grotesque", serif';
-         fontOpticalSizing: 'auto';
-         fontWeight: '<weight>';
-         fontStyle: 'normal';
-         fontVariationSettings: '"wdth" 100';
-     });
-     loadFont("https://fonts.gstatic.com/s/bricolagegrotesque/v1/pxiAZBhjZQIdd8jGnEotWQ.woff2");
-     loadFont("./path/to/localFont.ttf");
-     loadFont("system-font-name");
-
-
-    NEXT:
-      extract axes from font file
-
-    TEST:
-     const font = new FontFace("Inter", "url(./fonts/inter-latin-variable-full-font.woff2)", {
-        style: "oblique 0deg 10deg",
-        weight: "100 900",
-        display: 'fallback'
-      });
-*/
+import { unicodeRanges } from './unicodeRanges.js';
+import Typr from './lib/Typr.js';
+import { createFromCommands } from '@davepagurek/bezier-path';
+import '../p5.Renderer-CwAYZOC2.js';
+import '../creating_reading-D4AAKRbx.js';
+import 'colorjs.io/fn';
+import '../color/color_spaces/hsb.js';
+import '../image/filters.js';
+import '../math/p5.Vector.js';
+import '../shape/custom_shapes.js';
+import '../core/States.js';
+import '../io/utilities.js';
+import 'file-saver';
+import 'pako';
 
-/*
-  This module defines the <a href="#/p5.Font">p5.Font</a> class and p5 methods for
-  loading fonts from files and urls, and extracting points from their paths.
+/**
+ * @module Typography
  */
 
-import Typr from './lib/Typr.js';
-
-import { createFromCommands } from '@davepagurek/bezier-path';
 
 const pathArgCounts = { M: 2, L: 2, C: 6, Q: 4 };
 const validFontTypes = ['ttf', 'otf', 'woff'];//, 'woff2'];
@@ -52,7 +30,7 @@ const fontFaceVariations = ['weight', 'stretch', 'style'];
 
 
 let nextId = 0;
-export class Font {
+class Font {
   constructor(p, fontFace, name, path, data) {
     if (!(fontFace instanceof FontFace)) {
       throw Error('FontFace is required');
@@ -723,7 +701,7 @@ export class Font {
         subdivide(pts, pt1, middle, md);
         subdivide(pts, middle, pt2, md);
       }
-    }
+    };
 
     // a point for each path-command plus line subdivisions
     let pts = [];
@@ -733,7 +711,7 @@ export class Font {
     for (let i = 0; i < cmds.length; i++) {
       let { type, data: d } = cmds[i];
       if (type !== 'Z') {
-        let pt = { x: d[d.length - 2], y: d[d.length - 1] }
+        let pt = { x: d[d.length - 2], y: d[d.length - 1] };
         if (type === 'L' && pts.length && !options?.nodivide > 0) {
           subdivide(pts, pts[pts.length - 1], pt, maxDist);
         }
@@ -767,26 +745,26 @@ export class Font {
       let x = bounds.x;
       let y = bounds.y + (i * textLeading) + ascent;
       let lineWidth = renderer._fontWidthSingle(text);
-      if (textAlign === constants.CENTER) {
+      if (textAlign === CENTER) {
         x += (bounds.w - lineWidth) / 2;
       }
-      else if (textAlign === constants.RIGHT) {
+      else if (textAlign === RIGHT) {
         x += (bounds.w - lineWidth);
       }
       if (typeof width !== 'undefined') {
         switch (renderer.states.rectMode) {
-          case constants.CENTER:
+          case CENTER:
             x -= width / 2;
             y -= height / 2;
             break;
-          case constants.RADIUS:
+          case RADIUS:
             x -= width;
             y -= height;
             break;
         }
       }
       return { text, x, y };
-    }
+    };
 
     return lines.map(coordify);
   }
@@ -1023,8 +1001,7 @@ function extractFontName(font, path) {
   }
 
   return result;
-};
-
+}
 function pathToPoints(cmds, options, font) {
 
   const parseOpts = (options, defaults) => {
@@ -1038,12 +1015,12 @@ function pathToPoints(cmds, options, font) {
       }
     }
     return options;
-  }
+  };
 
   const at = (v, i) => {
     const s = v.length;
     return v[i < 0 ? i % s + s : i % s];
-  }
+  };
 
   const simplify = (pts, angle) => {
     angle = angle || 0;
@@ -1055,7 +1032,7 @@ function pathToPoints(cmds, options, font) {
       }
     }
     return num;
-  }
+  };
 
   const path = createFromCommands(arrayCommandsToObjects(cmds));
   let opts = parseOpts(options, {
@@ -1359,7 +1336,7 @@ function font(p5, fn) {
                 if (urlMatch) {
                   let url = urlMatch[1];
                   if (/^['"]/.exec(url) && url.at(0) === url.at(-1)) {
-                    url = url.slice(1, -1)
+                    url = url.slice(1, -1);
                   }
                   fontData = await fn.parseFontData(url);
                 }
@@ -1416,7 +1393,7 @@ function font(p5, fn) {
           descriptorOverlap > closestDescriptorOverlap ||
           (descriptorOverlap === closestDescriptorOverlap && rangeOverlap >= closestRangeOverlap)
         ) {
-          closestDescriptorOverlap = descriptorOverlap
+          closestDescriptorOverlap = descriptorOverlap;
           closestRangeOverlap = rangeOverlap;
           closestMatch = font;
         }
@@ -1462,11 +1439,10 @@ function font(p5, fn) {
     if (success) return success(pfont);
 
     return pfont;
-  }
-};
-
+  };
+}
 // Convert arrays to named objects
-export const arrayCommandsToObjects = (commands) => commands.map((command) => {
+const arrayCommandsToObjects = (commands) => commands.map((command) => {
   const type = command[0];
   switch (type) {
     case 'Z': {
@@ -1491,8 +1467,8 @@ export const arrayCommandsToObjects = (commands) => commands.map((command) => {
   }
 });
 
-export default font;
-
 if (typeof p5 !== 'undefined') {
   font(p5, p5.prototype);
 }
+
+export { Font, arrayCommandsToObjects, font as default };

package/{src → dist}/type/textCore.js

@@ -1,11 +1,22 @@
+import { R as Renderer } from '../p5.Renderer-CwAYZOC2.js';
+import '../creating_reading-D4AAKRbx.js';
+import 'colorjs.io/fn';
+import '../color/color_spaces/hsb.js';
+import '../constants-C-g_eAdC.js';
+import '../image/filters.js';
+import '../math/p5.Vector.js';
+import '../shape/custom_shapes.js';
+import '../core/States.js';
+import '../io/utilities.js';
+import 'file-saver';
+
 /**
  * @module Typography
  * @requires core
  */
 
-import { Renderer } from '../core/p5.Renderer';
 
-export const textCoreConstants = {
+const textCoreConstants = {
   IDEOGRAPHIC: 'ideographic',
   RIGHT_TO_LEFT: 'rtl',
   LEFT_TO_RIGHT: 'ltr',
@@ -15,7 +26,7 @@ export const textCoreConstants = {
   HANGING: 'hanging',
   START: 'start',
   END: 'end',
-}
+};
 
 function textCore(p5, fn) {
   const LeadingScale = 1.275;
@@ -1571,7 +1582,7 @@ function textCore(p5, fn) {
 
   Renderer.prototype._currentTextFont = function () {
     return this.states.textFont.font || this.states.textFont.family;
-  }
+  };
 
   /**
    * Set the font and [size] and [options] for rendering text
@@ -1628,7 +1639,7 @@ function textCore(p5, fn) {
     }
 
     return this._applyTextProperties();
-  }
+  };
 
   Renderer.prototype._directSetFontString = function (font, debug = 0) {
     if (debug) console.log('_directSetFontString"' + font + '"');
@@ -1647,7 +1658,7 @@ function textCore(p5, fn) {
     });
 
     return { family: style.fontFamily, size: style.fontSize };
-  }
+  };
 
   Renderer.prototype.textLeading = function (leading) {
     // the setter
@@ -1658,7 +1669,7 @@ function textCore(p5, fn) {
     }
     // the getter
     return this.states.textLeading;
-  }
+  };
 
   Renderer.prototype.textWeight = function (weight) {
     // the setter
@@ -1676,7 +1687,7 @@ function textCore(p5, fn) {
     }
     // the getter
     return this.states.fontWeight;
-  }
+  };
 
   /**
    * @param {*} size - the size of the text, can be a number or a css-style string
@@ -1691,7 +1702,7 @@ function textCore(p5, fn) {
     }
     // the getter
     return this.states.textSize;
-  }
+  };
 
   Renderer.prototype.textStyle = function (style) {
 
@@ -1702,7 +1713,7 @@ function textCore(p5, fn) {
     }
     // the getter
     return this.states.fontStyle;
-  }
+  };
 
   Renderer.prototype.textWrap = function (wrapStyle) {
 
@@ -1818,7 +1829,7 @@ function textCore(p5, fn) {
 
   Renderer.prototype._currentTextFont = function () {
     return this.states.textFont.font || this.states.textFont.family;
-  }
+  };
 
   /*
     Compute the bounds for a block of text based on the specified
@@ -1868,13 +1879,6 @@ function textCore(p5, fn) {
       }
     }
 
-    if (0 && opts?.ignoreRectMode) boxes.forEach((b, i) => { // draw bounds for debugging
-      let ss = context.strokeStyle;
-      context.strokeStyle = 'green';
-      context.strokeRect(bounds.x, bounds.y, bounds.w, bounds.h);
-      context.strokeStyle = ss;
-    });
-
     context.textBaseline = setBaseline; // restore baseline
 
     return { bounds, lines };
@@ -1901,7 +1905,7 @@ function textCore(p5, fn) {
       }
     }
     return { x, y, width, height };
-  }
+  };
 
   /*
     Attempts to set a property directly on the canvas.style object
@@ -1922,14 +1926,7 @@ function textCore(p5, fn) {
     this.textCanvas().style[opt] = value;
 
     // check if the value was set successfully
-    if (this.textCanvas().style[opt] !== value) {
-
-      // fails on precision for floating points, also quotes and spaces
-
-      if (0) console.warn(`Unable to set '${opt}' property` // FES?
-        + ' on canvas.style. It may not be supported. Expected "'
-        + value + '" but got: "' + this.textCanvas().style[opt] + "'");
-    }
+    if (this.textCanvas().style[opt] !== value) ;
   };
 
   /*
@@ -1958,25 +1955,6 @@ function textCore(p5, fn) {
             if (this.states.fontWeight !== val) this.textWeight(val);
             return val;
           case 'wdth':
-            if (0) { // attempt to map font-stretch to allowed keywords
-              const FontStretchMap = {
-                "ultra-condensed": 50,
-                "extra-condensed": 62.5,
-                "condensed": 75,
-                "semi-condensed": 87.5,
-                "normal": 100,
-                "semi-expanded": 112.5,
-                "expanded": 125,
-                "extra-expanded": 150,
-                "ultra-expanded": 200,
-              };
-              let values = Object.values(FontStretchMap);
-              const indexArr = values.map(function (k) { return Math.abs(k - val) })
-              const min = Math.min.apply(Math, indexArr)
-              let idx = indexArr.indexOf(min);
-              let stretch = Object.keys(FontStretchMap)[idx];
-              this.states.setValue('fontStretch', stretch);
-            }
             break;
           case 'ital':
             if (debug) console.log('setting font-style=' + (val ? 'italic' : 'normal'));
@@ -2085,7 +2063,7 @@ function textCore(p5, fn) {
       cachedDiv = ele;
     }
     return cachedDiv;
-  }
+  };
 
 
   /*
@@ -2180,7 +2158,7 @@ function textCore(p5, fn) {
       default:
         return 0;
     }
-  }
+  };
 
   /*
     Align the bounding box based on the current rectMode setting
@@ -2206,7 +2184,7 @@ function textCore(p5, fn) {
       }
       return bb;
     }
-  }
+  };
 
   Renderer.prototype._rectModeAlignRevert = function (bb, width, height) {
     if (typeof width !== 'undefined') {
@@ -2229,7 +2207,7 @@ function textCore(p5, fn) {
       }
       return bb;
     }
-  }
+  };
 
   /*
     Get the (tight) width of a single line of text
@@ -2270,8 +2248,7 @@ function textCore(p5, fn) {
     let asc = metrics.fontBoundingBoxAscent;
     let desc = metrics.fontBoundingBoxDescent;
     x -= this._xAlignOffset(this.states.textAlign, metrics.width);
-    return { x, y: y - asc, w: metrics.width, h: asc + desc };;
-  };
+    return { x, y: y - asc, w: metrics.width, h: asc + desc };  };
 
   /*
     Set the textSize property in `this.states` if it has changed
@@ -2401,7 +2378,7 @@ function textCore(p5, fn) {
       }
     }
     return true;
-  }
+  };
 
   /*
     Apply the text properties in `this.states` to the `this.textDrawingContext()`
@@ -2539,7 +2516,7 @@ function textCore(p5, fn) {
       }
       dataArr.forEach(ele => ele.y += yOff);
       return dataArr;
-    }
+    };
   }
 
   if (p5.RendererGL) {
@@ -2627,12 +2604,12 @@ function textCore(p5, fn) {
       yOff += this.states.textFont.font?._verticalAlign(textSize) || 0; // Does this function exist?
       dataArr.forEach(ele => ele.y += yOff);
       return dataArr;
-    }
+    };
   }
 }
 
-export default textCore;
-
 if (typeof p5 !== 'undefined') {
   textCore(p5, p5.prototype);
 }
+
+export { textCore as default, textCoreConstants };

package/{src → dist}/type/unicodeRanges.js

@@ -1,7 +1,7 @@
 // From https://github.com/radiovisual/unicode-range-json,
 // with decimal ranges removed to save space, and with category
 // names converted to lowercase ahead of time
-export const unicodeRanges = [
+const unicodeRanges = [
   {
     category: "control character",
     hexrange: ["0000", "001f"],
@@ -1319,3 +1319,5 @@ export const unicodeRanges = [
     hexrange: ["100000", "10ffff"],
   },
 ];
+
+export { unicodeRanges };

package/{src → dist}/utilities/conversion.js

@@ -1043,8 +1043,8 @@ function conversion(p5, fn){
   };
 }
 
-export default conversion;
-
 if(typeof p5 !== 'undefined'){
   conversion(p5, p5.prototype);
 }
+
+export { conversion as default };

package/{src → dist}/utilities/index.js

@@ -2,8 +2,10 @@ import conversion from './conversion.js';
 import utilityFunctions from './utility_functions.js';
 import timeDate from './time_date.js';
 
-export default function(p5){
+function utilities(p5){
   p5.registerAddon(conversion);
   p5.registerAddon(utilityFunctions);
   p5.registerAddon(timeDate);
 }
+
+export { utilities as default };

package/{src → dist}/utilities/time_date.js

@@ -117,11 +117,10 @@ function timeDate(p5, fn){
    *
    * If a sketch has a
    * <a href="#/p5/setup">setup()</a> function, then `millis()` begins tracking
-   * time before the code in <a href="#/p5/setup">setup()</a> runs. If a
-   * sketch includes a <a href="#/p5/preload">preload()</a> function, then
-   * `millis()` begins tracking time as soon as the code in
-   * <a href="#/p5/preload">preload()</a> starts running.
-   *
+   * time before the code in <a href="#/p5/setup">setup()</a> runs.  If a
+   * sketch includes asynchronous loading using `async`/`await`, then
+   * `millis()` begins tracking time as soon as the asynchronous code
+   * starts running.
    * @method millis
    * @return {Number} number of milliseconds since starting the sketch.
    *
@@ -339,8 +338,8 @@ function timeDate(p5, fn){
   };
 }
 
-export default timeDate;
-
 if(typeof p5 !== 'undefined'){
   timeDate(p5, p5.prototype);
 }
+
+export { timeDate as default };

package/{src → dist}/utilities/utility_functions.js

@@ -778,8 +778,8 @@ function utilityFunctions(p5, fn){
   };
 }
 
-export default utilityFunctions;
-
 if(typeof p5 !== 'undefined'){
   utilityFunctions(p5, p5.prototype);
 }
+
+export { utilityFunctions as default };

package/dist/webgl/3d_primitives.js

@@ -0,0 +1,40 @@
+import '../constants-C-g_eAdC.js';
+export { p as default } from '../rendering--aAe5aq3.js';
+import '../math/p5.Vector.js';
+import './p5.Geometry.js';
+import '../math/p5.Matrix.js';
+import '../math/Matrices/Matrix.js';
+import '../creating_reading-D4AAKRbx.js';
+import 'colorjs.io/fn';
+import '../color/color_spaces/hsb.js';
+import '../dom/p5.Element.js';
+import '../dom/p5.File.js';
+import '../io/p5.XML.js';
+import '../p5.Renderer-CwAYZOC2.js';
+import '../image/filters.js';
+import '../shape/custom_shapes.js';
+import '../core/States.js';
+import '../io/utilities.js';
+import 'file-saver';
+import '../dom/p5.MediaElement.js';
+import '../shape/2d_primitives.js';
+import '../core/helpers.js';
+import '../shape/attributes.js';
+import '../shape/curves.js';
+import '../shape/vertex.js';
+import '../color/setting.js';
+import 'omggif';
+import '../io/csv.js';
+import 'gifenc';
+import '../image/pixels.js';
+import '../core/transform.js';
+import './GeometryBuilder.js';
+import '../math/Matrices/MatrixInterface.js';
+import './p5.DataArray.js';
+import './p5.Quat.js';
+import './p5.RenderBuffer.js';
+import './ShapeBuilder.js';
+import 'libtess';
+import './GeometryBufferCache.js';
+import '../image/const.js';
+import '../math/trigonometry.js';

package/{src → dist}/webgl/GeometryBufferCache.js

@@ -1,4 +1,4 @@
-export class GeometryBufferCache {
+class GeometryBufferCache {
   constructor(renderer) {
     this.renderer = renderer;
     this.cache = {};
@@ -107,3 +107,5 @@ export class GeometryBufferCache {
     freeBuffers(this.renderer.buffers.user);
   }
 }
+
+export { GeometryBufferCache };

package/{src → dist}/webgl/GeometryBuilder.js

@@ -1,6 +1,10 @@
-import * as constants from '../core/constants';
-import { Matrix } from '../math/p5.Matrix';
-import { Geometry } from './p5.Geometry';
+import { r as TRIANGLE_STRIP, s as QUAD_STRIP, q as TRIANGLE_FAN } from '../constants-C-g_eAdC.js';
+import '../math/p5.Matrix.js';
+import { Geometry } from './p5.Geometry.js';
+import { Matrix } from '../math/Matrices/Matrix.js';
+import '../math/p5.Vector.js';
+import '../math/Matrices/MatrixInterface.js';
+import './p5.DataArray.js';
 
 /**
  * @private
@@ -69,7 +73,7 @@ class GeometryBuilder {
       if (propName in inputUserVertexProps){
         continue;
       }
-      const prop = builtUserVertexProps[propName]
+      const prop = builtUserVertexProps[propName];
       const size = prop.getDataSize();
       const numMissingValues = size * input.vertices.length;
       const missingValues = Array(numMissingValues).fill(0);
@@ -113,8 +117,8 @@ class GeometryBuilder {
 
     if (this.renderer.states.fillColor) {
       if (
-        shapeMode === constants.TRIANGLE_STRIP ||
-        shapeMode === constants.QUAD_STRIP
+        shapeMode === TRIANGLE_STRIP ||
+        shapeMode === QUAD_STRIP
       ) {
         for (let i = 2; i < geometry.vertices.length; i++) {
           if (i % 2 === 0) {
@@ -123,7 +127,7 @@ class GeometryBuilder {
             faces.push([i, i - 2, i - 1]);
           }
         }
-      } else if (shapeMode === constants.TRIANGLE_FAN) {
+      } else if (shapeMode === TRIANGLE_FAN) {
         for (let i = 2; i < geometry.vertices.length; i++) {
           faces.push([0, i - 1, i]);
         }
@@ -161,4 +165,4 @@ class GeometryBuilder {
  */
 GeometryBuilder.nextGeometryId = 0;
 
-export default GeometryBuilder;
+export { GeometryBuilder as default };