mirror of https://github.com/raysan5/raylib
review color tint functions (#4015)
This commit is contained in:
parent
c04629f6d4
commit
f2344cd089
|
@ -2667,17 +2667,12 @@ void ImageColorTint(Image *image, Color color)
|
||||||
|
|
||||||
Color *pixels = LoadImageColors(*image);
|
Color *pixels = LoadImageColors(*image);
|
||||||
|
|
||||||
float cR = (float)color.r/255;
|
|
||||||
float cG = (float)color.g/255;
|
|
||||||
float cB = (float)color.b/255;
|
|
||||||
float cA = (float)color.a/255;
|
|
||||||
|
|
||||||
for (int i = 0; i < image->width*image->height; i++)
|
for (int i = 0; i < image->width*image->height; i++)
|
||||||
{
|
{
|
||||||
unsigned char r = (unsigned char)(((float)pixels[i].r/255*cR)*255.0f);
|
unsigned char r = (unsigned char)(((int)pixels[i].r*(int)color.r)/255);
|
||||||
unsigned char g = (unsigned char)(((float)pixels[i].g/255*cG)*255.0f);
|
unsigned char g = (unsigned char)(((int)pixels[i].g*(int)color.g)/255);
|
||||||
unsigned char b = (unsigned char)(((float)pixels[i].b/255*cB)*255.0f);
|
unsigned char b = (unsigned char)(((int)pixels[i].b*(int)color.b)/255);
|
||||||
unsigned char a = (unsigned char)(((float)pixels[i].a/255*cA)*255.0f);
|
unsigned char a = (unsigned char)(((int)pixels[i].a*(int)color.a)/255);
|
||||||
|
|
||||||
pixels[i].r = r;
|
pixels[i].r = r;
|
||||||
pixels[i].g = g;
|
pixels[i].g = g;
|
||||||
|
@ -4639,15 +4634,10 @@ Color ColorTint(Color color, Color tint)
|
||||||
{
|
{
|
||||||
Color result = color;
|
Color result = color;
|
||||||
|
|
||||||
float cR = (float)tint.r/255;
|
unsigned char r = (unsigned char)(((int)color.r*(int)tint.r)/255);
|
||||||
float cG = (float)tint.g/255;
|
unsigned char g = (unsigned char)(((int)color.g*(int)tint.g)/255);
|
||||||
float cB = (float)tint.b/255;
|
unsigned char b = (unsigned char)(((int)color.b*(int)tint.b)/255);
|
||||||
float cA = (float)tint.a/255;
|
unsigned char a = (unsigned char)(((int)color.a*(int)tint.a)/255);
|
||||||
|
|
||||||
unsigned char r = (unsigned char)(((float)color.r/255*cR)*255.0f);
|
|
||||||
unsigned char g = (unsigned char)(((float)color.g/255*cG)*255.0f);
|
|
||||||
unsigned char b = (unsigned char)(((float)color.b/255*cB)*255.0f);
|
|
||||||
unsigned char a = (unsigned char)(((float)color.a/255*cA)*255.0f);
|
|
||||||
|
|
||||||
result.r = r;
|
result.r = r;
|
||||||
result.g = g;
|
result.g = g;
|
||||||
|
|
Loading…
Reference in New Issue