Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-24 01:28:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Speedup and consolidate color lib with pointers

Browse Source
This commit is contained in:
Willy-JL
2023-10-09 01:27:38 +01:00
parent ac4ae1f8ed
commit fb2b0e2385
7 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/toolbox/colors.c
+50 -57
View File
@@ -10,86 +10,79 @@ inline int hsvcmp(const HsvColor* a, const HsvColor* b) {
return memcmp(a, b, sizeof(HsvColor));
}
RgbColor hsv2rgb(HsvColor hsv) {
RgbColor rgb;
uint8_t region, remainder, p, q, t;
if(hsv.s == 0) {
rgb.r = hsv.v;
rgb.g = hsv.v;
rgb.b = hsv.v;
return rgb;
void hsv2rgb(const HsvColor* hsv, RgbColor* rgb) {
if(hsv->s == 0) {
rgb->r = hsv->v;
rgb->g = hsv->v;
rgb->b = hsv->v;
return;
}
region = hsv.h / 43;
remainder = (hsv.h - (region * 43)) * 6;
uint8_t region = hsv->h / 43;
uint8_t remainder = (hsv->h - (region * 43)) * 6;
p = (hsv.v * (255 - hsv.s)) >> 8;
q = (hsv.v * (255 - ((hsv.s * remainder) >> 8))) >> 8;
t = (hsv.v * (255 - ((hsv.s * (255 - remainder)) >> 8))) >> 8;
uint8_t p = (hsv->v * (255 - hsv->s)) >> 8;
uint8_t q = (hsv->v * (255 - ((hsv->s * remainder) >> 8))) >> 8;
uint8_t t = (hsv->v * (255 - ((hsv->s * (255 - remainder)) >> 8))) >> 8;
switch(region) {
case 0:
rgb.r = hsv.v;
rgb.g = t;
rgb.b = p;
rgb->r = hsv->v;
rgb->g = t;
rgb->b = p;
break;
case 1:
rgb.r = q;
rgb.g = hsv.v;
rgb.b = p;
rgb->r = q;
rgb->g = hsv->v;
rgb->b = p;
break;
case 2:
rgb.r = p;
rgb.g = hsv.v;
rgb.b = t;
rgb->r = p;
rgb->g = hsv->v;
rgb->b = t;
break;
case 3:
rgb.r = p;
rgb.g = q;
rgb.b = hsv.v;
rgb->r = p;
rgb->g = q;
rgb->b = hsv->v;
break;
case 4:
rgb.r = t;
rgb.g = p;
rgb.b = hsv.v;
rgb->r = t;
rgb->g = p;
rgb->b = hsv->v;
break;
default:
rgb.r = hsv.v;
rgb.g = p;
rgb.b = q;
rgb->r = hsv->v;
rgb->g = p;
rgb->b = q;
break;
}
return rgb;
}
HsvColor rgb2hsv(RgbColor rgb) {
HsvColor hsv;
uint8_t rgbMin, rgbMax;
void rgb2hsv(const RgbColor* rgb, HsvColor* hsv) {
uint8_t rgbMin = rgb->r < rgb->g ? (rgb->r < rgb->b ? rgb->r : rgb->b) :
(rgb->g < rgb->b ? rgb->g : rgb->b);
uint8_t rgbMax = rgb->r > rgb->g ? (rgb->r > rgb->b ? rgb->r : rgb->b) :
(rgb->g > rgb->b ? rgb->g : rgb->b);
rgbMin = rgb.r < rgb.g ? (rgb.r < rgb.b ? rgb.r : rgb.b) : (rgb.g < rgb.b ? rgb.g : rgb.b);
rgbMax = rgb.r > rgb.g ? (rgb.r > rgb.b ? rgb.r : rgb.b) : (rgb.g > rgb.b ? rgb.g : rgb.b);
hsv.v = rgbMax;
if(hsv.v == 0) {
hsv.h = 0;
hsv.s = 0;
return hsv;
hsv->v = rgbMax;
if(hsv->v == 0) {
hsv->h = 0;
hsv->s = 0;
return;
}
hsv.s = 255 * ((long)rgbMax - (long)rgbMin) / hsv.v;
if(hsv.s == 0) {
hsv.h = 0;
return hsv;
hsv->s = 255 * ((long)rgbMax - (long)rgbMin) / hsv->v;
if(hsv->s == 0) {
hsv->h = 0;
return;
}
if(rgbMax == rgb.r)
hsv.h = 0 + 43 * (rgb.g - rgb.b) / (rgbMax - rgbMin);
else if(rgbMax == rgb.g)
hsv.h = 85 + 43 * (rgb.b - rgb.r) / (rgbMax - rgbMin);
else
hsv.h = 171 + 43 * (rgb.r - rgb.g) / (rgbMax - rgbMin);
return hsv;
if(rgbMax == rgb->r) {
hsv->h = 0 + 43 * (rgb->g - rgb->b) / (rgbMax - rgbMin);
} else if(rgbMax == rgb->g) {
hsv->h = 85 + 43 * (rgb->b - rgb->r) / (rgbMax - rgbMin);
} else {
hsv->h = 171 + 43 * (rgb->r - rgb->g) / (rgbMax - rgbMin);
}
}
lib/toolbox/colors.h
+4 -6
View File
@@ -7,25 +7,23 @@
extern "C" {
#endif
typedef struct RgbColor {
typedef struct {
uint8_t r;
uint8_t g;
uint8_t b;
} RgbColor;
typedef struct HsvColor {
typedef struct {
uint8_t h;
uint8_t s;
uint8_t v;
} HsvColor;
int rgbcmp(const RgbColor* a, const RgbColor* b);
int hsvcmp(const HsvColor* a, const HsvColor* b);
RgbColor hsv2rgb(HsvColor hsv);
HsvColor rgb2hsv(RgbColor rgb);
void hsv2rgb(const HsvColor* hsv, RgbColor* rgb);
void rgb2hsv(const RgbColor* rgb, HsvColor* hsv);
#ifdef __cplusplus
}