p5 2.2.2 → 2.2.3-rc.1

package/dist/{main-DDs4QOnh.js → main-DFpoFdvM.js}

@@ -1,9 +1,9 @@
-import { P as P2D, ac as WEBGL, B as BLEND, al as _DEFAULT_FILL, am as _DEFAULT_STROKE, w as ROUND, b as REMOVE, S as SUBTRACT, D as DARKEST, L as LIGHTEST, an as DIFFERENCE, M as MULTIPLY, E as EXCLUSION, a as SCREEN, R as REPLACE, ao as OVERLAY, ap as HARD_LIGHT, aq as SOFT_LIGHT, ar as DODGE, as as BURN, A as ADD, at as PIE, au as CHORD, q as TWO_PI, x as SQUARE, y as PROJECT, z as BEVEL, I as MITER, a9 as RIGHT, v as CENTER, av as LEFT, aw as BOTTOM, ax as BASELINE, ay as TOP, Q as OPEN, az as VERSION, a3 as constants } from './constants-BxjhKpTv.js';
+import { P as P2D, ac as WEBGL, B as BLEND, al as _DEFAULT_FILL, am as _DEFAULT_STROKE, w as ROUND, b as REMOVE, S as SUBTRACT, D as DARKEST, L as LIGHTEST, an as DIFFERENCE, M as MULTIPLY, E as EXCLUSION, a as SCREEN, R as REPLACE, ao as OVERLAY, ap as HARD_LIGHT, aq as SOFT_LIGHT, ar as DODGE, as as BURN, A as ADD, at as PIE, au as CHORD, q as TWO_PI, x as SQUARE, y as PROJECT, z as BEVEL, I as MITER, a9 as RIGHT, v as CENTER, av as LEFT, aw as BOTTOM, ax as BASELINE, ay as TOP, Q as OPEN, az as VERSION, a3 as constants } from './constants-BUwWryrh.js';
 import transform from './core/transform.js';
 import structure from './core/structure.js';
 import environment from './core/environment.js';
-import { G as Graphics, k as rendering, n as graphics } from './rendering-C9g7uSQ5.js';
-import { R as Renderer, I as Image, r as renderer } from './p5.Renderer-BSGddFv7.js';
+import { G as Graphics, k as rendering, n as graphics } from './rendering-DE9-Hl7Y.js';
+import { R as Renderer, I as Image, r as renderer } from './p5.Renderer-D-EuAodU.js';
 import { Element } from './dom/p5.Element.js';
 import { MediaElement } from './dom/p5.MediaElement.js';
 import { b as RGBHDR } from './creating_reading-C7hu6sg1.js';
