From fd80638960ca613d567022b9e41598ddcf7e61a0 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 21 Oct 2023 19:36:06 +0100 Subject: [PATCH] Apply gamma correction --- .../usermod_v2_animartrix.h | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index b93d3dffb5..0026fff1d4 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -104,13 +104,40 @@ class ANIMartRIXMod:public ANIMartRIX { setSpeedFactor(speedFactor); } void setPixelColor(int x, int y, rgb pixel) { - SEGMENT.setPixelColorXY(x, y, CRGB(pixel.red, pixel.green, pixel.blue)); + SEGMENT.setPixelColorXY(x, y, CRGB( + pgm_read_byte(&gamma8[pixel.red]), + pgm_read_byte(&gamma8[pixel.green]), + pgm_read_byte(&gamma8[pixel.blue]) + )); } void setPixelColor(int index, rgb pixel) { - SEGMENT.setPixelColor(index, CRGB(pixel.red, pixel.green, pixel.blue)); + SEGMENT.setPixelColor(index, CRGB( + pgm_read_byte(&gamma8[pixel.red]), + pgm_read_byte(&gamma8[pixel.green]), + pgm_read_byte(&gamma8[pixel.blue]) + )); } // Add any extra custom effects not part of the ANIMartRIX libary here + + private: + const uint8_t PROGMEM gamma8[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, + 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, + 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, + 10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, + 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 24, 24, 25, + 25, 26, 27, 27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 35, 36, + 37, 38, 39, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, + 51, 52, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 66, 67, 68, + 69, 70, 72, 73, 74, 75, 77, 78, 79, 81, 82, 83, 85, 86, 87, 89, + 90, 92, 93, 95, 96, 98, 99,101,102,104,105,107,109,110,112,114, + 115,117,119,120,122,124,126,127,129,131,133,135,137,138,140,142, + 144,146,148,150,152,154,156,158,160,162,164,167,169,171,173,175, + 177,180,182,184,186,189,191,193,196,198,200,203,205,208,210,213, + 215,218,220,223,225,228,231,233,236,239,241,244,247,249,252,255 }; }; ANIMartRIXMod anim;