OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- allow passing a remap table to BestColor.

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-15 08:40:37 +02:00
commit 4614ce41cd
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/common/utility/palette.cpp
View file

@ -46,7 +46,7 @@
/* Palette management stuff */
/****************************/
int BestColor (const uint32_t *pal_in, int r, int g, int b, int first, int num)
int BestColor (const uint32_t *pal_in, int r, int g, int b, int first, int num, const uint8_t* indexmap)
{
const PalEntry *pal = (const PalEntry *)pal_in;
int bestcolor = first;
@ -54,17 +54,18 @@ int BestColor (const uint32_t *pal_in, int r, int g, int b, int first, int num)
for (int color = first; color < num; color++)
{
int x = r - pal[color].r;
int y = g - pal[color].g;
int z = b - pal[color].b;
int co = indexmap ? indexmap[color] : color;
int x = r - pal[co].r;
int y = g - pal[co].g;
int z = b - pal[co].b;
int dist = x*x + y*y + z*z;
if (dist < bestdist)
{
if (dist == 0)
return color;
return co;
bestdist = dist;
bestcolor = color;
bestcolor = co;
}
}
return bestcolor;