@@ -1304,30 +1304,7 @@ class p5 {
   constructor(sketch, node) {
     // Apply addon defined decorations
     if(p5.decorations.size > 0){
-      for (const [patternArray, decoration] of p5.decorations) {
-        for(const member in p5.prototype) {
-          // Member must be a function
-          if (typeof p5.prototype[member] !== 'function') continue;
-
-          if (!patternArray.some(pattern => {
-            if (typeof pattern === 'string') {
-              return pattern === member;
-            } else if (pattern instanceof RegExp) {
-              return pattern.test(member);
-            }
-          })) continue;
-
-          p5.prototype[member] = decoration(p5.prototype[member], {
-            kind: 'method',
-            name: member,
-            access: {},
-            static: false,
-            private: false,
-            addInitializer(initializer){}
-          });
-        }
-      }
-
+      decorateClass(p5, p5.decorations);
       p5.decorations.clear();
     }
 
@@ -1419,11 +1396,11 @@ class p5 {
   }
 
   get pixels(){
-    return this._renderer.pixels;
+    return this._renderer?.pixels;
   }
 
   get drawingContext(){
-    return this._renderer.drawingContext;
+    return this._renderer?.drawingContext;
   }
 
   static _registeredAddons = new Set();
@@ -1447,10 +1424,20 @@ class p5 {
   }
 
   static decorations = new Map();
-  static decorateHelper(pattern, decoration){
-    let patternArray = pattern;
-    if (!Array.isArray(pattern)) patternArray = [pattern];
-    p5.decorations.set(patternArray, decoration);
+  static registerDecorator(pattern, decoration){
+    if(typeof pattern === 'string'){
+      const patternStr = pattern;
+      pattern = ({ path }) => patternStr === path;
+    }else if(
+      Array.isArray(pattern) &&
+      pattern.every(value => typeof value === 'string')
+    ){
+      const patternArray = pattern;
+      pattern = ({ path }) => patternArray.includes(path);
+    }else if(typeof pattern !== 'function'){
+      throw new Error('Decorator matching pattern must be a function, a string, or an array of strings');
+    }
+    p5.decorations.set(pattern, decoration);
   }
 
   #customActions = {};
@@ -1691,6 +1678,11 @@ class p5 {
   }
 }
 
+// Attach constants to p5 prototype
+for (const k in constants) {
+  p5.prototype[k] = constants[k];
+}
+
 // Global helper function for binding properties to window in global mode
 function createBindGlobal(instance) {
   return function bindGlobal(property) {
@@ -1781,9 +1773,107 @@ function createBindGlobal(instance) {
   };
 }
 
-// Attach constants to p5 prototype
-for (const k in constants) {
-  p5.prototype[k] = constants[k];
+// Generic function to decorate classes
+function decorateClass(Target, decorations, path){
+  path ??= Target.name;
+  // Static properties
+  for(const key in Target){
+    if(!key.startsWith('_')){
+      for (const [pattern, decorator] of decorations) {
+        if(pattern({ path: `${path}.${key}` })){
+          // Check if method or accessor
+          if(typeof Target[key] === 'function'){
+            const result = decorator(Target[key], {
+              kind: 'method',
+              name: key,
+              static: true
+            });
+            if(result){
+              Object.defineProperty(Target, key, {
+                enumerable: true,
+                writable: true,
+                value: result
+              });
+            }
+          }else {
+            const result = decorator(undefined, {
+              kind: 'field',
+              name: key,
+              static: true
+            });
+            if(result && typeof result === 'function'){
+              Target[key] = result(Target[key]);
+            }
+          }
+        }
+      }
+
+      if(typeof Target[key] === 'function' && Target[key].prototype){
+        decorateClass(Target[key], decorations, `${path}.${key}`);
+      }
+    }
+  }
+
+  // Member properties
+  for(const member of Object.getOwnPropertyNames(Target.prototype)){
+    if(member !== 'constructor' && !member.startsWith('_')){
+      for (const [pattern, decorator] of decorations) {
+        if(pattern({ path: `${path}.prototype.${member}` })){
+          // Check if method or accessor
+          if(typeof Target.prototype[member] === 'function'){
+            const result = decorator(Target.prototype[member], {
+              kind: 'method',
+              name: member,
+              static: false
+            });
+            if(result) {
+              Object.defineProperty(Target.prototype, member, {
+                enumerable: true,
+                writable: true,
+                value: result
+              });
+            }
+          }else {
+            const descriptor = Object.getOwnPropertyDescriptor(
+              Target.prototype,
+              member
+            );
+            if(descriptor.hasOwnProperty('value')){
+              const result = decorator(undefined, {
+                kind: 'field',
+                name: member,
+                static: false
+              });
+              Object.defineProperty(Target.prototype, member, {
+                enumerable: true,
+                writable: true,
+                value: result && typeof result === 'function' ?
+                  result(Target.prototype[member]) :
+                  Target.prototype[member]
+              });
+            }else {
+              const { get, set } = descriptor;
+              const getterResult = decorator(get, {
+                kind: 'getter',
+                name: member,
+                static: false
+              });
+              const setterResult = decorator(set, {
+                kind: 'setter',
+                name: member,
+                static: false
+              });
+              Object.defineProperty(Target.prototype, member, {
+                enumerable: true,
+                get: getterResult ?? get,
+                set: setterResult ?? set
+              });
+            }
+          }
+        }
+      }
+    }
+  }
 }
 
 p5.registerAddon(transform);

package/dist/math/Matrices/Matrix.js

@@ -1,6 +1,6 @@
 import { Vector } from '../p5.Vector.js';
 import { MatrixInterface } from './MatrixInterface.js';
-import '../../constants-BxjhKpTv.js';
+import '../../constants-BUwWryrh.js';
 
 /**
  * @module Math

package/dist/math/Matrices/MatrixNumjs.js

@@ -1,7 +1,7 @@
 import nj from '@d4c/numjs/build/module/numjs.min.js';
 import { Vector } from '../p5.Vector.js';
 import { MatrixInterface } from './MatrixInterface.js';
-import '../../constants-BxjhKpTv.js';
+import '../../constants-BUwWryrh.js';
 
 let isMatrixArray = x => Array.isArray(x);
 if (typeof Float32Array !== 'undefined') {

package/dist/math/index.js

@@ -4,7 +4,7 @@ import random from './random.js';
 import trigonometry from './trigonometry.js';
 import math$1 from './math.js';
 import vector from './p5.Vector.js';
-import '../constants-BxjhKpTv.js';
+import '../constants-BUwWryrh.js';
 
 function math(p5){
   p5.registerAddon(calculation);

package/dist/math/p5.Matrix.js

@@ -1,6 +1,6 @@
 import { Matrix } from './Matrices/Matrix.js';
 import './p5.Vector.js';
-import '../constants-BxjhKpTv.js';
+import '../constants-BUwWryrh.js';
 import './Matrices/MatrixInterface.js';
 
 /**

package/dist/math/p5.Vector.js

@@ -1,4 +1,4 @@
-import { q as TWO_PI } from '../constants-BxjhKpTv.js';
+import { q as TWO_PI } from '../constants-BUwWryrh.js';
 
 /**
  * @module Math

package/dist/math/trigonometry.js

@@ -1,4 +1,4 @@
-import { a5 as RAD_TO_DEG, a6 as DEG_TO_RAD } from '../constants-BxjhKpTv.js';
+import { a5 as RAD_TO_DEG, a6 as DEG_TO_RAD } from '../constants-BUwWryrh.js';
 
 /**
  * @module Math

package/dist/{p5.Renderer-BSGddFv7.js → p5.Renderer-D-EuAodU.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-BxjhKpTv.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-BUwWryrh.js';
 import Filters from './image/filters.js';
 import { Vector } from './math/p5.Vector.js';
 import { Shape } from './shape/custom_shapes.js';
@@ -2317,7 +2317,14 @@ class Renderer {
     this._pInst = pInst;
     this._isMainCanvas = isMainCanvas;
     this.pixels = [];
-    this._pixelDensity = Math.ceil(window.devicePixelRatio) || 1;
+
+    if (isMainCanvas) {
+      this._pixelDensity = Math.ceil(window.devicePixelRatio) || 1;
+    } else {
+      
+      const parentDensity = pInst._pInst?._renderer?._pixelDensity;
+      this._pixelDensity = parentDensity || Math.ceil(window.devicePixelRatio) || 1;
+    }
 
     this.width = w;
     this.height = h;