p5 2.2.3 → 2.3.0-rc.1

package/dist/core/environment.js

@@ -1,23 +1,22 @@
-import { j as ARROW, k as CROSS, l as HAND, m as MOVE, n as TEXT, o as WAIT, P as P2D } from '../constants-BdTiYOQI.js';
+import { h as ARROW, i as CROSS, j as HAND, k as MOVE, l as TEXT, m as WAIT, P as P2D } from '../constants-0wkVUfqa.js';
 
 /**
  * @module Environment
  * @submodule Environment
  * @for p5
- * @requires core
- * @requires constants
  */
 
 // import { Vector } from '../math/p5.Vector';
 
 function environment(p5, fn, lifecycles){
   const standardCursors = [ARROW, CROSS, HAND, MOVE, TEXT, WAIT];
+  const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
 
   fn._frameRate = 0;
-  fn._lastFrameTime = window.performance.now();
+  fn._lastFrameTime = globalThis.performance.now();
   fn._targetFrameRate = 60;
 
-  const _windowPrint = window.print;
+  const windowPrint = isBrowser ? window.print : null;
   let windowPrintDisabled = false;
 
   lifecycles.presetup = function(){
@@ -25,11 +24,13 @@ function environment(p5, fn, lifecycles){
       'resize'
     ];
 
-    for(const event of events){
-      window.addEventListener(event, this[`_on${event}`].bind(this), {
-        passive: false,
-        signal: this._removeSignal
-      });
+    if(isBrowser){
+      for(const event of events){
+        window.addEventListener(event, this[`_on${event}`].bind(this), {
+          passive: false,
+          signal: this._removeSignal
+        });
+      }
     }
   };
 
@@ -60,9 +61,9 @@ function environment(p5, fn, lifecycles){
    * }
    */
   fn.print = function(...args) {
-    if (!args.length) {
+    if (!args.length && windowPrint !== null) {
       if (!windowPrintDisabled) {
-        _windowPrint();
+        windowPrint();
         if (
           window.confirm(
             'You just tried to print the webpage. Do you want to prevent this from running again?'
@@ -199,7 +200,7 @@ function environment(p5, fn, lifecycles){
    *   }
    * }
    */
-  fn.focused = document.hasFocus();
+  fn.focused = isBrowser ? document.hasFocus() : true;
 
   /**
    * Changes the cursor's appearance.
@@ -216,6 +217,8 @@ function environment(p5, fn, lifecycles){
    * cursor, `x` and `y` set the location pointed to within the image. They are
    * both 0 by default, so the cursor points to the image's top-left corner. `x`
    * and `y` must be less than the image's width and height, respectively.
+   * 
+   * Calling `cursor()` without an argument returns the current cursor type as a string.
    *
    * @method cursor
    * @param {(ARROW|CROSS|HAND|MOVE|TEXT|WAIT|String)} type Built-in: either ARROW, CROSS, HAND, MOVE, TEXT, or WAIT.
@@ -282,9 +285,17 @@ function environment(p5, fn, lifecycles){
    *   }
    * }
    */
+  /**
+   * @method cursor
+   * @return {(ARROW|CROSS|HAND|MOVE|TEXT|WAIT|String)} the current cursor type
+   */
   fn.cursor = function(type, x, y) {
     let cursor = 'auto';
     const canvas = this._curElement.elt;
+    if (typeof type === 'undefined') {
+      let curstr = canvas.style.cursor;
+      return curstr.length ? curstr : 'default';
+    }
     if (standardCursors.includes(type)) {
       // Standard css cursor
       cursor = type;
@@ -571,7 +582,7 @@ function environment(p5, fn, lifecycles){
    * @alt
    * This example does not render anything.
    */
-  fn.displayWidth = screen.width;
+  fn.displayWidth = isBrowser ? window.screen.width : 0;
 
   /**
    * A `Number` variable that stores the height of the screen display.
@@ -599,7 +610,7 @@ function environment(p5, fn, lifecycles){
    * @alt
    * This example does not render anything.
    */
-  fn.displayHeight = screen.height;
+  fn.displayHeight = isBrowser ? window.screen.height : 0;
 
   /**
    * A `Number` variable that stores the width of the browser's viewport.
@@ -725,21 +736,11 @@ function environment(p5, fn, lifecycles){
   };
 
   function getWindowWidth() {
-    return (
-      window.innerWidth ||
-      (document.documentElement && document.documentElement.clientWidth) ||
-      (document.body && document.body.clientWidth) ||
-      0
-    );
+    return isBrowser ? document.documentElement.clientWidth : 0;
   }
 
   function getWindowHeight() {
-    return (
-      window.innerHeight ||
-      (document.documentElement && document.documentElement.clientHeight) ||
-      (document.body && document.body.clientHeight) ||
-      0
-    );
+    return isBrowser ? document.documentElement.clientHeight : 0;
   }
 
   /**
@@ -799,7 +800,6 @@ function environment(p5, fn, lifecycles){
    * }
    */
   fn.fullscreen = function(val) {
-    // p5._validateParameters('fullscreen', arguments);
     // no arguments, return fullscreen or not
     if (typeof val === 'undefined') {
       return (
@@ -870,7 +870,6 @@ function environment(p5, fn, lifecycles){
    * @returns {Number} current pixel density of the sketch.
    */
   fn.pixelDensity = function(val) {
-    // p5._validateParameters('pixelDensity', arguments);
     let returnValue;
     if (typeof val === 'number') {
       if (val !== this._renderer._pixelDensity) {

package/dist/core/filterShaders.js

@@ -1,4 +1,4 @@
-import { ag as OPAQUE, ah as DILATE, ai as ERODE, ab as BLUR, af as POSTERIZE, ae as THRESHOLD, aj as INVERT, ak as GRAY } from '../constants-BdTiYOQI.js';
+import { ah as OPAQUE, ai as DILATE, aj as ERODE, ac as BLUR, ag as POSTERIZE, af as THRESHOLD, ak as INVERT, al as GRAY } from '../constants-0wkVUfqa.js';
 
 /*
  * Creates p5.strands filter shaders for cross-platform compatibility.

package/dist/core/friendly_errors/fes_core.js

@@ -1,12 +1,11 @@
 import { translator } from '../internationalization.js';
 import strings from './browser_errors.js';
-import { a3 as constants } from '../../constants-BdTiYOQI.js';
+import { am as constants } from '../../constants-0wkVUfqa.js';
 import 'i18next';
 import 'i18next-browser-languagedetector';
 
 /**
  * @for p5
- * @requires core
  *
  * This is the main file for the Friendly Error System (FES), containing
  * the core as well as miscellaneous functionality of the FES. Here is a
@@ -29,7 +28,7 @@ import 'i18next-browser-languagedetector';
  * https://github.com/processing/p5.js/blob/main/contributor_docs/fes_reference_dev_notes.md
  */
 
-function fesCore(p5, fn){
+function fesCore(p5, fn, lifecycles){
   // p5.js blue, p5.js orange, auto dark green; fallback p5.js darkened magenta
   // See testColors below for all the color codes and names
   const typeColors = ['#2D7BB6', '#EE9900', '#4DB200', '#C83C00'];
@@ -942,9 +941,11 @@ function fesCore(p5, fn){
     p5._fesLogger = null;
     p5._fesLogCache = {};
 
-    window.addEventListener('load', checkForUserDefinedFunctions, false);
-    window.addEventListener('error', p5._fesErrorMonitor, false);
-    window.addEventListener('unhandledrejection', p5._fesErrorMonitor, false);
+    lifecycles.presetup = function () {
+      window.addEventListener('load', checkForUserDefinedFunctions, false);
+      window.addEventListener('error', p5._fesErrorMonitor, false);
+      window.addEventListener('unhandledrejection', p5._fesErrorMonitor, false);
+    };
 
     /**
      * Prints out all the colors in the color pallete with white text.
@@ -1104,7 +1105,7 @@ function fesCore(p5, fn){
   // Exposing this primarily for unit testing.
   fn._helpForMisusedAtTopLevelCode = helpForMisusedAtTopLevelCode;
 
-  if (document.readyState !== 'complete') {
+  if (typeof document !== 'undefined' && document.readyState !== 'complete') {
     window.addEventListener('error', helpForMisusedAtTopLevelCode, false);
 
     // Our job is only to catch ReferenceErrors that are thrown when
@@ -1118,7 +1119,7 @@ function fesCore(p5, fn){
 }
 
 if (typeof p5 !== 'undefined') {
-  fesCore(p5, p5.prototype);
+  p5.registerAddon(fesCore);
 }
 
 export { fesCore as default };

package/dist/core/friendly_errors/file_errors.js

@@ -1,11 +1,10 @@
 import { translator } from '../internationalization.js';
 import 'i18next';
 import 'i18next-browser-languagedetector';
-import '../../constants-BdTiYOQI.js';
+import '../../constants-0wkVUfqa.js';
 
 /**
  * @for p5
- * @requires core
  */
 
 function fileErrors(p5, fn){

package/dist/core/friendly_errors/index.js

@@ -6,7 +6,7 @@ import fileErrors from './file_errors.js';
 import '../internationalization.js';
 import 'i18next';
 import 'i18next-browser-languagedetector';
-import '../../constants-BdTiYOQI.js';
+import '../../constants-0wkVUfqa.js';
 import './browser_errors.js';
 import 'zod/v4';
 import 'acorn';