Add a couple more color spaces for testing

processing · Dec 8, 2024 · 364813d · 364813d
1 parent 8cc09a0
commit 364813d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 25 deletions.
diff --git a/src/color/creating_reading.js b/src/color/creating_reading.js
@@ -9,15 +9,19 @@
 import { Color } from './p5.Color';
 
 export const RGB = 'rgb';
+export const RGBHDR = 'rgbhdr';
 export const HSB = 'hsb';
 export const HSL = 'hsl';
-export const RGBHDR = 'rgbhdr';
+export const LCH = 'lch';
+export const OKLCH = 'oklch';
 export const RGBA = 'rgba';
 
 function creatingReading(p5, fn){
   fn.RGB = RGB;
   fn.HSB = HSB;
   fn.HSL = HSL;
+  fn.LCH = LCH;
+  fn.OKLCH = OKLCH;
   fn.RGBA = RGBA;
 
   // Set color related defaults
@@ -27,7 +31,9 @@ function creatingReading(p5, fn){
     [RGB]: [255, 255, 255, 255],
     [RGBHDR]: [255, 255, 255, 255],
     [HSB]: [360, 100, 100, 1],
-    [HSL]: [360, 100, 100, 1]
+    [HSL]: [360, 100, 100, 1],
+    [LCH]: [100, 150, 360, 1],
+    [OKLCH]: [100, 150, 360, 1]
   };
 
   /**

diff --git a/src/color/p5.Color.js b/src/color/p5.Color.js
@@ -6,7 +6,7 @@
  * @requires color_conversion
  */
 
-import { RGB, RGBHDR, HSL, HSB } from './creating_reading';
+import { RGB, RGBHDR, HSL, HSB, LCH, OKLCH } from './creating_reading';
 
 import {
   ColorSpace,
@@ -21,10 +21,10 @@ import {
   HSV,
 
   Lab,
-  LCH,
+  LCH as LCHSpace,
 
   OKLab,
-  OKLCH,
+  OKLCH as OKLCHSpace,
 
   P3,
 
@@ -532,27 +532,13 @@ function color(p5, fn){
    */
   p5.Color = Color;
 
-  // ColorSpace.register(sRGB);
-  // ColorSpace.register(HSLSpace);
-  // ColorSpace.register(HSV);
-  // ColorSpace.register(HSBSpace);
-
-  // ColorSpace.register(Lab);
-  // ColorSpace.register(LCH);
-
-  // ColorSpace.register(OKLab);
-  // ColorSpace.register(OKLCH);
-
-  // ColorSpace.register(P3);
-
-  // ColorSpace.register(A98RGB_Linear);
-  // ColorSpace.register(A98RGB);
-
   // Register color modes and initialize Color maxes to what p5 has set for itself
   p5.Color.addColorMode(RGB, sRGB, fn._colorMaxes?.[RGB]);
   p5.Color.addColorMode(RGBHDR, P3, fn._colorMaxes?.[RGBHDR]);
   p5.Color.addColorMode(HSB, HSBSpace, fn._colorMaxes?.[HSB]);
   p5.Color.addColorMode(HSL, HSLSpace, fn._colorMaxes?.[HSL]);
+  p5.Color.addColorMode(LCH, LCHSpace, fn._colorMaxes?.[LCH]);
+  p5.Color.addColorMode(OKLCH, OKLCHSpace, fn._colorMaxes?.[OKLCH]);
 }
 
 export default color;

diff --git a/src/color/setting.js b/src/color/setting.js
@@ -7,7 +7,7 @@
  */
 
 import * as constants from '../core/constants';
-import { RGB, HSB, HSL } from './creating_reading';
+import { RGB, RGBHDR, HSL, HSB, LCH, OKLCH } from './creating_reading';
 
 function setting(p5, fn){
   /**
@@ -951,9 +951,7 @@ function setting(p5, fn){
   fn.colorMode = function(mode, max1, max2, max3, maxA) {
     p5._validateParameters('colorMode', arguments);
     if (
-      mode === RGB ||
-      mode === HSB ||
-      mode === HSL
+      [RGB, RGBHDR, HSB, HSL, LCH, OKLCH].includes(mode)
     ) {
       // Set color mode.
       this._colorMode = mode;