From 4aac0959e6f7beffdc58b19b0dc12466f10f6197 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 1 Nov 2024 10:38:50 -0300 Subject: [PATCH 1/4] ofColor change template from float to PixelType --- apps/projectGenerator | 2 +- libs/openFrameworks/types/ofColor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/projectGenerator b/apps/projectGenerator index 51f2ad14aad..76bb2639b8b 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit 51f2ad14aad8031ca1e0001791089d0742fa1699 +Subproject commit 76bb2639b8b8a66f01011084bb2308d9033572fa diff --git a/libs/openFrameworks/types/ofColor.cpp b/libs/openFrameworks/types/ofColor.cpp index 84d44264225..162fd5d36cf 100644 --- a/libs/openFrameworks/types/ofColor.cpp +++ b/libs/openFrameworks/types/ofColor.cpp @@ -168,7 +168,7 @@ A clampedMultiply(const A& a, const B& b) { } template -ofColor_::ofColor_(float _r, float _g, float _b, float _a): +ofColor_::ofColor_(PixelType _r, PixelType _g, PixelType _b, PixelType _a): r(_r), g(_g), b(_b), From 844b22d60053ce1161e3433d680be1ac2369b649 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Fri, 1 Nov 2024 17:45:49 -0300 Subject: [PATCH 2/4] template color with pixeltype instead of float --- libs/openFrameworks/types/ofColor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworks/types/ofColor.h b/libs/openFrameworks/types/ofColor.h index f7b89136a68..02dfaf202ab 100644 --- a/libs/openFrameworks/types/ofColor.h +++ b/libs/openFrameworks/types/ofColor.h @@ -35,7 +35,7 @@ class ofColor_{ /// \param green The green component. /// \param blue The blue component. /// \param alpha The alpha component. - ofColor_(float red, float green, float blue, float alpha = limit()); + ofColor_(PixelType red, PixelType green, PixelType blue, PixelType alpha = limit()); /// \brief Construct a grayscale ofColor_ by specifying a single number. /// From 5b5a581d77e794d858083100d3df82ce877c5b36 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sun, 3 Nov 2024 01:29:51 -0300 Subject: [PATCH 3/4] update submodule --- apps/projectGenerator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/projectGenerator b/apps/projectGenerator index 76bb2639b8b..a742c1fdb86 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit 76bb2639b8b8a66f01011084bb2308d9033572fa +Subproject commit a742c1fdb869983f7a6a813e69514aea62e89af5 From 6df4d063fd951cf84e62697c27c4760e457faf77 Mon Sep 17 00:00:00 2001 From: Dimitre Date: Wed, 20 Nov 2024 02:49:36 -0300 Subject: [PATCH 4/4] merge master --- apps/projectGenerator | 2 +- scripts/apothecary | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/projectGenerator b/apps/projectGenerator index 2e354a713af..0d4e7c3c7cd 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit 2e354a713af4c8169c6988df747db0e323e7b9bc +Subproject commit 0d4e7c3c7cd5ad48eae0ba4189887680bc9f847a diff --git a/scripts/apothecary b/scripts/apothecary index 7d5a6d85683..bd4f4c10d5a 160000 --- a/scripts/apothecary +++ b/scripts/apothecary @@ -1 +1 @@ -Subproject commit 7d5a6d856838d02224464d57ef19bd17609d4e50 +Subproject commit bd4f4c10d5a26fd4352f05c962d3ebbc13d57e18