From 265f9e7d72ce0a9458e2465f510e20eb5639b2cf Mon Sep 17 00:00:00 2001 From: 23036879 Date: Mon, 2 Sep 2024 13:52:42 +0100 Subject: [PATCH 1/5] Create reference directory for build --- utils/convert.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/convert.js b/utils/convert.js index ee386ae144..f46438bdcf 100644 --- a/utils/convert.js +++ b/utils/convert.js @@ -549,6 +549,10 @@ function buildParamDocs(docs) { out.end(); } +if (!fs.existsSync(path.join(__dirname, '../docs/reference'))) { + fs.mkdirSync(path.join(__dirname, '../docs/reference')); +} + fs.writeFileSync(path.join(__dirname, '../docs/reference/data.json'), JSON.stringify(converted, null, 2)); fs.writeFileSync(path.join(__dirname, '../docs/reference/data.min.json'), JSON.stringify(converted)); buildParamDocs(JSON.parse(JSON.stringify(converted))); From 1ba649f7ca5370e96d239e0ee8c138a13df8ce28 Mon Sep 17 00:00:00 2001 From: 23036879 Date: Mon, 2 Sep 2024 14:08:00 +0100 Subject: [PATCH 2/5] Added compatibility fix so that color refactor doesnt break current WebGL behaviour --- src/color/p5.Color.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/color/p5.Color.js b/src/color/p5.Color.js index b9c2f4313d..98220894f4 100644 --- a/src/color/p5.Color.js +++ b/src/color/p5.Color.js @@ -488,6 +488,10 @@ p5.Color = class Color { return to(this.color, 'hsl').coords[2] / 100 * this.maxes[this.mode][2]; } } + + get levels() { + return [...this.color.coords, this.color.alpha].map(v => v * 255); + } }; export default p5.Color; From f6f878ee1d8f8a856b896fbacf3d61cbe440608d Mon Sep 17 00:00:00 2001 From: 23036879 Date: Mon, 2 Sep 2024 14:09:03 +0100 Subject: [PATCH 3/5] changed script reference to rollup.min.js --- lib/empty-example/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/empty-example/index.html b/lib/empty-example/index.html index 54b1bfdfe2..56c88a89b8 100644 --- a/lib/empty-example/index.html +++ b/lib/empty-example/index.html @@ -12,7 +12,7 @@ background-color: #1b1b1b; } - + From ffdbe2954f5f6b5fd39a981c97a99a42cbc577cc Mon Sep 17 00:00:00 2001 From: 23036879 Date: Mon, 2 Sep 2024 14:16:07 +0100 Subject: [PATCH 4/5] git ignore screenshots which come from unit tests --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b4d7586ee9..56247dda09 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ parameterData.json yarn.lock docs/data.json analyzer/ -preview/ \ No newline at end of file +preview/ +__screenshots__/ \ No newline at end of file From 9a808ed0790b0d94336e5ac4f6a6c6d4ecbd3b50 Mon Sep 17 00:00:00 2001 From: 23036879 Date: Wed, 4 Sep 2024 09:23:31 +0100 Subject: [PATCH 5/5] temporary getters for levels & _array, compatability with old color API to work with WebGL mode on dev branch --- src/color/p5.Color.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/color/p5.Color.js b/src/color/p5.Color.js index 98220894f4..4a5b666d6f 100644 --- a/src/color/p5.Color.js +++ b/src/color/p5.Color.js @@ -492,6 +492,10 @@ p5.Color = class Color { get levels() { return [...this.color.coords, this.color.alpha].map(v => v * 255); } + + get _array(){ + return [...this.color.coords, this.color.alpha]; + } }; export default p5.Color;