Merge branch 'slightly-better-colorize' into 'master'

Slightly improve colorize's luminance method

See merge request KartKrew/Kart!810
This commit is contained in:
Sal 2022-12-17 23:44:01 +00:00
commit b02aa713d3

View file

@ -24,11 +24,18 @@
--------------------------------------------------*/
UINT8 K_ColorRelativeLuminance(UINT8 r, UINT8 g, UINT8 b)
{
UINT32 redweight = 1063 * r;
UINT32 greenweight = 3576 * g;
UINT32 blueweight = 361 * b;
UINT32 brightness = (redweight + greenweight + blueweight) / 5000;
return min(brightness, UINT8_MAX);
double redWeight = ((r * 1.0) / UINT8_MAX);
double greenWeight = ((g * 1.0) / UINT8_MAX);
double blueWeight = ((b * 1.0) / UINT8_MAX);
double brightness = 0.5;
redWeight = pow(redWeight, 2.2) * 0.2126;
greenWeight = pow(greenWeight, 2.2) * 0.7152;
blueWeight = pow(greenWeight, 2.2) * 0.0722;
brightness = pow(redWeight + greenWeight + blueWeight, 1.0 / 2.2);
return (UINT8)(brightness * UINT8_MAX);
}
/*--------------------------------------------------