Merge pull request #9014 from NalinDalal/main

Fixes #9000

Author: limzykenneth

src/color/p5.Color.js

@@ -319,7 +319,7 @@ class Color {
     return this._array;
   }
 
-  lerp(color, amt, mode){
+  lerp(color, amt, mode) {
     let lerpMode = mode;
     if (typeof amt === 'object') {
       // Passing in options object
@@ -726,13 +726,7 @@ class Color {
   }
 
   _getRGBA(maxes = [1, 1, 1, 1]) {
-    // Get colorjs maxes
     const colorjsMaxes = Color.#colorjsMaxes[RGB];
-
-    // Normalize everything to 0,1 or the provided range (map)
-    let coords = structuredClone(to(this._color, 'srgb').coords);
-    coords.push(this._color.alpha);
-
     const rangeMaxes = maxes.map(v => {
       if (!Array.isArray(v)) {
         return [0, v];
@@ -741,7 +735,15 @@ class Color {
       }
     });
 
-    coords = coords.map((coord, i) => {
+    let coords;
+    if (this.mode === RGB) {
+      coords = [...this._color.coords, this._color.alpha];
+    } else {
+      coords = structuredClone(to(this._color, 'srgb').coords);
+      coords.push(this._color.alpha);
+    }
+
+    return coords.map((coord, i) => {
       return map(
         coord,
         colorjsMaxes[i][0],
@@ -750,8 +752,6 @@ class Color {
         rangeMaxes[i][1]
       );
     });
-
-    return coords;
   }
 
   _getMode() {

test/bench/color_getrgba.bench.js

@@ -0,0 +1,38 @@
+import { bench, describe } from 'vitest';
+import p5 from '../../src/app';
+
+describe('p5.Graphics.set() performance', () => {
+  const options = { iterations: 3, time: 2000 };
+  const W = 100;
+  const H = 100;
+  const FRAMES = 50;
+
+  bench(
+    'set() hot loop',
+    async () => {
+      let myp5;
+      new p5(function (p) {
+        p.setup = function () {
+          myp5 = p;
+        };
+      });
+      await vi.waitFor(() => {
+        if (myp5 === undefined) throw new Error('not ready');
+      });
+
+      const buf = myp5.createGraphics(W, H);
+      const col = myp5.color(255, 0, 0);
+
+      for (let f = 0; f < FRAMES; f++) {
+        for (let y = 0; y < H; y++) {
+          for (let x = 0; x < W; x++) {
+            buf.set(x, y, col);
+          }
+        }
+      }
+
+      myp5.remove();
+    },
+    options
+  );
+});

test/bench/color_getrgba_fes_off.bench.js

@@ -0,0 +1,48 @@
+import { bench, describe } from 'vitest';
+import p5 from '../../src/app';
+
+// Mirrors the minified build, where FES is excluded from the bundle.
+// Set inside the timed callback so the flag does not leak into other
+// benchmark files sharing this process.
+describe('p5.Graphics.set() performance (FES off)', () => {
+  const options = { iterations: 10, time: 2000 };
+  const W = 100;
+  const H = 100;
+  const FRAMES = 50;
+
+  bench(
+    'set() hot loop',
+    async () => {
+      const previousFES = p5.disableFriendlyErrors;
+      p5.disableFriendlyErrors = true;
+
+      try {
+        let myp5;
+        new p5(function (p) {
+          p.setup = function () {
+            myp5 = p;
+          };
+        });
+        await vi.waitFor(() => {
+          if (myp5 === undefined) throw new Error('not ready');
+        });
+
+        const buf = myp5.createGraphics(W, H);
+        const col = myp5.color(255, 0, 0);
+
+        for (let f = 0; f < FRAMES; f++) {
+          for (let y = 0; y < H; y++) {
+            for (let x = 0; x < W; x++) {
+              buf.set(x, y, col);
+            }
+          }
+        }
+
+        myp5.remove();
+      } finally {
+        p5.disableFriendlyErrors = previousFES;
+      }
+    },
+    options
+  );
+});