qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vid] Create a 32-bit version of the palette

Browse source 
The 32-bit palette includes the alpha channel, with color 255's alpha
set to 0.
This commit is contained in:
Bill Currie 2021-01-23 23:56:33 +09:00
parent 49408c695d
commit 145e7478a7
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/QF/vid.h
View file

@ -43,6 +43,7 @@ typedef struct {
byte *gammatable; // 256
byte *basepal; // 256 * 3
byte *palette; // 256 * 3
byte *palette32; // 256 * 4 includes alpha
byte *colormap8; // 256 * VID_GRADES size
unsigned short *colormap16; // 256 * VID_GRADES size
unsigned int *colormap32; // 256 * VID_GRADES size

29
libs/video/targets/vid.c
View file

@ -200,6 +200,10 @@ void
VID_UpdateGamma (cvar_t *vid_gamma)
{
double gamma = bound (0.1, vid_gamma->value, 9.9);
byte *p24;
byte *p32;
byte *col;
int i;
viddef.recalc_refdef = 1; // force a surface cache flush
@ -207,13 +211,29 @@ VID_UpdateGamma (cvar_t *vid_gamma)
Sys_MaskPrintf (SYS_VID, "Setting hardware gamma to %g\n", gamma);
VID_BuildGammaTable (1.0); // hardware gamma wants a linear palette
VID_SetGamma (gamma);
memcpy (viddef.palette, viddef.basepal, 256 * 3);
p24 = viddef.palette;
p32 = viddef.palette32;
col = viddef.basepal;
for (i = 0; i < 256; i++) {
*p32++ = *p24++ = *col++;
*p32++ = *p24++ = *col++;
*p32++ = *p24++ = *col++;
*p32++ = 255;
}
p32[-1] = 0; // color 255 is transparent
} else { // We have to hack the palette
int i;
Sys_MaskPrintf (SYS_VID, "Setting software gamma to %g\n", gamma);
VID_BuildGammaTable (gamma);
for (i = 0; i < 256 * 3; i++)
viddef.palette[i] = viddef.gammatable[viddef.basepal[i]];
p24 = viddef.palette;
p32 = viddef.palette32;
col = viddef.basepal;
for (i = 0; i < 256; i++) {
*p32++ = *p24++ = viddef.gammatable[*col++];
*p32++ = *p24++ = viddef.gammatable[*col++];
*p32++ = *p24++ = viddef.gammatable[*col++];
*p32++ = 255;
}
p32[-1] = 0; // color 255 is transparent
viddef.vid_internal->set_palette (viddef.palette); // update with the new palette
}
}
@ -232,6 +252,7 @@ VID_InitGamma (unsigned char *pal)
viddef.gammatable = malloc (256);
viddef.basepal = pal;
viddef.palette = malloc (256 * 3);
viddef.palette32 = malloc (256 * 4);
if ((i = COM_CheckParm ("-gamma"))) {
gamma = atof (com_argv[i + 1]);
}